Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

9 files changed, 167 insertions, 37 deletions

diff --git a/spec/lib/gitlab/ci/config/entry/image_spec.rb b/spec/lib/gitlab/ci/config/entry/image_spec.rb
index bd1ab5d8c41..0fa6d4f8804 100644
--- a/spec/lib/gitlab/ci/config/entry/image_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/image_spec.rb
@@ -9,6 +9,8 @@ RSpec.describe Gitlab::Ci::Config::Entry::Image do
 
   before do
     stub_feature_flags(ci_docker_image_pull_policy: true)
+
+    entry.compose!
   end
 
   let(:entry) { described_class.new(config) }
@@ -129,19 +131,16 @@ RSpec.describe Gitlab::Ci::Config::Entry::Image do
 
       describe '#valid?' do
         it 'is valid' do
-          entry.compose!
-
           expect(entry).to be_valid
         end
 
         context 'when the feature flag ci_docker_image_pull_policy is disabled' do
           before do
             stub_feature_flags(ci_docker_image_pull_policy: false)
+            entry.compose!
           end
 
           it 'is not valid' do
-            entry.compose!
-
             expect(entry).not_to be_valid
             expect(entry.errors).to include('image config contains unknown keys: pull_policy')
           end
@@ -150,8 +149,6 @@ RSpec.describe Gitlab::Ci::Config::Entry::Image do
 
       describe '#value' do
         it "returns value" do
