Merge remote-tracking branch 'origin/12-1-auto-deploy-20190718' into 12-1-stable

5 files changed, 228 insertions, 178 deletions

diff --git a/spec/lib/gitlab/ci/pipeline/chain/validate/abilities_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/validate/abilities_spec.rb
index 7d750877d09..b3e58c3dfdb 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/validate/abilities_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/validate/abilities_spec.rb
@@ -10,7 +10,11 @@ describe Gitlab::Ci::Pipeline::Chain::Validate::Abilities do
 
   let(:command) do
     Gitlab::Ci::Pipeline::Chain::Command.new(
-      project: project, current_user: user, origin_ref: origin_ref, merge_request: merge_request)
+      project: project,
+      current_user: user,
+      origin_ref: origin_ref,
+      merge_request: merge_request,
+      trigger_request: trigger_request)
   end
 
   let(:step) { described_class.new(pipeline, command) }
@@ -18,6 +22,7 @@ describe Gitlab::Ci::Pipeline::Chain::Validate::Abilities do
   let(:ref) { 'master' }
   let(:origin_ref) { ref }
   let(:merge_request) { nil }
+  let(:trigger_request) { nil }
 
   shared_context 'detached merge request pipeline' do
     let(:merge_request) do
@@ -69,6 +74,43 @@ describe Gitlab::Ci::Pipeline::Chain::Validate::Abilities do
     end
   end
 
+  context 'when pipeline triggered by legacy trigger' do
+    let(:user) { nil }
+    let(:trigger_request) do
+      build_stubbed(:ci_trigger_request, trigger: build_stubbed(:ci_trigger, owner: nil))
+    end
+
+    context 'when :use_legacy_pipeline_triggers feature flag is enabled' do
+      before do
+        stub_feature_flags(use_legacy_pipeline_triggers: true)
+        step.perform!
+      end
+
+      it 'allows legacy triggers to create a pipeline' do
+        expect(pipeline).to be_valid
+      end
+
+      it 'does not break the chain' do
+        expect(step.break?).to eq false
+      end
+    end
+
+    context 'when :use_legacy_pipeline_triggers feature flag is disabled' do
+      before do
+        stub_feature_flags(use_legacy_pipeline_triggers: false)
+        step.perform!
+      end
+
+      it 'prevents legacy triggers from creating a pipeline' do
+        expect(pipeline.errors.to_a).to include /Trigger token is invalid/
+      end
+
+      it 'breaks the pipeline builder chain' do
+        expect(step.break?).to eq true
+      end
+    end
+  end
+
   describe '#allowed_to_create?' do
     subject { step.allowed_to_create? }
 
diff --git a/spec/lib/gitlab/ci/pipeline/expression/lexeme/pattern_spec.rb b/spec/lib/gitlab/ci/pipeline/expression/lexeme/pattern_spec.rb
index 30ea3f3e28e..6ce4b321397 100644
--- a/spec/lib/gitlab/ci/pipeline/expression/lexeme/pattern_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/expression/lexeme/pattern_spec.rb
@@ -107,42 +107,6 @@ describe Gitlab::Ci::Pipeline::Expression::Lexeme::Pattern do
       expect(token.build.evaluate)
         .to eq Gitlab::UntrustedRegexp.new('some numeric \$ pattern')
     end
-
-    context 'with the ci_variables_complex_expressions feature flag disabled' do
-      before do
-        stub_feature_flags(ci_variables_complex_expressions: false)
-      end
-
-      it 'is a greedy scanner for regexp boundaries' do
-        scanner = StringScanner.new('/some .* / pattern/')
-
-        token = described_class.scan(scanner)
-
-        expect(token).not_to be_nil
-        expect(token.build.evaluate)
-          .to eq Gitlab::UntrustedRegexp.new('some .* / pattern')
-      end
-
-      it 'does not recognize the \ escape character for /' do
-        scanner = StringScanner.new('/some .* \/ pattern/')
-
-        token = described_class.scan(scanner)
-
-        expect(token).not_to be_nil
-        expect(token.build.evaluate)
-          .to eq Gitlab::UntrustedRegexp.new('some .* \/ pattern')
-      end
-
-      it 'does not recognize the \ escape character for $' do
-        scanner = StringScanner.new('/some numeric \$ pattern/')
-
-        token = described_class.scan(scanner)
-
-        expect(token).not_to be_nil
-        expect(token.build.evaluate)
-          .to eq Gitlab::UntrustedRegexp.new('some numeric \$ pattern')
-      end
-    end
   end
 
   describe '#evaluate' do
