Merge branch '210539-move-cluster-prometheus-related-classes-from-ee-to-ce' into 'master'

Move Prometheus related cluster classes from EE to CE

Closes #210539

See merge request gitlab-org/gitlab!27422

app/models/clusters/applications/prometheus.rb

@@ -35,6 +35,16 @@ module Clusters
               .perform_async(application.cluster_id, ::PrometheusService.to_param) # rubocop:disable CodeReuse/ServiceClass
           end
         end
+
+        after_transition any => :updating do |application|
+          application.update(last_update_started_at: Time.now)
+        end
+      end
+
+      def updated_since?(timestamp)
+        last_update_started_at &&
+          last_update_started_at > timestamp &&
+          !update_errored?
       end
 
       def chart
@@ -148,5 +158,3 @@ module Clusters
     end
   end
 end
-
-Clusters::Applications::Prometheus.prepend_if_ee('EE::Clusters::Applications::Prometheus')

app/models/project.rb

@@ -2411,6 +2411,12 @@ class Project < ApplicationRecord
     branch_protection.fully_protected? || branch_protection.developer_can_merge?
   end
 
+  def environments_for_scope(scope)
+    quoted_scope = ::Gitlab::SQL::Glob.q(scope)
+
+    environments.where("name LIKE (#{::Gitlab::SQL::Glob.to_like(quoted_scope)})") # rubocop:disable GitlabSecurity/SqlInjection
+  end
+
   private
 
   def closest_namespace_setting(name)

app/workers/all_queues.yml

@@ -325,6 +325,13 @@
   :resource_boundary: :unknown
   :weight: 1
   :idempotent: 
+- :name: gcp_cluster:cluster_update_app
+  :feature_category: :kubernetes_management
+  :has_external_dependencies: 
+  :urgency: :low
+  :resource_boundary: :unknown
+  :weight: 1
+  :idempotent: 
 - :name: gcp_cluster:cluster_upgrade_app
   :feature_category: :kubernetes_management
   :has_external_dependencies: true
@@ -339,6 +346,13 @@
   :resource_boundary: :cpu
   :weight: 1
   :idempotent: 
+- :name: gcp_cluster:cluster_wait_for_app_update
+  :feature_category: :kubernetes_management
+  :has_external_dependencies: 
+  :urgency: :low
+  :resource_boundary: :unknown
+  :weight: 1
+  :idempotent: 
 - :name: gcp_cluster:cluster_wait_for_ingress_ip_address
   :feature_category: :kubernetes_management
   :has_external_dependencies: true

ee/app/models/ee/clusters/applications/prometheus.rb

-# frozen_string_literal: true
-
-require 'securerandom'
-
-module EE
-  module Clusters
-    module Applications
-      module Prometheus
-        extend ActiveSupport::Concern
-
-        prepended do
-          state_machine :status do
-            after_transition any => :updating do |application|
-              application.update(last_update_started_at: Time.now)
-            end
-          end
-        end
-
-        def updated_since?(timestamp)
-          last_update_started_at &&
-            last_update_started_at > timestamp &&
-            !update_errored?
-        end
-      end
-    end
-  end
-end

ee/app/models/ee/project.rb

@@ -218,12 +218,6 @@ module EE
       all_pipelines.newest_first(ref: default_branch).with_reports(reports).take
     end
 
-    def environments_for_scope(scope)
-      quoted_scope = ::Gitlab::SQL::Glob.q(scope)
-
-      environments.where("name LIKE (#{::Gitlab::SQL::Glob.to_like(quoted_scope)})") # rubocop:disable GitlabSecurity/SqlInjection
-    end
-
     def ensure_external_webhook_token
       return if external_webhook_token.present?
 

ee/app/workers/all_queues.yml

@@ -199,20 +199,6 @@
   :resource_boundary: :unknown
   :weight: 2
   :idempotent: 
-- :name: gcp_cluster:cluster_update_app
-  :feature_category: :kubernetes_management
-  :has_external_dependencies: 
-  :urgency: :low
-  :resource_boundary: :unknown
-  :weight: 1
-  :idempotent: 
-- :name: gcp_cluster:cluster_wait_for_app_update
-  :feature_category: :kubernetes_management
-  :has_external_dependencies: 
-  :urgency: :low
-  :resource_boundary: :unknown
-  :weight: 1
-  :idempotent: 
 - :name: geo:geo_batch_project_registry
   :feature_category: :geo_replication
   :has_external_dependencies: 

