kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Improve CI stage configuration entry validations

Browse source
This commit is contained in:
Grzegorz Bizon 2016-07-13 12:22:33 +02:00
parent b228787f5a
commit de4c9a2738
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/gitlab/ci/config/node/stage.rb
View file

@ -10,14 +10,16 @@ module Gitlab
validations do validations do
validates :config, type: String validates :config, type: String
validates :global, required_attribute: true
validate :known_stage, on: :processed
def known_stage with_options on: :processed do
unless known? validates :global, required: true
stages_list = global.stages.join(', ')
errors.add(:config, validate do
"should be one of defined stages (#{stages_list})") unless known?
errors.add(:config,
'should be one of defined stages ' \
"(#{global.stages.join(', ')})")
end
end end
end end
end end

2
lib/gitlab/ci/config/node/validators.rb
View file

@ -33,7 +33,7 @@ module Gitlab
end end
end end
class RequiredAttributeValidator < ActiveModel::EachValidator class RequiredValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value) def validate_each(record, attribute, value)
if value.nil? if value.nil?
raise Entry::InvalidError, raise Entry::InvalidError,

4
spec/lib/gitlab/ci/config/node/stage_spec.rb
View file

@ -28,10 +28,10 @@ describe Gitlab::Ci::Config::Node::Stage do
context 'when stage config is incorrect' do context 'when stage config is incorrect' do
describe '#errors' do describe '#errors' do
context 'when reference to global node is not set' do context 'when reference to global node is not set' do
let(:stage) { described_class.new(config) } let(:stage) { described_class.new('test') }
it 'raises error' do it 'raises error' do
expect { stage }.to raise_error( expect { stage.validate! }.to raise_error(
Gitlab::Ci::Config::Node::Entry::InvalidError, Gitlab::Ci::Config::Node::Entry::InvalidError,
/Entry needs global attribute set internally./ /Entry needs global attribute set internally./
) )