diff --git a/spec/lib/gitlab/ci/pipeline/expression/lexer_spec.rb b/spec/lib/gitlab/ci/pipeline/expression/lexer_spec.rb
index d8db9c262a1..7c98e729b0b 100644
--- a/spec/lib/gitlab/ci/pipeline/expression/lexer_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/expression/lexer_spec.rb
@@ -80,34 +80,6 @@ describe Gitlab::Ci::Pipeline::Expression::Lexer do
         it { is_expected.to eq(tokens) }
       end
     end
-
-    context 'with the ci_variables_complex_expressions feature flag turned off' do
-      before do
-        stub_feature_flags(ci_variables_complex_expressions: false)
-      end
-
-      it 'incorrectly tokenizes conjunctive match statements as one match statement' do
-        tokens = described_class.new('$PRESENT_VARIABLE =~ /my var/ && $EMPTY_VARIABLE =~ /nope/').tokens
-
-        expect(tokens.map(&:value)).to eq(['$PRESENT_VARIABLE', '=~', '/my var/ && $EMPTY_VARIABLE =~ /nope/'])
-      end
-
-      it 'incorrectly tokenizes disjunctive match statements as one statement' do
-        tokens = described_class.new('$PRESENT_VARIABLE =~ /my var/ || $EMPTY_VARIABLE =~ /nope/').tokens
-
-        expect(tokens.map(&:value)).to eq(['$PRESENT_VARIABLE', '=~', '/my var/ || $EMPTY_VARIABLE =~ /nope/'])
-      end
-
-      it 'raises an error about && operators' do
-        expect { described_class.new('$EMPTY_VARIABLE == "" && $PRESENT_VARIABLE').tokens }
-          .to raise_error(Gitlab::Ci::Pipeline::Expression::Lexer::SyntaxError).with_message('Unknown lexeme found!')
-      end
-
-      it 'raises an error about || operators' do
-        expect { described_class.new('$EMPTY_VARIABLE == "" || $PRESENT_VARIABLE').tokens }
-          .to raise_error(Gitlab::Ci::Pipeline::Expression::Lexer::SyntaxError).with_message('Unknown lexeme found!')
-      end
-    end
   end
 
   describe '#lexemes' do
diff --git a/spec/lib/gitlab/ci/pipeline/expression/statement_spec.rb b/spec/lib/gitlab/ci/pipeline/expression/statement_spec.rb
index a2c2e3653d5..b259ef711aa 100644
--- a/spec/lib/gitlab/ci/pipeline/expression/statement_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/expression/statement_spec.rb
@@ -1,6 +1,4 @@
-# TODO switch this back after the "ci_variables_complex_expressions" feature flag is removed
-# require 'fast_spec_helper'
-require 'spec_helper'
+require 'fast_spec_helper'
 require 'rspec-parameterized'
 
 describe Gitlab::Ci::Pipeline::Expression::Statement do
@@ -118,54 +116,6 @@ describe Gitlab::Ci::Pipeline::Expression::Statement do
         expect(subject.evaluate).to eq(value)
       end
     end