ee/spec/models/ee/clusters/applications/prometheus_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Clusters::Applications::Prometheus do
-  describe 'transition to updating' do
-    let(:project) { create(:project) }
-    let(:cluster) { create(:cluster, projects: [project]) }
-
-    subject { create(:clusters_applications_prometheus, :installed, cluster: cluster) }
-
-    it 'sets last_update_started_at to now' do
-      Timecop.freeze do
-        expect { subject.make_updating }.to change { subject.reload.last_update_started_at }.to be_within(1.second).of(Time.now)
-      end
-    end
-  end
-
-  describe '#updated_since?' do
-    let(:cluster) { create(:cluster) }
-    let(:prometheus_app) { build(:clusters_applications_prometheus, cluster: cluster) }
-    let(:timestamp) { Time.now - 5.minutes }
-
-    around do |example|
-      Timecop.freeze { example.run }
-    end
-
-    before do
-      prometheus_app.last_update_started_at = Time.now
-    end
-
-    context 'when app does not have status failed' do
-      it 'returns true when last update started after the timestamp' do
-        expect(prometheus_app.updated_since?(timestamp)).to be true
-      end
-
-      it 'returns false when last update started before the timestamp' do
-        expect(prometheus_app.updated_since?(Time.now + 5.minutes)).to be false
-      end
-    end
-
-    context 'when app has status failed' do
-      it 'returns false when last update started after the timestamp' do
-        prometheus_app.status = 6
-
-        expect(prometheus_app.updated_since?(timestamp)).to be false
-      end
-    end
-  end
-end

ee/spec/models/project_spec.rb

@@ -433,24 +433,6 @@ describe Project do
     end
   end
 
-  describe '#environments_for_scope' do
-    let_it_be(:project, reload: true) { create(:project) }
-
-    before do
-      create_list(:environment, 2, project: project)
-    end
-
-    it 'retrieves all project environments when using the * wildcard' do
-      expect(project.environments_for_scope("*")).to eq(project.environments)
-    end
-
-    it 'retrieves a specific project environment when using the name of that environment' do
-      environment = project.environments.first
-
-      expect(project.environments_for_scope(environment.name)).to eq([environment])
-    end
-  end
-
   describe '#ensure_external_webhook_token' do
     let(:project) { create(:project, :repository) }
 

spec/models/clusters/applications/prometheus_spec.rb

@@ -39,6 +39,19 @@ describe Clusters::Applications::Prometheus do
     end
   end
 
+  describe 'transition to updating' do
+    let(:project) { create(:project) }
+    let(:cluster) { create(:cluster, projects: [project]) }
+
+    subject { create(:clusters_applications_prometheus, :installed, cluster: cluster) }
+
+    it 'sets last_update_started_at to now' do
+      Timecop.freeze do
+        expect { subject.make_updating }.to change { subject.reload.last_update_started_at }.to be_within(1.second).of(Time.now)
+      end
+    end
+  end
+
   describe '#can_uninstall?' do
     let(:prometheus) { create(:clusters_applications_prometheus) }
 
@@ -331,6 +344,38 @@ describe Clusters::Applications::Prometheus do
     end
   end
 
+  describe '#updated_since?' do
+    let(:cluster) { create(:cluster) }
+    let(:prometheus_app) { build(:clusters_applications_prometheus, cluster: cluster) }
+    let(:timestamp) { Time.now - 5.minutes }
+
+    around do |example|
+      Timecop.freeze { example.run }
+    end
+
+    before do
+      prometheus_app.last_update_started_at = Time.now
+    end
+
+    context 'when app does not have status failed' do
+      it 'returns true when last update started after the timestamp' do
+        expect(prometheus_app.updated_since?(timestamp)).to be true
+      end
+
+      it 'returns false when last update started before the timestamp' do
+        expect(prometheus_app.updated_since?(Time.now + 5.minutes)).to be false
+      end
+    end
+
+    context 'when app has status failed' do
+      it 'returns false when last update started after the timestamp' do
+        prometheus_app.status = 6
+
+        expect(prometheus_app.updated_since?(timestamp)).to be false
+      end
+    end
+  end
+
   describe 'alert manager token' do
     subject { create(:clusters_applications_prometheus) }
 

spec/models/project_spec.rb

@@ -5938,6 +5938,24 @@ describe Project do
     end
   end
 
+  describe '#environments_for_scope' do
+    let_it_be(:project, reload: true) { create(:project) }
+
+    before do
+      create_list(:environment, 2, project: project)
+    end
+
+    it 'retrieves all project environments when using the * wildcard' do
+      expect(project.environments_for_scope("*")).to eq(project.environments)
+    end
+
+    it 'retrieves a specific project environment when using the name of that environment' do
+      environment = project.environments.first
+
+      expect(project.environments_for_scope(environment.name)).to eq([environment])
+    end
+  end
+
   def finish_job(export_job)
     export_job.start
     export_job.finish