diff options
author | Matija Čupić <matteeyah@gmail.com> | 2019-03-07 17:08:17 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-03-07 17:08:17 +0000 |
commit | 686ffdc2e9eb13c2785816aeadafc5a9ee5b0aa3 (patch) | |
tree | 36de98ca85b9e3248039e3f6f821cebe7543f408 /spec | |
parent | 380fa8835594c9dccff1b8c77673076534310faa (diff) | |
download | gitlab-ce-686ffdc2e9eb13c2785816aeadafc5a9ee5b0aa3.tar.gz |
Resolve "Mask the existing variables"
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/ci/build_spec.rb | 8 | ||||
-rw-r--r-- | spec/models/clusters/kubernetes_namespace_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/clusters/platforms/kubernetes_spec.rb | 10 | ||||
-rw-r--r-- | spec/models/project_services/kubernetes_service_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/project_spec.rb | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index fc75d3e23fb..dd40b968bc1 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -2118,11 +2118,11 @@ describe Ci::Build do { key: 'CI_PIPELINE_URL', value: project.web_url + "/pipelines/#{pipeline.id}", public: true, masked: false }, { key: 'CI_JOB_ID', value: build.id.to_s, public: true, masked: false }, { key: 'CI_JOB_URL', value: project.web_url + "/-/jobs/#{build.id}", public: true, masked: false }, - { key: 'CI_JOB_TOKEN', value: 'my-token', public: false, masked: false }, + { key: 'CI_JOB_TOKEN', value: 'my-token', public: false, masked: true }, { key: 'CI_BUILD_ID', value: build.id.to_s, public: true, masked: false }, - { key: 'CI_BUILD_TOKEN', value: 'my-token', public: false, masked: false }, + { key: 'CI_BUILD_TOKEN', value: 'my-token', public: false, masked: true }, { key: 'CI_REGISTRY_USER', value: 'gitlab-ci-token', public: true, masked: false }, - { key: 'CI_REGISTRY_PASSWORD', value: 'my-token', public: false, masked: false }, + { key: 'CI_REGISTRY_PASSWORD', value: 'my-token', public: false, masked: true }, { key: 'CI_REPOSITORY_URL', value: build.repo_url, public: false, masked: false }, { key: 'CI', value: 'true', public: true, masked: false }, { key: 'GITLAB_CI', value: 'true', public: true, masked: false }, @@ -2652,7 +2652,7 @@ describe Ci::Build do let(:deploy_token_variables) do [ { key: 'CI_DEPLOY_USER', value: deploy_token.username, public: true, masked: false }, - { key: 'CI_DEPLOY_PASSWORD', value: deploy_token.token, public: false, masked: false } + { key: 'CI_DEPLOY_PASSWORD', value: deploy_token.token, public: false, masked: true } ] end diff --git a/spec/models/clusters/kubernetes_namespace_spec.rb b/spec/models/clusters/kubernetes_namespace_spec.rb index b865909c7fd..579f486f99f 100644 --- a/spec/models/clusters/kubernetes_namespace_spec.rb +++ b/spec/models/clusters/kubernetes_namespace_spec.rb @@ -115,7 +115,7 @@ RSpec.describe Clusters::KubernetesNamespace, type: :model do expect(kubernetes_namespace.predefined_variables).to include( { key: 'KUBE_SERVICE_ACCOUNT', value: kubernetes_namespace.service_account_name, public: true }, { key: 'KUBE_NAMESPACE', value: kubernetes_namespace.namespace, public: true }, - { key: 'KUBE_TOKEN', value: kubernetes_namespace.service_account_token, public: false }, + { key: 'KUBE_TOKEN', value: kubernetes_namespace.service_account_token, public: false, masked: true }, { key: 'KUBECONFIG', value: kubeconfig, public: false, file: true } ) end diff --git a/spec/models/clusters/platforms/kubernetes_spec.rb b/spec/models/clusters/platforms/kubernetes_spec.rb index 3b32ca8df05..cc93a1b4965 100644 --- a/spec/models/clusters/platforms/kubernetes_spec.rb +++ b/spec/models/clusters/platforms/kubernetes_spec.rb @@ -269,7 +269,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching it 'sets KUBE_TOKEN' do expect(subject).to include( - { key: 'KUBE_TOKEN', value: kubernetes.token, public: false } + { key: 'KUBE_TOKEN', value: kubernetes.token, public: false, masked: true } ) end end @@ -281,7 +281,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching it 'sets KUBE_TOKEN' do expect(subject).to include( - { key: 'KUBE_TOKEN', value: kubernetes_namespace.service_account_token, public: false } + { key: 'KUBE_TOKEN', value: kubernetes_namespace.service_account_token, public: false, masked: true } ) end end @@ -297,7 +297,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching it 'sets KUBE_TOKEN' do expect(subject).to include( - { key: 'KUBE_TOKEN', value: kubernetes.token, public: false } + { key: 'KUBE_TOKEN', value: kubernetes.token, public: false, masked: true } ) end end @@ -309,7 +309,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching it 'sets KUBE_TOKEN' do expect(subject).to include( - { key: 'KUBE_TOKEN', value: kubernetes.token, public: false } + { key: 'KUBE_TOKEN', value: kubernetes.token, public: false, masked: true } ) end end @@ -338,7 +338,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching it 'sets KUBE_TOKEN' do expect(subject).to include( - { key: 'KUBE_TOKEN', value: kubernetes_namespace.service_account_token, public: false } + { key: 'KUBE_TOKEN', value: kubernetes_namespace.service_account_token, public: false, masked: true } ) end end diff --git a/spec/models/project_services/kubernetes_service_spec.rb b/spec/models/project_services/kubernetes_service_spec.rb index 9c27357ffaf..47f70e6648a 100644 --- a/spec/models/project_services/kubernetes_service_spec.rb +++ b/spec/models/project_services/kubernetes_service_spec.rb @@ -276,7 +276,7 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do it 'sets the variables' do expect(subject.predefined_variables(project: project)).to include( { key: 'KUBE_URL', value: 'https://kube.domain.com', public: true }, - { key: 'KUBE_TOKEN', value: 'token', public: false }, + { key: 'KUBE_TOKEN', value: 'token', public: false, masked: true }, { key: 'KUBE_NAMESPACE', value: namespace, public: true }, { key: 'KUBECONFIG', value: kubeconfig, public: false, file: true }, { key: 'KUBE_CA_PEM', value: 'CA PEM DATA', public: true }, diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index b2392f9521f..71bd7972436 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -2607,7 +2607,7 @@ describe Project do shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do it 'returns variables from this service' do expect(project.deployment_variables).to include( - { key: 'KUBE_TOKEN', value: project.deployment_platform.token, public: false } + { key: 'KUBE_TOKEN', value: project.deployment_platform.token, public: false, masked: true } ) end end @@ -2632,7 +2632,7 @@ describe Project do it 'should return token from kubernetes namespace' do expect(project.deployment_variables).to include( - { key: 'KUBE_TOKEN', value: kubernetes_namespace.service_account_token, public: false } + { key: 'KUBE_TOKEN', value: kubernetes_namespace.service_account_token, public: false, masked: true } ) end end |