-
-    context 'with the ci_variables_complex_expressions feature flag disabled' do
-      before do
-        stub_feature_flags(ci_variables_complex_expressions: false)
-      end
-
-      where(:expression, :value) do
-        '$PRESENT_VARIABLE == "my variable"'                          | true
-        '"my variable" == $PRESENT_VARIABLE'                          | true
-        '$PRESENT_VARIABLE == null'                                   | false
-        '$EMPTY_VARIABLE == null'                                     | false
-        '"" == $EMPTY_VARIABLE'                                       | true
-        '$EMPTY_VARIABLE'                                             | ''
-        '$UNDEFINED_VARIABLE == null'                                 | true
-        'null == $UNDEFINED_VARIABLE'                                 | true
-        '$PRESENT_VARIABLE'                                           | 'my variable'
-        '$UNDEFINED_VARIABLE'                                         | nil
-        "$PRESENT_VARIABLE =~ /var.*e$/"                              | true
-        "$PRESENT_VARIABLE =~ /^var.*/"                               | false
-        "$EMPTY_VARIABLE =~ /var.*/"                                  | false
-        "$UNDEFINED_VARIABLE =~ /var.*/"                              | false
-        "$PRESENT_VARIABLE =~ /VAR.*/i"                               | true
-        '$PATH_VARIABLE =~ /path/variable/'                           | true
-        '$PATH_VARIABLE =~ /path\/variable/'                          | true
-        '$FULL_PATH_VARIABLE =~ /^/a/full/path/variable/value$/'      | true
-        '$FULL_PATH_VARIABLE =~ /^\/a\/full\/path\/variable\/value$/' | true
-        '$PRESENT_VARIABLE != "my variable"'                          | false
-        '"my variable" != $PRESENT_VARIABLE'                          | false
-        '$PRESENT_VARIABLE != null'                                   | true
-        '$EMPTY_VARIABLE != null'                                     | true
-        '"" != $EMPTY_VARIABLE'                                       | false
-        '$UNDEFINED_VARIABLE != null'                                 | false
-        'null != $UNDEFINED_VARIABLE'                                 | false
-        "$PRESENT_VARIABLE !~ /var.*e$/"                              | false
-        "$PRESENT_VARIABLE !~ /^var.*/"                               | true
-        "$EMPTY_VARIABLE !~ /var.*/"                                  | true
-        "$UNDEFINED_VARIABLE !~ /var.*/"                              | true
-        "$PRESENT_VARIABLE !~ /VAR.*/i"                               | false
-      end
-
-      with_them do
-        let(:text) { expression }
-
-        it "evaluates to `#{params[:value].inspect}`" do
-          expect(subject.evaluate).to eq value
-        end
-      end
-    end
   end
 
   describe '#truthful?' do
diff --git a/spec/lib/gitlab/ci/pipeline/seed/build_spec.rb b/spec/lib/gitlab/ci/pipeline/seed/build_spec.rb
index 7991e2f48b5..46ea0d7554b 100644
--- a/spec/lib/gitlab/ci/pipeline/seed/build_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/seed/build_spec.rb
@@ -1,32 +1,30 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Ci::Pipeline::Seed::Build do
   let(:project) { create(:project, :repository) }
   let(:pipeline) { create(:ci_empty_pipeline, project: project) }
+  let(:attributes) { { name: 'rspec', ref: 'master' } }
 
-  let(:attributes) do
-    { name: 'rspec', ref: 'master' }
-  end
-
-  subject do
-    described_class.new(pipeline, attributes)
-  end
+  let(:seed_build) { described_class.new(pipeline, attributes) }
 
   describe '#attributes' do
-    it 'returns hash attributes of a build' do
-      expect(subject.attributes).to be_a Hash
-      expect(subject.attributes)
-        .to include(:name, :project, :ref)
-    end
+    subject { seed_build.attributes }
+
+    it { is_expected.to be_a(Hash) }
+    it { is_expected.to include(:name, :project, :ref) }
   end
 
   describe '#bridge?' do
+    subject { seed_build.bridge? }
+
     context 'when job is a bridge' do
       let(:attributes) do
         { name: 'rspec', ref: 'master', options: { trigger: 'my/project' } }
       end
 
-      it { is_expected.to be_bridge }
+      it { is_expected.to be_truthy }
     end
 
     context 'when trigger definition is empty' do
