Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
15633956
Commit
15633956
authored
Jun 21, 2018
by
Tomasz Maczukin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enforce setting string as value of the CI/CD variable
parent
60f51cd2
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
76 additions
and
19 deletions
+76
-19
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+3
-3
app/models/project_auto_devops.rb
app/models/project_auto_devops.rb
+2
-2
lib/gitlab/ci/variables/collection/item.rb
lib/gitlab/ci/variables/collection/item.rb
+3
-0
spec/lib/gitlab/ci/variables/collection/item_spec.rb
spec/lib/gitlab/ci/variables/collection/item_spec.rb
+57
-7
spec/lib/gitlab/ci/variables/collection_spec.rb
spec/lib/gitlab/ci/variables/collection_spec.rb
+6
-6
spec/models/ci/build_spec.rb
spec/models/ci/build_spec.rb
+5
-1
No files found.
app/models/ci/pipeline.rb
View file @
15633956
...
@@ -561,9 +561,9 @@ module Ci
...
@@ -561,9 +561,9 @@ module Ci
.
append
(
key:
'CI_PIPELINE_IID'
,
value:
iid
.
to_s
)
.
append
(
key:
'CI_PIPELINE_IID'
,
value:
iid
.
to_s
)
.
append
(
key:
'CI_CONFIG_PATH'
,
value:
ci_yaml_file_path
)
.
append
(
key:
'CI_CONFIG_PATH'
,
value:
ci_yaml_file_path
)
.
append
(
key:
'CI_PIPELINE_SOURCE'
,
value:
source
.
to_s
)
.
append
(
key:
'CI_PIPELINE_SOURCE'
,
value:
source
.
to_s
)
.
append
(
key:
'CI_COMMIT_MESSAGE'
,
value:
git_commit_message
)
.
append
(
key:
'CI_COMMIT_MESSAGE'
,
value:
git_commit_message
.
to_s
)
.
append
(
key:
'CI_COMMIT_TITLE'
,
value:
git_commit_full_title
)
.
append
(
key:
'CI_COMMIT_TITLE'
,
value:
git_commit_full_title
.
to_s
)
.
append
(
key:
'CI_COMMIT_DESCRIPTION'
,
value:
git_commit_description
)
.
append
(
key:
'CI_COMMIT_DESCRIPTION'
,
value:
git_commit_description
.
to_s
)
end
end
def
queued_duration
def
queued_duration
...
...
app/models/project_auto_devops.rb
View file @
15633956
...
@@ -29,8 +29,8 @@ class ProjectAutoDevops < ActiveRecord::Base
...
@@ -29,8 +29,8 @@ class ProjectAutoDevops < ActiveRecord::Base
end
end
if
manual?
if
manual?
variables
.
append
(
key:
'STAGING_ENABLED'
,
value:
1
)
variables
.
append
(
key:
'STAGING_ENABLED'
,
value:
'1'
)
variables
.
append
(
key:
'INCREMENTAL_ROLLOUT_ENABLED'
,
value:
1
)
variables
.
append
(
key:
'INCREMENTAL_ROLLOUT_ENABLED'
,
value:
'1'
)
end
end
end
end
end
end
...
...
lib/gitlab/ci/variables/collection/item.rb
View file @
15633956
...
@@ -4,6 +4,9 @@ module Gitlab
...
@@ -4,6 +4,9 @@ module Gitlab
class
Collection
class
Collection
class
Item
class
Item
def
initialize
(
key
:,
value
:,
public:
true
,
file:
false
)
def
initialize
(
key
:,
value
:,
public:
true
,
file:
false
)
raise
ArgumentError
,
"`value` must be of type String, while it was:
#{
value
.
class
}
"
unless
value
.
is_a?
(
String
)
||
value
.
nil?
@variable
=
{
@variable
=
{
key:
key
,
value:
value
,
public:
public
,
file:
file
key:
key
,
value:
value
,
public:
public
,
file:
file
}
}
...
...
spec/lib/gitlab/ci/variables/collection/item_spec.rb
View file @
15633956
require
'spec_helper'
require
'spec_helper'
describe
Gitlab
::
Ci
::
Variables
::
Collection
::
Item
do
describe
Gitlab
::
Ci
::
Variables
::
Collection
::
Item
do
let
(
:variable_key
)
{
'VAR'
}
let
(
:variable_value
)
{
'something'
}
let
(
:expected_value
)
{
variable_value
}
let
(
:variable
)
do
let
(
:variable
)
do
{
key:
'VAR'
,
value:
'something'
,
public:
true
}
{
key:
variable_key
,
value:
variable_value
,
public:
true
}
end
end
describe
'.new'
do
describe
'.new'
do
it
'raises error if unknown key i specified'
do
context
'when unknown keyword is specified'
do
expect
{
described_class
.
new
(
key:
'VAR'
,
value:
'abc'
,
files:
true
)
}
it
'raises error'
do
.
to
raise_error
ArgumentError
,
'unknown keyword: files'
expect
{
described_class
.
new
(
key:
variable_key
,
value:
'abc'
,
files:
true
)
}
.
to
raise_error
ArgumentError
,
'unknown keyword: files'
end
end
context
'when required keywords are not specified'
do
it
'raises error'
do
expect
{
described_class
.
new
(
key:
variable_key
)
}
.
to
raise_error
ArgumentError
,
'missing keyword: value'
end
end
end
it
'raises error when required keywords are not specified'
do
shared_examples
'creates variable'
do
expect
{
described_class
.
new
(
key:
'VAR'
)
}
subject
{
described_class
.
new
(
key:
variable_key
,
value:
variable_value
)
}
.
to
raise_error
ArgumentError
,
'missing keyword: value'
it
'saves given value'
do
expect
(
subject
[
:key
]).
to
eq
variable_key
expect
(
subject
[
:value
]).
to
eq
expected_value
end
end
shared_examples
'raises error for invalid type'
do
it
do
expect
{
described_class
.
new
(
key:
variable_key
,
value:
variable_value
)
}
.
to
raise_error
ArgumentError
,
/`value` must be of type String, while it was:/
end
end
it_behaves_like
'creates variable'
context
"when it's nil"
do
let
(
:variable_value
)
{
nil
}
let
(
:expected_value
)
{
nil
}
it_behaves_like
'creates variable'
end
context
"when it's an empty string"
do
let
(
:variable_value
)
{
''
}
let
(
:expected_value
)
{
''
}
it_behaves_like
'creates variable'
end
context
'when provided value is not a string'
do
[
1
,
false
,
[],
{},
Object
.
new
].
each
do
|
val
|
context
"when it's
#{
val
}
"
do
let
(
:variable_value
)
{
val
}
it_behaves_like
'raises error for invalid type'
end
end
end
end
end
end
...
...
spec/lib/gitlab/ci/variables/collection_spec.rb
View file @
15633956
...
@@ -29,7 +29,7 @@ describe Gitlab::Ci::Variables::Collection do
...
@@ -29,7 +29,7 @@ describe Gitlab::Ci::Variables::Collection do
end
end
it
'appends an internal resource'
do
it
'appends an internal resource'
do
collection
=
described_class
.
new
([{
key:
'TEST'
,
value:
1
}])
collection
=
described_class
.
new
([{
key:
'TEST'
,
value:
'1'
}])
subject
.
append
(
collection
.
first
)
subject
.
append
(
collection
.
first
)
...
@@ -74,15 +74,15 @@ describe Gitlab::Ci::Variables::Collection do
...
@@ -74,15 +74,15 @@ describe Gitlab::Ci::Variables::Collection do
describe
'#+'
do
describe
'#+'
do
it
'makes it possible to combine with an array'
do
it
'makes it possible to combine with an array'
do
collection
=
described_class
.
new
([{
key:
'TEST'
,
value:
1
}])
collection
=
described_class
.
new
([{
key:
'TEST'
,
value:
'1'
}])
variables
=
[{
key:
'TEST'
,
value:
'something'
}]
variables
=
[{
key:
'TEST'
,
value:
'something'
}]
expect
((
collection
+
variables
).
count
).
to
eq
2
expect
((
collection
+
variables
).
count
).
to
eq
2
end
end
it
'makes it possible to combine with another collection'
do
it
'makes it possible to combine with another collection'
do
collection
=
described_class
.
new
([{
key:
'TEST'
,
value:
1
}])
collection
=
described_class
.
new
([{
key:
'TEST'
,
value:
'1'
}])
other
=
described_class
.
new
([{
key:
'TEST'
,
value:
2
}])
other
=
described_class
.
new
([{
key:
'TEST'
,
value:
'2'
}])
expect
((
collection
+
other
).
count
).
to
eq
2
expect
((
collection
+
other
).
count
).
to
eq
2
end
end
...
@@ -90,10 +90,10 @@ describe Gitlab::Ci::Variables::Collection do
...
@@ -90,10 +90,10 @@ describe Gitlab::Ci::Variables::Collection do
describe
'#to_runner_variables'
do
describe
'#to_runner_variables'
do
it
'creates an array of hashes in a runner-compatible format'
do
it
'creates an array of hashes in a runner-compatible format'
do
collection
=
described_class
.
new
([{
key:
'TEST'
,
value:
1
}])
collection
=
described_class
.
new
([{
key:
'TEST'
,
value:
'1'
}])
expect
(
collection
.
to_runner_variables
)
expect
(
collection
.
to_runner_variables
)
.
to
eq
[{
key:
'TEST'
,
value:
1
,
public:
true
}]
.
to
eq
[{
key:
'TEST'
,
value:
'1'
,
public:
true
}]
end
end
end
end
...
...
spec/models/ci/build_spec.rb
View file @
15633956
...
@@ -1871,7 +1871,11 @@ describe Ci::Build do
...
@@ -1871,7 +1871,11 @@ describe Ci::Build do
end
end
context
'when yaml_variables are undefined'
do
context
'when yaml_variables are undefined'
do
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
project:
project
)
}
let
(
:pipeline
)
do
create
(
:ci_pipeline
,
project:
project
,
sha:
project
.
commit
.
id
,
ref:
project
.
default_branch
)
end
before
do
before
do
build
.
yaml_variables
=
nil
build
.
yaml_variables
=
nil
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment