Merge branch '439570-move-SyncServiceTokenWorker-from-ai-to-cc-namespace' into 'master'

Move SyncServiceTokenWorker to CC namespace. Iteration 1

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143203



Merged-by: Roy Zwambag <rzwambag@gitlab.com>
Approved-by: Roy Zwambag <rzwambag@gitlab.com>
Approved-by: Nikola Milojevic <nmilojevic@gitlab.com>
Reviewed-by: Aleksei Lipniagov <alipniagov@gitlab.com>
Co-authored-by: Aleksei Lipniagov <alipniagov@gitlab.com>

ee/app/workers/ai/sync_service_token_worker.rb

 # frozen_string_literal: true
 
+# !!! WARNING !!!
+# We keep it for compatibility during 16.9. Planned for removal in future releases.
+# Starting 16.10, apply all changes to Cloud::SyncServiceTokenWorker instead.
+# Refer to https://gitlab.com/groups/gitlab-org/-/epics/12544.
 module Ai
   class SyncServiceTokenWorker
     include ApplicationWorker

ee/app/workers/all_queues.yml

@@ -129,6 +129,15 @@
   :weight: 1
   :idempotent: true
   :tags: []
+- :name: cronjob:cloud_connector_sync_service_token
+  :worker_name: CloudConnector::SyncServiceTokenWorker
+  :feature_category: :cloud_connector
+  :has_external_dependencies: true
+  :urgency: :low
+  :resource_boundary: :unknown
+  :weight: 1
+  :idempotent: true
+  :tags: []
 - :name: cronjob:compliance_management_merge_requests_compliance_violations_consistency
   :worker_name: ComplianceManagement::MergeRequests::ComplianceViolationsConsistencyWorker
   :feature_category: :compliance_management

ee/app/workers/cloud_connector/sync_service_token_worker.rb

+# frozen_string_literal: true
+
+module CloudConnector
+  class SyncServiceTokenWorker
+    include ApplicationWorker
+
+    data_consistency :sticky
+
+    include CronjobQueue # rubocop:disable Scalability/CronWorkerContext -- Does not perform work scoped to a context
+
+    idempotent!
+
+    sidekiq_options retry: 3
+
+    worker_has_external_dependencies!
+
+    feature_category :cloud_connector
+
+    def perform
+      return unless ::Feature.enabled?(:use_sync_service_token_worker)
+
+      result = ::CloudConnector::SyncCloudConnectorAccessService.new.execute
+
+      log_extra_metadata_on_done(:error_message, result[:message]) unless result.success?
+    end
+  end
+end

ee/spec/workers/cloud_connector/sync_service_token_worker_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe CloudConnector::SyncServiceTokenWorker, type: :worker, feature_category: :cloud_connector do
+  describe '#perform' do
+    let(:service_response) { ServiceResponse.success }
+
+    before do
+      allow(CloudConnector::SyncCloudConnectorAccessService).to receive_message_chain(:new,
+        :execute).and_return(service_response)
+    end
+
+    include_examples 'an idempotent worker' do
+      let(:worker) { described_class.new }
+
+      subject(:sync_service_token) { perform_multiple(worker: worker) }
+
+      it 'executes the SyncCloudConnectorAccessService with expected params' do
+        expect(CloudConnector::SyncCloudConnectorAccessService).to receive_message_chain(:new, :execute)
+        expect(worker).not_to receive(:log_extra_metadata_on_done)
+
+        sync_service_token
+      end
+
+      context 'when :use_sync_service_token_worker feature flag is disabled' do
+        before do
+          stub_feature_flags(use_sync_service_token_worker: false)
+        end
+
+        it 'does not call CloudConnector::SyncCloudConnectorAccessService' do
+          expect(::CloudConnector::SyncCloudConnectorAccessService).not_to receive(:new)
+          expect(worker).not_to receive(:log_extra_metadata_on_done)
+
+          sync_service_token
+        end
+      end
+
+      context 'when SyncCloudConnectorAccessService fails' do
+        let(:service_response) { ServiceResponse.error(message: 'Error') }
+
+        it { expect { sync_service_token }.not_to raise_error }
+
+        it 'logs the error' do
+          expect(worker).to receive(:log_extra_metadata_on_done)
+                              .with(:error_message, service_response[:message]).twice
+
+          sync_service_token
+        end
+      end
+    end
+  end
+end

spec/workers/every_sidekiq_worker_spec.rb

@@ -176,6 +176,7 @@
         'Ci::UnlockPipelinesInQueueWorker' => 0,
         'Ci::SyncReportsToReportApprovalRulesWorker' => 3,
         'CleanupContainerRepositoryWorker' => 3,
+        'CloudConnector::SyncServiceTokenWorker' => 3,
         'ClusterConfigureIstioWorker' => 3,
         'ClusterInstallAppWorker' => 3,
         'ClusterPatchAppWorker' => 3,