@@ -34,20 +32,20 @@ describe Gitlab::Ci::Pipeline::Seed::Build do
         { name: 'rspec', ref: 'master', options: { trigger: '' } }
       end
 
-      it { is_expected.not_to be_bridge }
+      it { is_expected.to be_falsey }
     end
 
     context 'when job is not a bridge' do
-      it { is_expected.not_to be_bridge }
+      it { is_expected.to be_falsey }
     end
   end
 
   describe '#to_resource' do
+    subject { seed_build.to_resource }
+
     context 'when job is not a bridge' do
-      it 'returns a valid build resource' do
-        expect(subject.to_resource).to be_a(::Ci::Build)
-        expect(subject.to_resource).to be_valid
-      end
+      it { is_expected.to be_a(::Ci::Build) }
+      it { is_expected.to be_valid }
     end
 
     context 'when job is a bridge' do
@@ -55,71 +53,117 @@ describe Gitlab::Ci::Pipeline::Seed::Build do
         { name: 'rspec', ref: 'master', options: { trigger: 'my/project' } }
       end
 
-      it 'returns a valid bridge resource' do
-        expect(subject.to_resource).to be_a(::Ci::Bridge)
-        expect(subject.to_resource).to be_valid
-      end
+      it { is_expected.to be_a(::Ci::Bridge) }
+      it { is_expected.to be_valid }
     end
 
     it 'memoizes a resource object' do
-      build = subject.to_resource
-
-      expect(build.object_id).to eq subject.to_resource.object_id
+      expect(subject.object_id).to eq seed_build.to_resource.object_id
     end
 
     it 'can not be persisted without explicit assignment' do
-      build = subject.to_resource
-
       pipeline.save!
 
-      expect(build).not_to be_persisted
+      expect(subject).not_to be_persisted
     end
   end
 
-  describe 'applying only/except policies' do
+  describe 'applying job inclusion policies' do
+    subject { seed_build }
+
     context 'when no branch policy is specified' do
-      let(:attributes) { { name: 'rspec' } }
+      let(:attributes) do
+        { name: 'rspec' }
+      end
 
       it { is_expected.to be_included }
     end
 
     context 'when branch policy does not match' do
       context 'when using only' do
-        let(:attributes) { { name: 'rspec', only: { refs: ['deploy'] } } }
+        let(:attributes) do
+          { name: 'rspec', only: { refs: ['deploy'] } }
+        end
 
         it { is_expected.not_to be_included }
       end
 
       context 'when using except' do
-        let(:attributes) { { name: 'rspec', except: { refs: ['deploy'] } } }
+        let(:attributes) do
+          { name: 'rspec', except: { refs: ['deploy'] } }
+        end
 
         it { is_expected.to be_included }
       end
+
+      context 'with both only and except policies' do
+        let(:attributes) do
+          {
+            name: 'rspec',
+            only: { refs: %w[deploy] },
+            except: { refs: %w[deploy] }
+          }
+        end
+
+        it { is_expected.not_to be_included }
+      end
     end
 
     context 'when branch regexp policy does not match' do
       context 'when using only' do
-        let(:attributes) { { name: 'rspec', only: { refs: ['/^deploy$/'] } } }
+        let(:attributes) do
+          { name: 'rspec', only: { refs: %w[/^deploy$/] } }
+        end
 
         it { is_expected.not_to be_included }
       end
 
       context 'when using except' do
-        let(:attributes) { { name: 'rspec', except: { refs: ['/^deploy$/'] } } }
+        let(:attributes) do
+          { name: 'rspec', except: { refs: %w[/^deploy$/] } }
+        end
 
         it { is_expected.to be_included }
       end
+
+      context 'with both only and except policies' do
+        let(:attributes) do
+          {
+            name: 'rspec',
+            only: { refs: %w[/^deploy$/] },
+            except: { refs: %w[/^deploy$/] }
+          }
+        end
+
+        it { is_expected.not_to be_included }
+      end
     end
 
     context 'when branch policy matches' do
       context 'when using only' do
