Commit 1bf87d25 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Remove unused expressions policy from ci/cd config

parent 3474e109
...@@ -7,7 +7,6 @@ module Gitlab ...@@ -7,7 +7,6 @@ module Gitlab
# #
class Policy < Simplifiable class Policy < Simplifiable
strategy :RefsPolicy, if: -> (config) { config.is_a?(Array) } strategy :RefsPolicy, if: -> (config) { config.is_a?(Array) }
strategy :ExpressionsPolicy, if: -> (config) { config.is_a?(Hash) }
class RefsPolicy < Entry::Node class RefsPolicy < Entry::Node
include Entry::Validatable include Entry::Validatable
...@@ -17,24 +16,6 @@ module Gitlab ...@@ -17,24 +16,6 @@ module Gitlab
end end
end end
class ExpressionsPolicy < Entry::Node
include Entry::Validatable
include Entry::Attributable
attributes :refs, :expressions
validations do
validates :config, presence: true
validates :config, allowed_keys: %i[refs expressions]
with_options allow_nil: true do
validates :refs, array_of_strings_or_regexps: true
validates :expressions, type: Array
validates :expressions, presence: true
end
end
end
class UnknownStrategy < Entry::Node class UnknownStrategy < Entry::Node
def errors def errors
["#{location} has to be either an array of conditions or a hash"] ["#{location} has to be either an array of conditions or a hash"]
......
...@@ -56,26 +56,6 @@ describe Gitlab::Ci::Config::Entry::Policy do ...@@ -56,26 +56,6 @@ describe Gitlab::Ci::Config::Entry::Policy do
end end
end end
context 'when using complex policy' do
context 'when it is an empty hash' do
let(:config) { {} }
it 'reports an error about configuration not being present' do
expect(entry.errors).to include /can't be blank/
end
end
context 'when it contains unknown keys' do
let(:config) { { refs: ['something'], invalid: 'master' } }
it 'is not valid entry' do
expect(entry).not_to be_valid
expect(entry.errors)
.to include /policy config contains unknown keys: invalid/
end
end
end
context 'when policy strategy does not match' do context 'when policy strategy does not match' do
let(:config) { 'string strategy' } let(:config) { 'string strategy' }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment