Add latest changes from gitlab-org/gitlab@master

1 files changed, 51 insertions, 67 deletions

diff --git a/spec/services/clusters/parse_cluster_applications_artifact_service_spec.rb b/spec/services/clusters/parse_cluster_applications_artifact_service_spec.rb
index e669e73ccb8..1f6ad218927 100644
--- a/spec/services/clusters/parse_cluster_applications_artifact_service_spec.rb
+++ b/spec/services/clusters/parse_cluster_applications_artifact_service_spec.rb
@@ -36,105 +36,89 @@ RSpec.describe Clusters::ParseClusterApplicationsArtifactService do
     let(:job) { deployment.deployable }
     let(:artifact) { create(:ci_job_artifact, :cluster_applications, job: job) }
 
-    context 'when cluster_applications_artifact feature flag is disabled' do
-      before do
-        stub_feature_flags(cluster_applications_artifact: false)
-      end
-
-      it 'does not call Gitlab::Kubernetes::Helm::Parsers::ListV2 and returns success immediately' do
-        expect(Gitlab::Kubernetes::Helm::Parsers::ListV2).not_to receive(:new)
+    it 'calls Gitlab::Kubernetes::Helm::Parsers::ListV2' do
+      expect(Gitlab::Kubernetes::Helm::Parsers::ListV2).to receive(:new).and_call_original
 
-        result = described_class.new(job, user).execute(artifact)
+      result = described_class.new(job, user).execute(artifact)
 
-        expect(result[:status]).to eq(:success)
-      end
+      expect(result[:status]).to eq(:success)
     end
 
-    context 'when cluster_applications_artifact feature flag is enabled for project' do
-      before do
-        stub_feature_flags(cluster_applications_artifact: job.project)
+    context 'artifact is not of cluster_applications type' do
+      let(:artifact) { create(:ci_job_artifact, :archive) }
+      let(:job) { artifact.job }
+
+      it 'raise ArgumentError' do
+        expect do
+          described_class.new(job, user).execute(artifact)
+        end.to raise_error(ArgumentError, 'Artifact is not cluster_applications file type')
       end
+    end
 
-      it 'calls Gitlab::Kubernetes::Helm::Parsers::ListV2' do
-        expect(Gitlab::Kubernetes::Helm::Parsers::ListV2).to receive(:new).and_call_original
+    context 'artifact exceeds acceptable size' do
+      it 'returns an error' do
+        stub_const("#{described_class}::MAX_ACCEPTABLE_ARTIFACT_SIZE", 1.byte)
 
         result = described_class.new(job, user).execute(artifact)
 
-        expect(result[:status]).to eq(:success)
+        expect(result[:status]).to eq(:error)
+        expect(result[:message]).to eq('Cluster_applications artifact too big. Maximum allowable size: 1 Byte')
       end
+    end
 
-      context 'artifact is not of cluster_applications type' do
-        let(:artifact) { create(:ci_job_artifact, :archive) }
-        let(:job) { artifact.job }
+    context 'job has no deployment' do
+      let(:job) { build(:ci_build) }
 
-        it 'raise ArgumentError' do
-          expect do
-            described_class.new(job, user).execute(artifact)
-          end.to raise_error(ArgumentError, 'Artifact is not cluster_applications file type')
-        end
+      it 'returns an error' do
+        result = described_class.new(job, user).execute(artifact)
+
+        expect(result[:status]).to eq(:error)
+        expect(result[:message]).to eq('No deployment found for this job')
       end
+    end
 
-      context 'artifact exceeds acceptable size' do
-        it 'returns an error' do
-          stub_const("#{described_class}::MAX_ACCEPTABLE_ARTIFACT_SIZE", 1.byte)
+    context 'job has no deployment cluster' do
+      let(:deployment) { create(:deployment) }
+      let(:job) { deployment.deployable }
 
-          result = described_class.new(job, user).execute(artifact)
+      it 'returns an error' do
+        result = described_class.new(job, user).execute(artifact)
 
-          expect(result[:status]).to eq(:error)
-          expect(result[:message]).to eq('Cluster_applications artifact too big. Maximum allowable size: 1 Byte')
-        end
+        expect(result[:status]).to eq(:error)
+        expect(result[:message]).to eq('No deployment cluster found for this job')
       end
+    end
 
-      context 'job has no deployment' do
-        let(:job) { build(:ci_build) }
+    context 'blob is empty' do
+      let(:file) { fixture_file_upload(Rails.root.join("spec/fixtures/helm/helm_list_v2_empty_blob.json.gz")) }
+      let(:artifact) { create(:ci_job_artifact, :cluster_applications, job: job, file: file) }
 
-        it 'returns an error' do
-          result = described_class.new(job, user).execute(artifact)
+      it 'returns success' do
+        result = described_class.new(job, user).execute(artifact)
 
-          expect(result[:status]).to eq(:error)
-          expect(result[:message]).to eq('No deployment found for this job')
-        end
+        expect(result[:status]).to eq(:success)
       end
+    end
 
-      context 'job has no deployment cluster' do
-        let(:deployment) { create(:deployment) }
-        let(:job) { deployment.deployable }
+    context 'job has deployment cluster' do
+      context 'current user does not have access to deployment cluster' do
+        let(:other_user) { create(:user) }
 
         it 'returns an error' do
-          result = described_class.new(job, user).execute(artifact)
+          result = described_class.new(job, other_user).execute(artifact)
 
           expect(result[:status]).to eq(:error)
           expect(result[:message]).to eq('No deployment cluster found for this job')
         end
       end
 
-      context 'blob is empty' do
-        let(:file) { fixture_file_upload(Rails.root.join("spec/fixtures/helm/helm_list_v2_empty_blob.json.gz")) }
-        let(:artifact) { create(:ci_job_artifact, :cluster_applications, job: job, file: file) }
-
-        it 'returns success' do
-          result = described_class.new(job, user).execute(artifact)
-
-          expect(result[:status]).to eq(:success)
-        end
+      it 'does not affect unpermitted cluster applications' do
+        expect(Clusters::ParseClusterApplicationsArtifactService::RELEASE_NAMES).to contain_exactly('cilium')
       end
 
-      context 'job has deployment cluster' do
-        context 'current user does not have access to deployment cluster' do
-          let(:other_user) { create(:user) }
-
-          it 'returns an error' do
-            result = described_class.new(job, other_user).execute(artifact)
-
-            expect(result[:status]).to eq(:error)
-            expect(result[:message]).to eq('No deployment cluster found for this job')
-          end
-        end
-
-        Clusters::ParseClusterApplicationsArtifactService::RELEASE_NAMES.each do |release_name|
-          context release_name do
-            include_examples 'parse cluster applications artifact', release_name
-          end
+      Clusters::ParseClusterApplicationsArtifactService::RELEASE_NAMES.each do |release_name|
+        context release_name do
+          include_examples 'parse cluster applications artifact', release_name
         end
       end
     end