-          entry.compose!
-
           expect(entry.value).to eq(
             name: 'image:1.0',
             pull_policy: ['if-not-present']
@@ -161,11 +158,10 @@ RSpec.describe Gitlab::Ci::Config::Entry::Image do
         context 'when the feature flag ci_docker_image_pull_policy is disabled' do
           before do
             stub_feature_flags(ci_docker_image_pull_policy: false)
+            entry.compose!
           end
 
           it 'is not valid' do
-            entry.compose!
-
             expect(entry.value).to eq(
               name: 'image:1.0'
             )
diff --git a/spec/lib/gitlab/ci/config/entry/rules/rule/changes_spec.rb b/spec/lib/gitlab/ci/config/entry/rules/rule/changes_spec.rb
index 3ed4a9f263f..295561b3c4d 100644
--- a/spec/lib/gitlab/ci/config/entry/rules/rule/changes_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/rules/rule/changes_spec.rb
@@ -37,7 +37,7 @@ RSpec.describe Gitlab::Ci::Config::Entry::Rules::Rule::Changes do
       it { is_expected.not_to be_valid }
 
       it 'reports an error about invalid policy' do
-        expect(entry.errors).to include(/should be an array of strings/)
+        expect(entry.errors).to include(/should be an array or a hash/)
       end
     end
 
@@ -64,7 +64,59 @@ RSpec.describe Gitlab::Ci::Config::Entry::Rules::Rule::Changes do
 
       it 'returns information about errors' do
         expect(entry.errors)
-          .to include(/should be an array of strings/)
+          .to include(/should be an array or a hash/)
+      end
+    end
+
+    context 'with paths' do
+      context 'when paths is an array of strings' do
+        let(:config) { { paths: %w[app/ lib/] } }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when paths is not an array' do
+        let(:config) { { paths: 'string' } }
+
+        it { is_expected.not_to be_valid }
+
+        it 'returns information about errors' do
+          expect(entry.errors)
+            .to include(/should be an array of strings/)
+        end
+      end
+
+      context 'when paths is an array of integers' do
+        let(:config) { { paths: [1, 2] } }
+
+        it { is_expected.not_to be_valid }
+
+        it 'returns information about errors' do
+          expect(entry.errors)
+            .to include(/should be an array of strings/)
+        end
+      end
+
+      context 'when paths is an array of long strings' do
+        let(:config) { { paths: ['a'] * 51 } }
+
+        it { is_expected.not_to be_valid }
+
+        it 'returns information about errors' do
+          expect(entry.errors)
+            .to include(/has too many entries \(maximum 50\)/)
+        end
+      end
+
+      context 'when paths is nil' do
+        let(:config) { { paths: nil } }
+
+        it { is_expected.not_to be_valid }
+
+        it 'returns information about errors' do
+          expect(entry.errors)
+            .to include(/should be an array of strings/)
+        end
       end
     end
   end
@@ -75,6 +127,14 @@ RSpec.describe Gitlab::Ci::Config::Entry::Rules::Rule::Changes do
     context 'when using a string array' do
       let(:config) { %w[app/ lib/ spec/ other/* paths/**/*.rb] }
 
+      it { is_expected.to eq(paths: config) }
+    end
+
+    context 'with paths' do
+      let(:config) do
+        { paths: ['app/', 'lib/'] }
+      end
+
       it { is_expected.to eq(config) }
     end
   end
diff --git a/spec/lib/gitlab/ci/config/entry/rules/rule_spec.rb b/spec/lib/gitlab/ci/config/entry/rules/rule_spec.rb
index 89d349efe8f..93f4a66bfb6 100644
--- a/spec/lib/gitlab/ci/config/entry/rules/rule_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/rules/rule_spec.rb
@@ -115,7 +115,7 @@ RSpec.describe Gitlab::Ci::Config::Entry::Rules::Rule do
       it { is_expected.not_to be_valid }
 
       it 'reports an error about invalid policy' do
-        expect(subject.errors).to include(/should be an array of strings/)
+        expect(subject.errors).to include(/should be an array or a hash/)
       end
     end
 
@@ -411,7 +411,13 @@ RSpec.describe Gitlab::Ci::Config::Entry::Rules::Rule do
     context 'when using a changes: clause' do
       let(:config) { { changes: %w[app/ lib/ spec/ other/* paths/**/*.rb] } }
 
-      it { is_expected.to eq(config) }
+      it { is_expected.to eq(changes: { paths: %w[app/ lib/ spec/ other/* paths/**/*.rb] }) }
+
+      context 'when using changes with paths' do
+        let(:config) { { changes: { paths: %w[app/ lib/ spec/ other/* paths/**/*.rb] } } }
+
+        it { is_expected.to eq(config) }
+      end
     end
 
     context 'when default value has been provided' do
@@ -426,7 +432,7 @@ RSpec.describe Gitlab::Ci::Config::Entry::Rules::Rule do
       end
 
       it 'does not add to provided configuration' do
-        expect(entry.value).to eq(config)
+        expect(entry.value).to eq(changes: { paths: %w[app/**/*.rb] })
       end
     end
 
diff --git a/spec/lib/gitlab/ci/config/entry/rules_spec.rb b/spec/lib/gitlab/ci/config/entry/rules_spec.rb
index cfec33003e4..b0871f2345e 100644
--- a/spec/lib/gitlab/ci/config/entry/rules_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/rules_spec.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'fast_spec_helper'
-require 'support/helpers/stub_feature_flags'
 require_dependency 'active_model'
 
 RSpec.describe Gitlab::Ci::Config::Entry::Rules do
@@ -12,13 +11,12 @@ RSpec.describe Gitlab::Ci::Config::Entry::Rules do
   end
 
   let(:metadata) { { allowed_when: %w[always never] } }
-  let(:entry)    { factory.create! }
 
-  describe '.new' do
-    subject { entry }
+  subject(:entry) { factory.create! }
 
+  describe '.new' do
     before do
-      subject.compose!
+      entry.compose!
     end
 
     context 'with a list of rule rule' do
@@ -73,7 +71,11 @@ RSpec.describe Gitlab::Ci::Config::Entry::Rules do
   end
 
   describe '#value' do
-    subject { entry.value }
+    subject(:value) { entry.value }
+
+    before do
+      entry.compose!
+    end
 
     context 'with a list of rule rule' do
       let(:config) do
@@ -99,7 +101,7 @@ RSpec.describe Gitlab::Ci::Config::Entry::Rules do
         { if: '$SKIP', when: 'never' }
       end
 
-      it { is_expected.to eq([config]) }
+      it { is_expected.to eq([]) }
     end
 
     context 'with nested rules' do
diff --git a/spec/lib/gitlab/ci/config/entry/service_spec.rb b/spec/lib/gitlab/ci/config/entry/service_spec.rb
index 2795cc9dddf..3c000fd09ed 100644
--- a/spec/lib/gitlab/ci/config/entry/service_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/service_spec.rb
@@ -1,14 +1,19 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'fast_spec_helper'
+require 'support/helpers/stubbed_feature'
+require 'support/helpers/stub_feature_flags'
 
 RSpec.describe Gitlab::Ci::Config::Entry::Service do
-  let(:entry) { described_class.new(config) }
+  include StubFeatureFlags
 
   before do
+    stub_feature_flags(ci_docker_image_pull_policy: true)
     entry.compose!
   end
 
+  subject(:entry) { described_class.new(config) }
+
   context 'when configuration is a string' do
     let(:config) { 'postgresql:9.5' }
 
@@ -90,6 +95,12 @@ RSpec.describe Gitlab::Ci::Config::Entry::Service do
       end
     end
 
+    describe '#pull_policy' do
+      it "returns nil" do
+        expect(entry.pull_policy).to be_nil
+      end
+    end
+
     context 'when configuration has ports' do
       let(:ports) { [{ number: 80, protocol: 'http', name: 'foobar' }] }
       let(:config) do
@@ -134,6 +145,49 @@ RSpec.describe Gitlab::Ci::Config::Entry::Service do
         end
       end
     end
+
+    context 'when configuration has pull_policy' do
+      let(:config) { { name: 'postgresql:9.5', pull_policy: 'if-not-present' } }
+
+      describe '#valid?' do
+        it 'is valid' do
+          expect(entry).to be_valid
+        end
+
+        context 'when the feature flag ci_docker_image_pull_policy is disabled' do
+          before do
+            stub_feature_flags(ci_docker_image_pull_policy: false)
+            entry.compose!
+          end
+
+          it 'is not valid' do
+            expect(entry).not_to be_valid
+            expect(entry.errors).to include('service config contains unknown keys: pull_policy')
+          end
+        end
+      end
+
+      describe '#value' do
+        it "returns value" do
+          expect(entry.value).to eq(
+            name: 'postgresql:9.5',
+            pull_policy: ['if-not-present']
+          )
+        end
+
+        context 'when the feature flag ci_docker_image_pull_policy is disabled' do
+          before do
+            stub_feature_flags(ci_docker_image_pull_policy: false)
+          end
+
+          it 'is not valid' do
+            expect(entry.value).to eq(
+              name: 'postgresql:9.5'
+            )
+          end
+        end
+      end
+    end
   end
 
   context 'when entry value is not correct' do
diff --git a/spec/lib/gitlab/ci/config/external/context_spec.rb b/spec/lib/gitlab/ci/config/external/context_spec.rb
index 800c563cd0b..40702e75404 100644
--- a/spec/lib/gitlab/ci/config/external/context_spec.rb
+++ b/spec/lib/gitlab/ci/config/external/context_spec.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'fast_spec_helper'
+require 'spec_helper'
 
 RSpec.describe Gitlab::Ci::Config::External::Context do
-  let(:project) { double('Project') }
+  let(:project) { build(:project) }
   let(:user) { double('User') }
   let(:sha) { '12345' }
   let(:variables) { Gitlab::Ci::Variables::Collection.new([{ 'key' => 'a', 'value' => 'b' }]) }
@@ -126,7 +126,7 @@ RSpec.describe Gitlab::Ci::Config::External::Context do
     end
 
     context 'with attributes' do
-      let(:new_attributes) { { project: double, user: double, sha: '56789' } }
+      let(:new_attributes) { { project: build(:project), user: double, sha: '56789' } }
 
       it_behaves_like 'a mutated context'
     end
diff --git a/spec/lib/gitlab/ci/config/external/file/project_spec.rb b/spec/lib/gitlab/ci/config/external/file/project_spec.rb
index 77e542cf933..72a85c9b03d 100644
--- a/spec/lib/gitlab/ci/config/external/file/project_spec.rb
+++ b/spec/lib/gitlab/ci/config/external/file/project_spec.rb
@@ -177,6 +177,22 @@ RSpec.describe Gitlab::Ci::Config::External::File::Project do
         expect(project_file.error_message).to include("Project `xxxxxxxxxxxxxxxxxxxxxxx` not found or access denied!")
       end
     end
+
+    context 'when a project contained in an array is used with a masked variable' do
+      let(:variables) do
+        Gitlab::Ci::Variables::Collection.new([
+          { key: 'VAR1', value: 'a_secret_variable_value', masked: true }
+        ])
+      end
+
+      let(:params) do
+        { project: ['a_secret_variable_value'], file: '/file.yml' }
+      end
+
+      it 'does not raise an error' do
+        expect { valid? }.not_to raise_error
+      end
+    end
   end
 
   describe '#expand_context' do
diff --git a/spec/lib/gitlab/ci/config/external/mapper_spec.rb b/spec/lib/gitlab/ci/config/external/mapper_spec.rb
index 7e1b31fea6a..e74fdc2071b 100644
--- a/spec/lib/gitlab/ci/config/external/mapper_spec.rb
+++ b/spec/lib/gitlab/ci/config/external/mapper_spec.rb
@@ -232,11 +232,9 @@ RSpec.describe Gitlab::Ci::Config::External::Mapper do
           image: 'image:1.0' }
       end
 
