Add latest changes from gitlab-org/gitlab@master

5 files changed, 207 insertions, 26 deletions

diff --git a/spec/frontend/jira_connect/subscriptions/api_spec.js b/spec/frontend/jira_connect/subscriptions/api_spec.js
index 57b11bdbc27..76a0b8fa82c 100644
--- a/spec/frontend/jira_connect/subscriptions/api_spec.js
+++ b/spec/frontend/jira_connect/subscriptions/api_spec.js
@@ -1,7 +1,13 @@
 import MockAdapter from 'axios-mock-adapter';
-import { addSubscription, removeSubscription, fetchGroups } from '~/jira_connect/subscriptions/api';
+import {
+  axiosInstance,
+  addSubscription,
+  removeSubscription,
+  fetchGroups,
+  getCurrentUser,
+  addJiraConnectSubscription,
+} from '~/jira_connect/subscriptions/api';
 import { getJwt } from '~/jira_connect/subscriptions/utils';
-import axios from '~/lib/utils/axios_utils';
 import httpStatus from '~/lib/utils/http_status';
 
 jest.mock('~/jira_connect/subscriptions/utils', () => ({
@@ -9,21 +15,26 @@ jest.mock('~/jira_connect/subscriptions/utils', () => ({
 }));
 
 describe('JiraConnect API', () => {
-  let mock;
+  let axiosMock;
+  let originalGon;
   let response;
 
   const mockAddPath = 'addPath';
   const mockRemovePath = 'removePath';
   const mockNamespace = 'namespace';
   const mockJwt = 'jwt';
+  const mockAccessToken = 'accessToken';
   const mockResponse = { success: true };
 
   beforeEach(() => {
-    mock = new MockAdapter(axios);
+    axiosMock = new MockAdapter(axiosInstance);
+    originalGon = window.gon;
+    window.gon = { api_version: 'v4' };
   });
 
   afterEach(() => {
-    mock.restore();
+    axiosMock.restore();
+    window.gon = originalGon;
     response = null;
   });
 
@@ -31,8 +42,8 @@ describe('JiraConnect API', () => {
     const makeRequest = () => addSubscription(mockAddPath, mockNamespace);
 
     it('returns success response', async () => {
-      jest.spyOn(axios, 'post');
-      mock
+      jest.spyOn(axiosInstance, 'post');
+      axiosMock
         .onPost(mockAddPath, {
           jwt: mockJwt,
           namespace_path: mockNamespace,
@@ -42,7 +53,7 @@ describe('JiraConnect API', () => {
       response = await makeRequest();
 
       expect(getJwt).toHaveBeenCalled();
-      expect(axios.post).toHaveBeenCalledWith(mockAddPath, {
+      expect(axiosInstance.post).toHaveBeenCalledWith(mockAddPath, {
         jwt: mockJwt,
         namespace_path: mockNamespace,
       });
@@ -54,13 +65,13 @@ describe('JiraConnect API', () => {
     const makeRequest = () => removeSubscription(mockRemovePath);
 
     it('returns success response', async () => {
-      jest.spyOn(axios, 'delete');
-      mock.onDelete(mockRemovePath).replyOnce(httpStatus.OK, mockResponse);
+      jest.spyOn(axiosInstance, 'delete');
+      axiosMock.onDelete(mockRemovePath).replyOnce(httpStatus.OK, mockResponse);
 
       response = await makeRequest();
 
       expect(getJwt).toHaveBeenCalled();
-      expect(axios.delete).toHaveBeenCalledWith(mockRemovePath, {
+      expect(axiosInstance.delete).toHaveBeenCalledWith(mockRemovePath, {
         params: {
           jwt: mockJwt,
         },
@@ -81,8 +92,8 @@ describe('JiraConnect API', () => {
       });
 
     it('returns success response', async () => {
-      jest.spyOn(axios, 'get');
-      mock
+      jest.spyOn(axiosInstance, 'get');
+      axiosMock
         .onGet(mockGroupsPath, {
           page: mockPage,
           per_page: mockPerPage,
@@ -91,7 +102,7 @@ describe('JiraConnect API', () => {
 
       response = await makeRequest();
 
-      expect(axios.get).toHaveBeenCalledWith(mockGroupsPath, {
+      expect(axiosInstance.get).toHaveBeenCalledWith(mockGroupsPath, {
         params: {
           page: mockPage,
           per_page: mockPerPage,
@@ -100,4 +111,46 @@ describe('JiraConnect API', () => {
       expect(response.data).toEqual(mockResponse);
     });
   });
+
+  describe('getCurrentUser', () => {
+    const makeRequest = () => getCurrentUser();
+
+    it('returns success response', async () => {
+      const expectedUrl = '/api/v4/user';
+
+      jest.spyOn(axiosInstance, 'get');
+
+      axiosMock.onGet(expectedUrl).replyOnce(httpStatus.OK, mockResponse);
+
+      response = await makeRequest();
+
+      expect(axiosInstance.get).toHaveBeenCalledWith(expectedUrl, {});
+      expect(response.data).toEqual(mockResponse);
+    });
+  });
+
+  describe('addJiraConnectSubscription', () => {
+    const makeRequest = () =>
+      addJiraConnectSubscription(mockNamespace, { jwt: mockJwt, accessToken: mockAccessToken });
+
+    it('returns success response', async () => {
+      const expectedUrl = '/api/v4/integrations/jira_connect/subscriptions';
+
+      jest.spyOn(axiosInstance, 'post');
+
+      axiosMock.onPost(expectedUrl).replyOnce(httpStatus.OK, mockResponse);
+
+      response = await makeRequest();
+
+      expect(axiosInstance.post).toHaveBeenCalledWith(
+        expectedUrl,
+        {
+          jwt: mockJwt,
+          namespace_path: mockNamespace,
+        },
+        { headers: { Authorization: `Bearer ${mockAccessToken}` } },
+      );
+      expect(response.data).toEqual(mockResponse);
+    });
+  });
 });
diff --git a/spec/frontend/jira_connect/subscriptions/components/sign_in_oauth_button_spec.js b/spec/frontend/jira_connect/subscriptions/components/sign_in_oauth_button_spec.js
index ed0abaaf576..383ed2225cd 100644
--- a/spec/frontend/jira_connect/subscriptions/components/sign_in_oauth_button_spec.js
+++ b/spec/frontend/jira_connect/subscriptions/components/sign_in_oauth_button_spec.js
@@ -11,14 +11,13 @@ import axios from '~/lib/utils/axios_utils';
 import waitForPromises from 'helpers/wait_for_promises';
 import httpStatus from '~/lib/utils/http_status';
 import AccessorUtilities from '~/lib/utils/accessor';
-import { getCurrentUser } from '~/rest_api';
+import { getCurrentUser } from '~/jira_connect/subscriptions/api';
 import createStore from '~/jira_connect/subscriptions/store';
 import { SET_ACCESS_TOKEN } from '~/jira_connect/subscriptions/store/mutation_types';
 
 jest.mock('~/lib/utils/accessor');
 jest.mock('~/jira_connect/subscriptions/utils');
 jest.mock('~/jira_connect/subscriptions/api');
-jest.mock('~/rest_api');
 jest.mock('~/jira_connect/subscriptions/pkce', () => ({
   createCodeVerifier: jest.fn().mockReturnValue('mock-verifier'),
   createCodeChallenge: jest.fn().mockResolvedValue('mock-challenge'),
diff --git a/spec/frontend/jira_connect/subscriptions/store/actions_spec.js b/spec/frontend/jira_connect/subscriptions/store/actions_spec.js
index 53b5d8e70af..5e3c30269b5 100644
--- a/spec/frontend/jira_connect/subscriptions/store/actions_spec.js
+++ b/spec/frontend/jira_connect/subscriptions/store/actions_spec.js
@@ -8,8 +8,6 @@ import {
 } from '~/jira_connect/subscriptions/store/actions';
 import state from '~/jira_connect/subscriptions/store/state';
 import * as api from '~/jira_connect/subscriptions/api';
-import * as userApi from '~/api/user_api';
-import * as integrationsApi from '~/api/integrations_api';
 import {
   I18N_DEFAULT_SUBSCRIPTIONS_ERROR_MESSAGE,
   I18N_ADD_SUBSCRIPTION_SUCCESS_ALERT_TITLE,
@@ -79,7 +77,7 @@ describe('JiraConnect actions', () => {
     describe('when API request succeeds', () => {
       it('commits the SET_ACCESS_TOKEN and SET_CURRENT_USER mutations', async () => {
         const mockUser = { name: 'root' };
-        jest.spyOn(userApi, 'getCurrentUser').mockResolvedValue({ data: mockUser });
+        jest.spyOn(api, 'getCurrentUser').mockResolvedValue({ data: mockUser });
 
         await testAction(
           loadCurrentUser,
@@ -89,7 +87,7 @@ describe('JiraConnect actions', () => {
           [],
         );
 
-        expect(userApi.getCurrentUser).toHaveBeenCalledWith({
+        expect(api.getCurrentUser).toHaveBeenCalledWith({
           headers: { Authorization: `Bearer ${mockAccessToken}` },
         });
       });
@@ -97,7 +95,7 @@ describe('JiraConnect actions', () => {
 
     describe('when API request fails', () => {
       it('commits the SET_CURRENT_USER_ERROR mutation', async () => {
-        jest.spyOn(userApi, 'getCurrentUser').mockRejectedValue();
+        jest.spyOn(api, 'getCurrentUser').mockRejectedValue();
 
         await testAction(
           loadCurrentUser,
@@ -120,9 +118,7 @@ describe('JiraConnect actions', () => {
 
     describe('when API request succeeds', () => {
       it('commits the SET_ACCESS_TOKEN and SET_CURRENT_USER mutations', async () => {
-        jest
-          .spyOn(integrationsApi, 'addJiraConnectSubscription')
-          .mockResolvedValue({ success: true });
+        jest.spyOn(api, 'addJiraConnectSubscription').mockResolvedValue({ success: true });
 
         await testAction(
           addSubscription,
@@ -144,7 +140,7 @@ describe('JiraConnect actions', () => {
           [{ type: 'fetchSubscriptions', payload: mockSubscriptionsPath }],
         );
 
-        expect(integrationsApi.addJiraConnectSubscription).toHaveBeenCalledWith(mockNamespace, {
+        expect(api.addJiraConnectSubscription).toHaveBeenCalledWith(mockNamespace, {
           accessToken: null,
           jwt: '1234',
         });
@@ -153,7 +149,7 @@ describe('JiraConnect actions', () => {
 
     describe('when API request fails', () => {
       it('commits the SET_CURRENT_USER_ERROR mutation', async () => {
-        jest.spyOn(integrationsApi, 'addJiraConnectSubscription').mockRejectedValue();
+        jest.spyOn(api, 'addJiraConnectSubscription').mockRejectedValue();
 
         await testAction(
           addSubscription,
diff --git a/spec/lib/gitlab/background_migration/destroy_invalid_project_members_spec.rb b/spec/lib/gitlab/background_migration/destroy_invalid_project_members_spec.rb
new file mode 100644
index 00000000000..029a6adf831
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/destroy_invalid_project_members_spec.rb
@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::BackgroundMigration::DestroyInvalidProjectMembers, :migration, schema: 20220901035725 do
+  # rubocop: disable Layout/LineLength
+  # rubocop: disable RSpec/ScatteredLet
+  let!(:migration_attrs) do
+    {
+      start_id: 1,
+      end_id: 1000,
+      batch_table: :members,
+      batch_column: :id,
+      sub_batch_size: 100,
+      pause_ms: 0,
+      connection: ApplicationRecord.connection
+    }
+  end
+
+  let!(:migration) { described_class.new(**migration_attrs) }
+
+  subject(:perform_migration) { migration.perform }
+
+  let(:users_table) { table(:users) }
+  let(:namespaces_table) { table(:namespaces) }
+  let(:members_table) { table(:members) }
+  let(:projects_table) { table(:projects) }
+
+  let(:user1) { users_table.create!(name: 'user1', email: 'user1@example.com', projects_limit: 5) }
+  let(:user2) { users_table.create!(name: 'user2', email: 'user2@example.com', projects_limit: 5) }
+  let(:user3) { users_table.create!(name: 'user3', email: 'user3@example.com', projects_limit: 5) }
+  let(:user4) { users_table.create!(name: 'user4', email: 'user4@example.com', projects_limit: 5) }
+  let(:user5) { users_table.create!(name: 'user5', email: 'user5@example.com', projects_limit: 5) }
+  let(:user6) { users_table.create!(name: 'user6', email: 'user6@example.com', projects_limit: 5) }
+
+  let!(:group1) { namespaces_table.create!(name: 'marvellous group 1', path: 'group-path-1', type: 'Group') }
+
+  let!(:project_namespace1) do
+    namespaces_table.create!(name: 'fabulous project', path: 'project-path-1', type: 'ProjectNamespace',
+                             parent_id: group1.id)
+  end
+
+  let!(:project1) do
+    projects_table.create!(name: 'fabulous project', path: 'project-path-1', project_namespace_id: project_namespace1.id,
+                           namespace_id: group1.id)
+  end
+
+  let!(:project_namespace2) do
+    namespaces_table.create!(name: 'splendiferous project', path: 'project-path-2', type: 'ProjectNamespace',
+                             parent_id: group1.id)
+  end
+
+  let!(:project2) do
+    projects_table.create!(name: 'splendiferous project', path: 'project-path-2', project_namespace_id: project_namespace2.id,
+                           namespace_id: group1.id)
+  end
+
+  # create project member records, a mix of both valid and invalid
+  # group members will have already been filtered out.
+  let!(:project_member1) { create_invalid_project_member(id: 1, user_id: user1.id) }
+  let!(:project_member2) { create_valid_project_member(id: 4, user_id: user2.id, project: project1) }
+  let!(:project_member3) { create_valid_project_member(id: 5, user_id: user3.id, project: project2) }
+  let!(:project_member4) { create_invalid_project_member(id: 6, user_id: user4.id) }
+  let!(:project_member5) { create_valid_project_member(id: 7, user_id: user5.id, project: project2) }
+  let!(:project_member6) { create_invalid_project_member(id: 8, user_id: user6.id) }
+
+  it 'removes invalid memberships but keeps valid ones', :aggregate_failures do
+    expect(members_table.where(type: 'ProjectMember').count).to eq 6
+
+    queries = ActiveRecord::QueryRecorder.new do
+      perform_migration
+    end
+
+    expect(queries.count).to eq(4)
+    expect(members_table.where(type: 'ProjectMember')).to match_array([project_member2, project_member3, project_member5])
+  end
+
+  it 'tracks timings of queries' do
+    expect(migration.batch_metrics.timings).to be_empty
+
+    expect { perform_migration }.to change { migration.batch_metrics.timings }
+  end
+
+  it 'logs IDs of deleted records' do
+    expect(Gitlab::AppLogger).to receive(:info).with({ message: 'Removing invalid project member records',
+                                                       deleted_count: 3, ids: [project_member1, project_member4, project_member6].map(&:id) })
+
+    perform_migration
+  end
+
+  def create_invalid_project_member(id:, user_id:)
+    members_table.create!(id: id, user_id: user_id, source_id: non_existing_record_id, access_level: Gitlab::Access::MAINTAINER,
+                          type: "ProjectMember", source_type: "Project", notification_level: 3, member_namespace_id: nil)
+  end
+
+  def create_valid_project_member(id:, user_id:, project:)
+    members_table.create!(id: id, user_id: user_id, source_id: project.id, access_level: Gitlab::Access::MAINTAINER,
+                          type: "ProjectMember", source_type: "Project", member_namespace_id: project.project_namespace_id, notification_level: 3)
+  end
+  # rubocop: enable Layout/LineLength
+  # rubocop: enable RSpec/ScatteredLet
+end
diff --git a/spec/migrations/20220901035725_schedule_destroy_invalid_project_members_spec.rb b/spec/migrations/20220901035725_schedule_destroy_invalid_project_members_spec.rb
new file mode 100644
index 00000000000..ed9f7e3cd44
--- /dev/null
+++ b/spec/migrations/20220901035725_schedule_destroy_invalid_project_members_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe ScheduleDestroyInvalidProjectMembers, :migration do
+  let_it_be(:migration) { described_class::MIGRATION }
+
+  describe '#up' do
+    it 'schedules background jobs for each batch of members' do
+      migrate!
+
+      expect(migration).to have_scheduled_batched_migration(
+        table_name: :members,
+        column_name: :id,
+        interval: described_class::DELAY_INTERVAL,
+        batch_size: described_class::BATCH_SIZE,
+        max_batch_size: described_class::MAX_BATCH_SIZE
+      )
+    end
+  end
+
+  describe '#down' do
+    it 'deletes all batched migration records' do
+      migrate!
+      schema_migrate_down!
+
+      expect(migration).not_to have_scheduled_batched_migration
+    end
+  end
+end