Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42

2 files changed, 8 insertions, 8 deletions

diff --git a/app/workers/clusters/applications/activate_service_worker.rb b/app/workers/clusters/applications/activate_service_worker.rb
index d4d0ae96e03..a7073b78a81 100644
--- a/app/workers/clusters/applications/activate_service_worker.rb
+++ b/app/workers/clusters/applications/activate_service_worker.rb
@@ -15,7 +15,7 @@ module Clusters
         return unless cluster
 
         cluster.all_projects.find_each do |project|
-          project.find_or_initialize_service(service_name).update!(active: true)
+          project.find_or_initialize_integration(service_name).update!(active: true)
         end
       end
     end
diff --git a/app/workers/clusters/applications/deactivate_service_worker.rb b/app/workers/clusters/applications/deactivate_service_worker.rb
index 935b455a4fc..9337af56623 100644
--- a/app/workers/clusters/applications/deactivate_service_worker.rb
+++ b/app/workers/clusters/applications/deactivate_service_worker.rb
@@ -10,18 +10,18 @@ module Clusters
 
       loggable_arguments 1
 
-      def perform(cluster_id, service_name)
+      def perform(cluster_id, integration_name)
         cluster = Clusters::Cluster.find_by_id(cluster_id)
-        raise cluster_missing_error(service_name) unless cluster
+        raise cluster_missing_error(integration_name) unless cluster
 
-        service = "#{service_name}_service".to_sym
-        cluster.all_projects.with_service(service).find_each do |project|
-          project.public_send(service).update!(active: false) # rubocop:disable GitlabSecurity/PublicSend
+        integration = ::Project.integration_association_name(integration_name).to_sym
+        cluster.all_projects.with_integration(integration).find_each do |project|
+          project.public_send(integration).update!(active: false) # rubocop:disable GitlabSecurity/PublicSend
         end
       end
 
-      def cluster_missing_error(service)
-        ActiveRecord::RecordNotFound.new("Can't deactivate #{service} services, host cluster not found! Some inconsistent records may be left in database.")
+      def cluster_missing_error(integration_name)
+        ActiveRecord::RecordNotFound.new("Can't deactivate #{integration_name} integrations, host cluster not found! Some inconsistent records may be left in database.")
       end
     end
   end