-      before do
-        stub_const("#{described_class}::MAX_INCLUDES", 2)
-      end
-
       it 'does not raise an exception' do
+        allow(context).to receive(:max_includes).and_return(2)
+
         expect { subject }.not_to raise_error
       end
     end
@@ -250,11 +248,9 @@ RSpec.describe Gitlab::Ci::Config::External::Mapper do
           image: 'image:1.0' }
       end
 
-      before do
-        stub_const("#{described_class}::MAX_INCLUDES", 1)
-      end
-
       it 'raises an exception' do
+        allow(context).to receive(:max_includes).and_return(1)
+
         expect { subject }.to raise_error(described_class::TooManyIncludesError)
       end
 
@@ -264,6 +260,8 @@ RSpec.describe Gitlab::Ci::Config::External::Mapper do
         end
 
         it 'raises an exception' do
+          allow(context).to receive(:max_includes).and_return(1)
+
           expect { subject }.to raise_error(described_class::TooManyIncludesError)
         end
       end
diff --git a/spec/lib/gitlab/ci/config/external/processor_spec.rb b/spec/lib/gitlab/ci/config/external/processor_spec.rb
index 15a0ff40aa4..841a46e197d 100644
--- a/spec/lib/gitlab/ci/config/external/processor_spec.rb
+++ b/spec/lib/gitlab/ci/config/external/processor_spec.rb
@@ -323,11 +323,9 @@ RSpec.describe Gitlab::Ci::Config::External::Processor do
       end
 
       context 'when too many includes is included' do
-        before do
-          stub_const('Gitlab::Ci::Config::External::Mapper::MAX_INCLUDES', 1)
-        end
-
         it 'raises an error' do
+          allow(context).to receive(:max_includes).and_return(1)
+
           expect { subject }.to raise_error(Gitlab::Ci::Config::External::Processor::IncludeError, /Maximum of 1 nested/)
         end
       end