diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-18 10:29:20 -0500 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-18 10:34:35 -0500 |
| commit | dbe0839396f56e30780350e840a1ded303dfbb81 (patch) | |
| tree | e6305356f5ee4e2d164ed83cf3bc19901be7a28e | |
| parent | ff944005c30e6f7fc71fd1dc7393ae178b33584e (diff) | |
| download | gitlab-ce-46454-wrong-value-in-ci-deploy-user.tar.gz | |
Fixes deploy tokens build variables46454-wrong-value-in-ci-deploy-user
It was using name, instead of username. Fixes documentation as well
Closes #46454
| -rw-r--r-- | app/models/ci/build.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/46454-wrong-value-in-ci-deploy-user.yml | 5 | ||||
| -rw-r--r-- | doc/user/project/deploy_tokens/index.md | 2 | ||||
| -rw-r--r-- | spec/models/ci/build_spec.rb | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index d9649e30edc..1c42ed4d3e5 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -661,7 +661,7 @@ module Ci Gitlab::Ci::Variables::Collection.new.tap do |variables| break variables unless gitlab_deploy_token - variables.append(key: 'CI_DEPLOY_USER', value: gitlab_deploy_token.name) + variables.append(key: 'CI_DEPLOY_USER', value: gitlab_deploy_token.username) variables.append(key: 'CI_DEPLOY_PASSWORD', value: gitlab_deploy_token.token, public: false) end end diff --git a/changelogs/unreleased/46454-wrong-value-in-ci-deploy-user.yml b/changelogs/unreleased/46454-wrong-value-in-ci-deploy-user.yml new file mode 100644 index 00000000000..e610e53f71c --- /dev/null +++ b/changelogs/unreleased/46454-wrong-value-in-ci-deploy-user.yml @@ -0,0 +1,5 @@ +--- +title: Fixes deploy token variables on Ci::Build +merge_request: 19047 +author: +type: fixed diff --git a/doc/user/project/deploy_tokens/index.md b/doc/user/project/deploy_tokens/index.md index 7a8b3c75690..c09d5aeba8e 100644 --- a/doc/user/project/deploy_tokens/index.md +++ b/doc/user/project/deploy_tokens/index.md @@ -76,7 +76,7 @@ pull images from your Container Registry. > [Introduced][ce-18414] in GitLab 10.8. There's a special case when it comes to Deploy Tokens, if a user creates one -named `gitlab-deploy-token`, the name and token of the Deploy Token will be +named `gitlab-deploy-token`, the username and token of the Deploy Token will be automatically exposed to the CI/CD jobs as environment variables: `CI_DEPLOY_USER` and `CI_DEPLOY_PASSWORD`, respectively. diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index 7d8bddbcedb..af5f5047803 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -2084,7 +2084,7 @@ describe Ci::Build do let(:deploy_token_variables) do [ - { key: 'CI_DEPLOY_USER', value: deploy_token.name, public: true }, + { key: 'CI_DEPLOY_USER', value: deploy_token.username, public: true }, { key: 'CI_DEPLOY_PASSWORD', value: deploy_token.token, public: false } ] end |