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
Léo-Paul Géneau
gitlab-ce
Commits
ee9fd5c2
Commit
ee9fd5c2
authored
Aug 17, 2018
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve extendable CI/CD config hash collection
parent
2f05e34b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
45 additions
and
35 deletions
+45
-35
lib/gitlab/ci/config/extendable/collection.rb
lib/gitlab/ci/config/extendable/collection.rb
+7
-10
lib/gitlab/ci/config/extendable/entry.rb
lib/gitlab/ci/config/extendable/entry.rb
+20
-6
spec/lib/gitlab/ci/config/extendable/collection_spec.rb
spec/lib/gitlab/ci/config/extendable/collection_spec.rb
+18
-19
No files found.
lib/gitlab/ci/config/extendable/collection.rb
View file @
ee9fd5c2
...
...
@@ -6,26 +6,23 @@ module Gitlab
include
Enumerable
ExtensionError
=
Class
.
new
(
StandardError
)
InvalidExtensionError
=
Class
.
new
(
ExtensionError
)
CircularDependencyError
=
Class
.
new
(
ExtensionError
)
def
initialize
(
hash
)
@hash
=
hash
@hash
=
hash
.
dup
each
{
|
entry
|
entry
.
extend!
if
entry
.
extensible?
}
end
def
each
@hash
.
each_pair
do
|
key
,
value
|
next
unless
value
.
key?
(
:extends
)
@hash
.
each_key
do
|
key
|
yield
Extendable
::
Entry
.
new
(
key
,
@hash
)
end
end
def
extend!
each
do
|
entry
|
raise
ExtensionError
unless
entry
.
valid?
entry
.
extend!
end
def
to_hash
@hash
.
to_h
end
end
end
...
...
lib/gitlab/ci/config/extendable/entry.rb
View file @
ee9fd5c2
...
...
@@ -19,9 +19,9 @@ module Gitlab
@value
||=
@context
.
fetch
(
@key
)
end
def
base
def
base
_hash
Extendable
::
Entry
.
new
(
extends
,
@context
,
self
)
.
new
(
extends
_key
,
@context
,
self
)
.
extend!
end
...
...
@@ -29,8 +29,8 @@ module Gitlab
value
.
key?
(
:extends
)
end
def
extends
value
.
fetch
(
:extends
).
to_sym
def
extends
_key
value
.
fetch
(
:extends
).
to_s
.
to_s
ym
end
def
path
...
...
@@ -38,16 +38,30 @@ module Gitlab
end
def
extend!
if
path
.
count
(
key
)
>
1
if
circular_dependency?
raise
Extendable
::
Collection
::
CircularDependencyError
end
if
invalid_extends_key?
raise
Extendable
::
Collection
::
InvalidExtensionError
end
if
extensible?
@context
[
key
]
=
base
.
deep_merge
(
value
)
@context
[
key
]
=
base
_hash
.
deep_merge
(
value
)
else
value
end
end
private
def
circular_dependency?
path
.
count
(
key
)
>
1
end
def
invalid_extends_key?
!
@context
.
key?
(
key
)
end
end
end
end
...
...
spec/lib/gitlab/ci/config/extendable/collection_spec.rb
View file @
ee9fd5c2
...
...
@@ -13,23 +13,13 @@ describe Gitlab::Ci::Config::Extendable::Collection do
{
something:
{
script:
'ls'
},
test:
test
}
end
it
'yields the test hash'
do
expect
{
|
b
|
subject
.
each
(
&
b
)
}.
to
yield_control
end
end
context
'when not extending using a hash'
do
let
(
:hash
)
do
{
something:
{
extends:
[
1
],
script:
'ls'
}
}
end
it
'yields invalid extends as well'
do
it
'yields control'
do
expect
{
|
b
|
subject
.
each
(
&
b
)
}.
to
yield_control
end
end
end
describe
'#
extend!
'
do
describe
'#
to_hash
'
do
context
'when a hash has a single simple extension'
do
let
(
:hash
)
do
{
...
...
@@ -47,7 +37,7 @@ describe Gitlab::Ci::Config::Extendable::Collection do
end
it
'extends a hash with a deep reverse merge'
do
expect
(
subject
.
extend!
).
to
eq
(
expect
(
subject
.
to_hash
).
to
eq
(
something:
{
script:
'deploy'
,
only:
{
variables:
%w[$SOMETHING]
}
...
...
@@ -88,7 +78,7 @@ describe Gitlab::Ci::Config::Extendable::Collection do
end
it
'extends a hash with a deep reverse merge'
do
expect
(
subject
.
extend!
).
to
eq
(
expect
(
subject
.
to_hash
).
to
eq
(
'.first'
:
{
script:
'run'
,
only:
{
kubernetes:
'active'
}
...
...
@@ -139,8 +129,8 @@ describe Gitlab::Ci::Config::Extendable::Collection do
}
end
it
'raises an error'
do
expect
{
subject
.
extend!
}
it
'raises an error
about circular dependency
'
do
expect
{
subject
.
to_hash
}
.
to
raise_error
(
described_class
::
CircularDependencyError
)
end
end
...
...
@@ -156,12 +146,21 @@ describe Gitlab::Ci::Config::Extendable::Collection do
}
end
it
'raises an error'
do
expect
{
subject
.
extend!
}
it
'raises an error
about circular dependency
'
do
expect
{
subject
.
to_hash
}
.
to
raise_error
(
described_class
::
CircularDependencyError
)
end
end
pending
'when invalid `extends` is specified'
context
'when invalid extends value is specified'
do
let
(
:hash
)
do
{
something:
{
extends:
1
,
script:
'ls'
}
}
end
it
'raises an error about invalid extension'
do
expect
{
subject
.
to_hash
}
.
to
raise_error
(
described_class
::
InvalidExtensionError
)
end
end
end
end
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