-        let(:attributes) { { name: 'rspec', only: { refs: %w[deploy master] } } }
+        let(:attributes) do
+          { name: 'rspec', only: { refs: %w[deploy master] } }
+        end
 
         it { is_expected.to be_included }
       end
 
       context 'when using except' do
-        let(:attributes) { { name: 'rspec', except: { refs: %w[deploy master] } } }
+        let(:attributes) do
+          { name: 'rspec', except: { refs: %w[deploy master] } }
+        end
+
+        it { is_expected.not_to be_included }
+      end
+
+      context 'when using both only and except policies' do
+        let(:attributes) do
+          {
+            name: 'rspec',
+            only: { refs: %w[deploy master] },
+            except: { refs: %w[deploy master] }
+          }
+        end
 
         it { is_expected.not_to be_included }
       end
@@ -127,13 +171,29 @@ describe Gitlab::Ci::Pipeline::Seed::Build do
 
     context 'when keyword policy matches' do
       context 'when using only' do
-        let(:attributes) { { name: 'rspec', only: { refs: ['branches'] } } }
+        let(:attributes) do
+          { name: 'rspec', only: { refs: %w[branches] } }
+        end
 
         it { is_expected.to be_included }
       end
 
       context 'when using except' do
-        let(:attributes) { { name: 'rspec', except: { refs: ['branches'] } } }
+        let(:attributes) do
+          { name: 'rspec', except: { refs: %w[branches] } }
+        end
+
+        it { is_expected.not_to be_included }
+      end
+
+      context 'when using both only and except policies' do
+        let(:attributes) do
+          {
+            name: 'rspec',
+            only: { refs: %w[branches] },
+            except: { refs: %w[branches] }
+          }
+        end
 
         it { is_expected.not_to be_included }
       end
@@ -141,50 +201,78 @@ describe Gitlab::Ci::Pipeline::Seed::Build do
 
     context 'when keyword policy does not match' do
       context 'when using only' do
-        let(:attributes) { { name: 'rspec', only: { refs: ['tags'] } } }
+        let(:attributes) do
+          { name: 'rspec', only: { refs: %w[tags] } }
+        end
 
         it { is_expected.not_to be_included }
       end
 
       context 'when using except' do
-        let(:attributes) { { name: 'rspec', except: { refs: ['tags'] } } }
+        let(:attributes) do
+          { name: 'rspec', except: { refs: %w[tags] } }
+        end
 
         it { is_expected.to be_included }
       end
+
+      context 'when using both only and except policies' do
+        let(:attributes) do
+          {
+            name: 'rspec',
+            only: { refs: %w[tags] },
+            except: { refs: %w[tags] }
+          }
+        end
+
+        it { is_expected.not_to be_included }
+      end
     end
 
     context 'with source-keyword policy' do
       using RSpec::Parameterized
 
-      let(:pipeline) { build(:ci_empty_pipeline, ref: 'deploy', tag: false, source: source) }
+      let(:pipeline) do
+        build(:ci_empty_pipeline, ref: 'deploy', tag: false, source: source)
+      end
 
       context 'matches' do
         where(:keyword, :source) do
           [
-            %w(pushes push),
-            %w(web web),
-            %w(triggers trigger),
-            %w(schedules schedule),
-            %w(api api),
-            %w(external external)
+            %w[pushes push],
+            %w[web web],
+            %w[triggers trigger],
+            %w[schedules schedule],
+            %w[api api],
+            %w[external external]
           ]
         end
 
         with_them do
           context 'using an only policy' do
-            let(:attributes) { { name: 'rspec', only: { refs: [keyword] } } }
+            let(:attributes) do
+              { name: 'rspec', only: { refs: [keyword] } }
+            end
 
             it { is_expected.to be_included }
           end
 
           context 'using an except policy' do
-            let(:attributes) { { name: 'rspec', except: { refs: [keyword] } } }
+            let(:attributes) do
+              { name: 'rspec', except: { refs: [keyword] } }
+            end
 
             it { is_expected.not_to be_included }
           end
 
           context 'using both only and except policies' do
-            let(:attributes) { { name: 'rspec', only: { refs: [keyword] }, except: { refs: [keyword] } } }
+            let(:attributes) do
+              {
+                name: 'rspec',
+                only: { refs: [keyword] },
+                except: { refs: [keyword] }
+              }
+            end
 
             it { is_expected.not_to be_included }
           end
@@ -193,29 +281,39 @@ describe Gitlab::Ci::Pipeline::Seed::Build do
 
       context 'non-matches' do
         where(:keyword, :source) do
-          %w(web trigger schedule api external).map { |source| ['pushes', source] } +
-          %w(push trigger schedule api external).map { |source| ['web', source] } +
-          %w(push web schedule api external).map { |source| ['triggers', source] } +
-          %w(push web trigger api external).map { |source| ['schedules', source] } +
-          %w(push web trigger schedule external).map { |source| ['api', source] } +
-          %w(push web trigger schedule api).map { |source| ['external', source] }
+          %w[web trigger schedule api external].map  { |source| ['pushes', source] } +
+          %w[push trigger schedule api external].map { |source| ['web', source] } +
+          %w[push web schedule api external].map { |source| ['triggers', source] } +
+          %w[push web trigger api external].map { |source| ['schedules', source] } +
+          %w[push web trigger schedule external].map { |source| ['api', source] } +
+          %w[push web trigger schedule api].map { |source| ['external', source] }
         end
 
         with_them do
           context 'using an only policy' do
-            let(:attributes) { { name: 'rspec', only: { refs: [keyword] } } }
+            let(:attributes) do
+              { name: 'rspec', only: { refs: [keyword] } }
+            end
 
             it { is_expected.not_to be_included }
           end
 
           context 'using an except policy' do
-            let(:attributes) { { name: 'rspec', except: { refs: [keyword] } } }
+            let(:attributes) do
+              { name: 'rspec', except: { refs: [keyword] } }
+            end
 
             it { is_expected.to be_included }
           end
 
           context 'using both only and except policies' do
-            let(:attributes) { { name: 'rspec', only: { refs: [keyword] }, except: { refs: [keyword] } } }
+            let(:attributes) do
+              {
+                name: 'rspec',
+                only: { refs: [keyword] },
+                except: { refs: [keyword] }
+              }
+            end
 
             it { is_expected.not_to be_included }
           end
@@ -239,12 +337,24 @@ describe Gitlab::Ci::Pipeline::Seed::Build do
 
         it { is_expected.not_to be_included }
       end
+
+      context 'when using both only and except policies' do
+        let(:attributes) do
+          {
+            name: 'rspec',
+            only: { refs: ["branches@#{pipeline.project_full_path}"] },
+            except: { refs: ["branches@#{pipeline.project_full_path}"] }
+          }
+        end
+
+        it { is_expected.not_to be_included }
+      end
     end
 
     context 'when repository path does not matches' do
       context 'when using only' do
         let(:attributes) do
-          { name: 'rspec', only: { refs: ['branches@fork'] } }
+          { name: 'rspec', only: { refs: %w[branches@fork] } }
         end
 
         it { is_expected.not_to be_included }
@@ -252,11 +362,23 @@ describe Gitlab::Ci::Pipeline::Seed::Build do
 
       context 'when using except' do
         let(:attributes) do
-          { name: 'rspec', except: { refs: ['branches@fork'] } }
+          { name: 'rspec', except: { refs: %w[branches@fork] } }
         end
 
         it { is_expected.to be_included }
       end
+
+      context 'when using both only and except policies' do
+        let(:attributes) do
+          {
+            name: 'rspec',
+            only: { refs: %w[branches@fork] },
+            except: { refs: %w[branches@fork] }
+          }
+        end
+
+        it { is_expected.not_to be_included }
+      end
     end
   end
 end