Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
1b894c1d1b07
Unverified
Commit
e3fb0740
authored
Nov 20, 2016
by
Tomasz Maczukin
Browse files
Send credentials array with build data
parent
58189099668a
Changes
5
Hide whitespace changes
Inline
Side-by-side
app/models/ci/build.rb
View file @
1b894c1d
...
...
@@ -448,8 +448,19 @@ def user_variables
]
end
def
credentials
[
build_container_registry_credentials
].
compact
end
private
def
build_container_registry_credentials
return
unless
Gitlab
.
config
.
registry
.
enabled
Gitlab
::
Ci
::
Build
::
Credentials
.
new
(
'docker-registry'
,
Gitlab
.
config
.
registry
.
host_port
,
'gitlab-ci-token'
,
token
)
end
def
update_artifacts_size
self
.
artifacts_size
=
if
artifacts_file
.
exists?
artifacts_file
.
size
...
...
changelogs/unreleased/feature-send-registry-address-with-build-payload.yml
View file @
1b894c1d
---
title
:
Send registry
_url
with build data to GitLab Runner
title
:
Send
credentials (currently for
registry
only)
with build data to GitLab Runner
merge_request
:
7474
author
:
lib/ci/api/entities.rb
View file @
1b894c1d
...
...
@@ -32,6 +32,10 @@ class Build < Grape::Entity
expose
:artifacts_file
,
using:
ArtifactFile
,
if:
->
(
build
,
_
)
{
build
.
artifacts?
}
end
class
BuildCredentials
<
Grape
::
Entity
expose
:type
,
:url
,
:username
,
:password
end
class
BuildDetails
<
Build
expose
:commands
expose
:repo_url
...
...
@@ -51,9 +55,7 @@ class BuildDetails < Build
expose
:variables
expose
:depends_on_builds
,
using:
Build
expose
:registry_url
,
if:
->
(
_
,
_
)
{
Gitlab
.
config
.
registry
.
enabled
}
do
|
_
|
Gitlab
.
config
.
registry
.
host_port
end
expose
:credentials
,
using:
BuildCredentials
end
class
Runner
<
Grape
::
Entity
...
...
lib/gitlab/ci/build/credentials.rb
0 → 100644
View file @
1b894c1d
module
Gitlab
module
Ci
module
Build
class
Credentials
attr_accessor
:type
,
:url
,
:username
,
:password
def
initialize
(
type
,
url
,
username
,
password
)
@type
=
type
@url
=
url
@username
=
username
@password
=
password
end
end
end
end
end
spec/requests/ci/api/builds_spec.rb
View file @
1b894c1d
...
...
@@ -58,28 +58,38 @@
expect
{
register_builds
}.
to
change
{
runner
.
reload
.
contacted_at
}
end
context
'when registry is enabled'
do
before
do
stub_container_registry_config
(
enabled:
true
,
host_port:
'registry.example.com:5005'
)
context
'registry credentials'
do
let
(
:registry_credentials
)
do
{
'type'
=>
'docker-registry'
,
'url'
=>
'registry.example.com:5005'
,
'username'
=>
'gitlab-ci-token'
,
'password'
=>
build
.
token
}
end
it
'sends registry_url key'
do
register_builds
info:
{
platform: :darwin
}
context
'when registry is enabled'
do
before
do
stub_container_registry_config
(
enabled:
true
,
host_port:
'registry.example.com:5005'
)
end
expect
(
json_response
).
to
have_key
(
'registry_url'
)
expect
(
json_response
[
'registry_url'
]).
to
eq
(
"registry.example.com:5005"
)
end
end
it
'sends registry credentials key'
do
register_builds
info:
{
platform: :darwin
}
context
'when registry is disabled'
do
before
do
stub_container_registry_config
(
enabled:
false
,
host_port:
'registry.example.com:5005'
)
expect
(
json_response
).
to
have_key
(
'credentials'
)
expect
(
json_response
[
'credentials'
]).
to
include
(
registry_credentials
)
end
end
it
'does not send registry_url key'
do
register_builds
info:
{
platform: :darwin
}
context
'when registry is disabled'
do
before
do
stub_container_registry_config
(
enabled:
false
,
host_port:
'registry.example.com:5005'
)
end
expect
(
json_response
).
not_to
have_key
(
'registry_url'
)
it
'does not send registry credentials'
do
register_builds
info:
{
platform: :darwin
}
expect
(
json_response
).
to
have_key
(
'credentials'
)
expect
(
json_response
[
'credentials'
]).
not_to
include
(
registry_credentials
)
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