Commit be38783e authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch 'rename-secret-variables-1-ee' into 'master'

Renaming Secret Variables in the codebase (EE Port)

See merge request gitlab-org/gitlab-ee!7964
parents afc25de1 9a762f6a
...@@ -372,7 +372,7 @@ package-and-qa: ...@@ -372,7 +372,7 @@ package-and-qa:
SCRIPT_NAME: trigger-build-docs SCRIPT_NAME: trigger-build-docs
environment: environment:
name: review-docs/$CI_COMMIT_REF_SLUG name: review-docs/$CI_COMMIT_REF_SLUG
# DOCS_REVIEW_APPS_DOMAIN and DOCS_GITLAB_REPO_SUFFIX are secret variables # DOCS_REVIEW_APPS_DOMAIN and DOCS_GITLAB_REPO_SUFFIX are CI variables
# Discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14236/diffs#note_40140693 # Discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14236/diffs#note_40140693
url: http://$CI_ENVIRONMENT_SLUG.$DOCS_REVIEW_APPS_DOMAIN/$DOCS_GITLAB_REPO_SUFFIX url: http://$CI_ENVIRONMENT_SLUG.$DOCS_REVIEW_APPS_DOMAIN/$DOCS_GITLAB_REPO_SUFFIX
on_stop: review-docs-cleanup on_stop: review-docs-cleanup
......
...@@ -47,7 +47,7 @@ export default class AjaxVariableList { ...@@ -47,7 +47,7 @@ export default class AjaxVariableList {
} }
onSaveClicked() { onSaveClicked() {
const loadingIcon = this.saveButton.querySelector('.js-secret-variables-save-loading-icon'); const loadingIcon = this.saveButton.querySelector('.js-ci-variables-save-loading-icon');
loadingIcon.classList.toggle('hide', false); loadingIcon.classList.toggle('hide', false);
this.errorBox.classList.toggle('hide', true); this.errorBox.classList.toggle('hide', true);
// We use this to prevent a user from changing a key before we have a chance // We use this to prevent a user from changing a key before we have a chance
......
...@@ -9,7 +9,7 @@ document.addEventListener('DOMContentLoaded', () => { ...@@ -9,7 +9,7 @@ document.addEventListener('DOMContentLoaded', () => {
// eslint-disable-next-line no-new // eslint-disable-next-line no-new
new AjaxVariableList({ new AjaxVariableList({
container: variableListEl, container: variableListEl,
saveButton: variableListEl.querySelector('.js-secret-variables-save-button'), saveButton: variableListEl.querySelector('.js-ci-variables-save-button'),
errorBox: variableListEl.querySelector('.js-ci-variable-error-box'), errorBox: variableListEl.querySelector('.js-ci-variable-error-box'),
saveEndpoint: variableListEl.dataset.saveEndpoint, saveEndpoint: variableListEl.dataset.saveEndpoint,
}); });
......
...@@ -18,7 +18,7 @@ document.addEventListener('DOMContentLoaded', () => { ...@@ -18,7 +18,7 @@ document.addEventListener('DOMContentLoaded', () => {
// eslint-disable-next-line no-new // eslint-disable-next-line no-new
new AjaxVariableList({ new AjaxVariableList({
container: variableListEl, container: variableListEl,
saveButton: variableListEl.querySelector('.js-secret-variables-save-button'), saveButton: variableListEl.querySelector('.js-ci-variables-save-button'),
errorBox: variableListEl.querySelector('.js-ci-variable-error-box'), errorBox: variableListEl.querySelector('.js-ci-variable-error-box'),
saveEndpoint: variableListEl.dataset.saveEndpoint, saveEndpoint: variableListEl.dataset.saveEndpoint,
}); });
......
...@@ -7,7 +7,7 @@ module Groups ...@@ -7,7 +7,7 @@ module Groups
before_action :authorize_admin_pipeline! before_action :authorize_admin_pipeline!
def show def show
define_secret_variables define_ci_variables
end end
def reset_registration_token def reset_registration_token
...@@ -19,7 +19,7 @@ module Groups ...@@ -19,7 +19,7 @@ module Groups
private private
def define_secret_variables def define_ci_variables
@variable = Ci::GroupVariable.new(group: group) @variable = Ci::GroupVariable.new(group: group)
.present(current_user: current_user) .present(current_user: current_user)
@variables = group.variables.order_key_asc @variables = group.variables.order_key_asc
......
...@@ -70,7 +70,7 @@ module Projects ...@@ -70,7 +70,7 @@ module Projects
def define_variables def define_variables
define_runners_variables define_runners_variables
define_secret_variables define_ci_variables
define_triggers_variables define_triggers_variables
define_badges_variables define_badges_variables
define_auto_devops_variables define_auto_devops_variables
...@@ -92,7 +92,7 @@ module Projects ...@@ -92,7 +92,7 @@ module Projects
@group_runners = ::Ci::Runner.belonging_to_parent_group_of_project(@project.id) @group_runners = ::Ci::Runner.belonging_to_parent_group_of_project(@project.id)
end end
def define_secret_variables def define_ci_variables
@variable = ::Ci::Variable.new(project: project) @variable = ::Ci::Variable.new(project: project)
.present(current_user: current_user) .present(current_user: current_user)
@variables = project.variables.order_key_asc @variables = project.variables.order_key_asc
......
...@@ -597,11 +597,11 @@ module Ci ...@@ -597,11 +597,11 @@ module Ci
def secret_group_variables def secret_group_variables
return [] unless project.group return [] unless project.group
project.group.secret_variables_for(ref, project) project.group.ci_variables_for(ref, project)
end end
def secret_project_variables(environment: persisted_environment) def secret_project_variables(environment: persisted_environment)
project.secret_variables_for(ref: ref, environment: environment) project.ci_variables_for(ref: ref, environment: environment)
end end
def steps def steps
......
...@@ -371,7 +371,7 @@ class Group < Namespace ...@@ -371,7 +371,7 @@ class Group < Namespace
} }
end end
def secret_variables_for(ref, project) def ci_variables_for(ref, project)
list_of_ids = [self] + ancestors list_of_ids = [self] + ancestors
variables = Ci::GroupVariable.where(group: list_of_ids) variables = Ci::GroupVariable.where(group: list_of_ids)
variables = variables.unprotected unless project.protected_for?(ref) variables = variables.unprotected unless project.protected_for?(ref)
......
...@@ -1814,7 +1814,7 @@ class Project < ActiveRecord::Base ...@@ -1814,7 +1814,7 @@ class Project < ActiveRecord::Base
.first .first
end end
def secret_variables_for(ref:, environment: nil) def ci_variables_for(ref:, environment: nil)
# EE would use the environment # EE would use the environment
if protected_for?(ref) if protected_for?(ref)
variables variables
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
= render 'ci/variables/variable_row', form_field: 'variables', variable: variable = render 'ci/variables/variable_row', form_field: 'variables', variable: variable
= render 'ci/variables/variable_row', form_field: 'variables' = render 'ci/variables/variable_row', form_field: 'variables'
.prepend-top-20 .prepend-top-20
%button.btn.btn-success.js-secret-variables-save-button{ type: 'button' } %button.btn.btn-success.js-ci-variables-save-button{ type: 'button' }
%span.hide.js-secret-variables-save-loading-icon %span.hide.js-ci-variables-save-loading-icon
= icon('spinner spin') = icon('spinner spin')
= _('Save variables') = _('Save variables')
%button.btn.btn-info.btn-inverted.prepend-left-10.js-secret-value-reveal-button{ type: 'button', data: { secret_reveal_status: "#{@variables.size == 0}" } } %button.btn.btn-info.btn-inverted.prepend-left-10.js-secret-value-reveal-button{ type: 'button', data: { secret_reveal_status: "#{@variables.size == 0}" } }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
- expanded = Rails.env.test? - expanded = Rails.env.test?
%section.settings#secret-variables.no-animate{ class: ('expanded' if expanded) } %section.settings#ci-variables.no-animate{ class: ('expanded' if expanded) }
.settings-header .settings-header
%h4 %h4
= _('Variables') = _('Variables')
......
---
title: "Secret Variables renamed to CI Variables in the codebase, to match UX"
merge_request: 22414
author: Marcel Amirault @ravlen
type: changed
\ No newline at end of file
...@@ -315,7 +315,7 @@ module EE ...@@ -315,7 +315,7 @@ module EE
end end
end end
def secret_variables_for(ref:, environment: nil) def ci_variables_for(ref:, environment: nil)
return super.where(environment_scope: '*') unless return super.where(environment_scope: '*') unless
environment && feature_available?(:variable_environment_scope) environment && feature_available?(:variable_environment_scope)
......
...@@ -18,7 +18,7 @@ describe Gitlab::Ci::Build::Policy::Variables do ...@@ -18,7 +18,7 @@ describe Gitlab::Ci::Build::Policy::Variables do
let(:seed) { double('build seed', to_resource: ci_build) } let(:seed) { double('build seed', to_resource: ci_build) }
describe '#satisfied_by?' do describe '#satisfied_by?' do
context 'when using project secret variables in environment scope' do context 'when using project ci variables in environment scope' do
before do before do
create(:ci_variable, project: project, create(:ci_variable, project: project,
key: 'SCOPED_VARIABLE', key: 'SCOPED_VARIABLE',
......
...@@ -894,10 +894,10 @@ describe Project do ...@@ -894,10 +894,10 @@ describe Project do
end end
end end
describe '#secret_variables_for' do describe '#ci_variables_for' do
let(:project) { create(:project) } let(:project) { create(:project) }
let!(:secret_variable) do let!(:ci_variable) do
create(:ci_variable, value: 'secret', project: project) create(:ci_variable, value: 'secret', project: project)
end end
...@@ -905,7 +905,7 @@ describe Project do ...@@ -905,7 +905,7 @@ describe Project do
create(:ci_variable, :protected, value: 'protected', project: project) create(:ci_variable, :protected, value: 'protected', project: project)
end end
subject { project.secret_variables_for(ref: 'ref') } subject { project.ci_variables_for(ref: 'ref') }
before do before do
stub_application_setting( stub_application_setting(
...@@ -916,7 +916,7 @@ describe Project do ...@@ -916,7 +916,7 @@ describe Project do
let(:environment) { 'review/name' } let(:environment) { 'review/name' }
subject do subject do
project.secret_variables_for(ref: 'ref', environment: environment) project.ci_variables_for(ref: 'ref', environment: environment)
end end
shared_examples 'matching environment scope' do shared_examples 'matching environment scope' do
...@@ -925,8 +925,8 @@ describe Project do ...@@ -925,8 +925,8 @@ describe Project do
stub_licensed_features(variable_environment_scope: true) stub_licensed_features(variable_environment_scope: true)
end end
it 'contains the secret variable' do it 'contains the ci variable' do
is_expected.to contain_exactly(secret_variable) is_expected.to contain_exactly(ci_variable)
end end
end end
...@@ -935,8 +935,8 @@ describe Project do ...@@ -935,8 +935,8 @@ describe Project do
stub_licensed_features(variable_environment_scope: false) stub_licensed_features(variable_environment_scope: false)
end end
it 'does not contain the secret variable' do it 'does not contain the ci variable' do
is_expected.not_to contain_exactly(secret_variable) is_expected.not_to contain_exactly(ci_variable)
end end
end end
end end
...@@ -947,8 +947,8 @@ describe Project do ...@@ -947,8 +947,8 @@ describe Project do
stub_licensed_features(variable_environment_scope: true) stub_licensed_features(variable_environment_scope: true)
end end
it 'does not contain the secret variable' do it 'does not contain the ci variable' do
is_expected.not_to contain_exactly(secret_variable) is_expected.not_to contain_exactly(ci_variable)
end end
end end
...@@ -957,15 +957,15 @@ describe Project do ...@@ -957,15 +957,15 @@ describe Project do
stub_licensed_features(variable_environment_scope: false) stub_licensed_features(variable_environment_scope: false)
end end
it 'does not contain the secret variable' do it 'does not contain the ci variable' do
is_expected.not_to contain_exactly(secret_variable) is_expected.not_to contain_exactly(ci_variable)
end end
end end
end end
context 'when environment scope is exactly matched' do context 'when environment scope is exactly matched' do
before do before do
secret_variable.update(environment_scope: 'review/name') ci_variable.update(environment_scope: 'review/name')
end end
it_behaves_like 'matching environment scope' it_behaves_like 'matching environment scope'
...@@ -973,7 +973,7 @@ describe Project do ...@@ -973,7 +973,7 @@ describe Project do
context 'when environment scope is matched by wildcard' do context 'when environment scope is matched by wildcard' do
before do before do
secret_variable.update(environment_scope: 'review/*') ci_variable.update(environment_scope: 'review/*')
end end
it_behaves_like 'matching environment scope' it_behaves_like 'matching environment scope'
...@@ -981,7 +981,7 @@ describe Project do ...@@ -981,7 +981,7 @@ describe Project do
context 'when environment scope does not match' do context 'when environment scope does not match' do
before do before do
secret_variable.update(environment_scope: 'review/*/special') ci_variable.update(environment_scope: 'review/*/special')
end end
it_behaves_like 'not matching environment scope' it_behaves_like 'not matching environment scope'
...@@ -993,18 +993,18 @@ describe Project do ...@@ -993,18 +993,18 @@ describe Project do
end end
it 'does not treat it as wildcard' do it 'does not treat it as wildcard' do
secret_variable.update(environment_scope: '*_*') ci_variable.update(environment_scope: '*_*')
is_expected.not_to contain_exactly(secret_variable) is_expected.not_to contain_exactly(ci_variable)
end end
context 'when environment name contains underscore' do context 'when environment name contains underscore' do
let(:environment) { 'foo_bar/test' } let(:environment) { 'foo_bar/test' }
it 'matches literally for _' do it 'matches literally for _' do
secret_variable.update(environment_scope: 'foo_bar/*') ci_variable.update(environment_scope: 'foo_bar/*')
is_expected.to contain_exactly(secret_variable) is_expected.to contain_exactly(ci_variable)
end end
end end
end end
...@@ -1019,18 +1019,18 @@ describe Project do ...@@ -1019,18 +1019,18 @@ describe Project do
end end
it 'does not treat it as wildcard' do it 'does not treat it as wildcard' do
secret_variable.update_attribute(:environment_scope, '*%*') ci_variable.update_attribute(:environment_scope, '*%*')
is_expected.not_to contain_exactly(secret_variable) is_expected.not_to contain_exactly(ci_variable)
end end
context 'when environment name contains a percent' do context 'when environment name contains a percent' do
let(:environment) { 'foo%bar/test' } let(:environment) { 'foo%bar/test' }
it 'matches literally for _' do it 'matches literally for _' do
secret_variable.update(environment_scope: 'foo%bar/*') ci_variable.update(environment_scope: 'foo%bar/*')
is_expected.to contain_exactly(secret_variable) is_expected.to contain_exactly(ci_variable)
end end
end end
end end
...@@ -1038,7 +1038,7 @@ describe Project do ...@@ -1038,7 +1038,7 @@ describe Project do
context 'when variables with the same name have different environment scopes' do context 'when variables with the same name have different environment scopes' do
let!(:partially_matched_variable) do let!(:partially_matched_variable) do
create(:ci_variable, create(:ci_variable,
key: secret_variable.key, key: ci_variable.key,
value: 'partial', value: 'partial',
environment_scope: 'review/*', environment_scope: 'review/*',
project: project) project: project)
...@@ -1046,7 +1046,7 @@ describe Project do ...@@ -1046,7 +1046,7 @@ describe Project do
let!(:perfectly_matched_variable) do let!(:perfectly_matched_variable) do
create(:ci_variable, create(:ci_variable,
key: secret_variable.key, key: ci_variable.key,
value: 'prefect', value: 'prefect',
environment_scope: 'review/name', environment_scope: 'review/name',
project: project) project: project)
...@@ -1058,7 +1058,7 @@ describe Project do ...@@ -1058,7 +1058,7 @@ describe Project do
it 'puts variables matching environment scope more in the end' do it 'puts variables matching environment scope more in the end' do
is_expected.to eq( is_expected.to eq(
[secret_variable, [ci_variable,
partially_matched_variable, partially_matched_variable,
perfectly_matched_variable]) perfectly_matched_variable])
end end
......
...@@ -52,7 +52,7 @@ module QA ...@@ -52,7 +52,7 @@ module QA
autoload :DeployKey, 'qa/factory/resource/deploy_key' autoload :DeployKey, 'qa/factory/resource/deploy_key'
autoload :DeployToken, 'qa/factory/resource/deploy_token' autoload :DeployToken, 'qa/factory/resource/deploy_token'
autoload :Branch, 'qa/factory/resource/branch' autoload :Branch, 'qa/factory/resource/branch'
autoload :SecretVariable, 'qa/factory/resource/secret_variable' autoload :CiVariable, 'qa/factory/resource/ci_variable'
autoload :Runner, 'qa/factory/resource/runner' autoload :Runner, 'qa/factory/resource/runner'
autoload :PersonalAccessToken, 'qa/factory/resource/personal_access_token' autoload :PersonalAccessToken, 'qa/factory/resource/personal_access_token'
autoload :KubernetesCluster, 'qa/factory/resource/kubernetes_cluster' autoload :KubernetesCluster, 'qa/factory/resource/kubernetes_cluster'
...@@ -182,7 +182,7 @@ module QA ...@@ -182,7 +182,7 @@ module QA
autoload :DeployKeys, 'qa/page/project/settings/deploy_keys' autoload :DeployKeys, 'qa/page/project/settings/deploy_keys'
autoload :DeployTokens, 'qa/page/project/settings/deploy_tokens' autoload :DeployTokens, 'qa/page/project/settings/deploy_tokens'
autoload :ProtectedBranches, 'qa/page/project/settings/protected_branches' autoload :ProtectedBranches, 'qa/page/project/settings/protected_branches'
autoload :SecretVariables, 'qa/page/project/settings/secret_variables' autoload :CiVariables, 'qa/page/project/settings/ci_variables'
autoload :Runners, 'qa/page/project/settings/runners' autoload :Runners, 'qa/page/project/settings/runners'
autoload :MergeRequest, 'qa/page/project/settings/merge_request' autoload :MergeRequest, 'qa/page/project/settings/merge_request'
autoload :Members, 'qa/page/project/settings/members' autoload :Members, 'qa/page/project/settings/members'
......
module QA module QA
module Factory module Factory
module Resource module Resource
class SecretVariable < Factory::Base class CiVariable < Factory::Base
attr_accessor :key, :value attr_accessor :key, :value
attribute :project do attribute :project do
Factory::Resource::Project.fabricate! do |resource| Factory::Resource::Project.fabricate! do |resource|
resource.name = 'project-with-secret-variables' resource.name = 'project-with-ci-variables'
resource.description = 'project for adding secret variable test' resource.description = 'project for adding CI variable test'
end end
end end
...@@ -17,7 +17,7 @@ module QA ...@@ -17,7 +17,7 @@ module QA
Page::Project::Menu.perform(&:click_ci_cd_settings) Page::Project::Menu.perform(&:click_ci_cd_settings)
Page::Project::Settings::CICD.perform do |setting| Page::Project::Settings::CICD.perform do |setting|
setting.expand_secret_variables do |page| setting.expand_ci_variables do |page|
page.fill_variable(key, value) page.fill_variable(key, value)
page.save_variables page.save_variables
......
...@@ -25,9 +25,9 @@ module QA # rubocop:disable Naming/FileName ...@@ -25,9 +25,9 @@ module QA # rubocop:disable Naming/FileName
end end
end end
def expand_secret_variables(&block) def expand_ci_variables(&block)
expand_section(:variables_settings) do expand_section(:variables_settings) do
Settings::SecretVariables.perform(&block) Settings::CiVariables.perform(&block)
end end
end end
......
...@@ -2,7 +2,7 @@ module QA ...@@ -2,7 +2,7 @@ module QA
module Page module Page
module Project module Project
module Settings module Settings
class SecretVariables < Page::Base class CiVariables < Page::Base
include Common include Common
view 'app/views/ci/variables/_variable_row.html.haml' do view 'app/views/ci/variables/_variable_row.html.haml' do
...@@ -12,7 +12,7 @@ module QA ...@@ -12,7 +12,7 @@ module QA
end end
view 'app/views/ci/variables/_index.html.haml' do view 'app/views/ci/variables/_index.html.haml' do
element :save_variables, '.js-secret-variables-save-button' # rubocop:disable QA/ElementWithPattern element :save_variables, '.js-ci-variables-save-button' # rubocop:disable QA/ElementWithPattern
element :reveal_values, '.js-secret-value-reveal-button' # rubocop:disable QA/ElementWithPattern element :reveal_values, '.js-secret-value-reveal-button' # rubocop:disable QA/ElementWithPattern
end end
...@@ -33,7 +33,7 @@ module QA ...@@ -33,7 +33,7 @@ module QA
end end
def save_variables def save_variables
find('.js-secret-variables-save-button').click find('.js-ci-variables-save-button').click
end end
def reveal_variables def reveal_variables
......
...@@ -2,24 +2,24 @@ ...@@ -2,24 +2,24 @@
module QA module QA
context 'Verify' do context 'Verify' do
describe 'Secret variable support' do describe 'CI variable support' do
it 'user adds a secret variable' do it 'user adds a CI variable' do
Runtime::Browser.visit(:gitlab, Page::Main::Login) Runtime::Browser.visit(:gitlab, Page::Main::Login)
Page::Main::Login.act { sign_in_using_credentials } Page::Main::Login.act { sign_in_using_credentials }
Factory::Resource::SecretVariable.fabricate! do |resource| Factory::Resource::CiVariable.fabricate! do |resource|
resource.key = 'VARIABLE_KEY' resource.key = 'VARIABLE_KEY'
resource.value = 'some secret variable' resource.value = 'some CI variable'
end end
Page::Project::Settings::CICD.perform do |settings| Page::Project::Settings::CICD.perform do |settings|
settings.expand_secret_variables do |page| settings.expand_ci_variables do |page|
expect(page).to have_field(with: 'VARIABLE_KEY') expect(page).to have_field(with: 'VARIABLE_KEY')
expect(page).not_to have_field(with: 'some secret variable') expect(page).not_to have_field(with: 'some CI variable')
page.reveal_variables page.reveal_variables
expect(page).to have_field(with: 'some secret variable') expect(page).to have_field(with: 'some CI variable')
end end
end end
end end
......
...@@ -55,7 +55,7 @@ module QA ...@@ -55,7 +55,7 @@ module QA
deploy_key_name = "DEPLOY_KEY_#{key.name}_#{key.bits}" deploy_key_name = "DEPLOY_KEY_#{key.name}_#{key.bits}"
Factory::Resource::SecretVariable.fabricate! do |resource| Factory::Resource::CiVariable.fabricate! do |resource|
resource.project = @project resource.project = @project
resource.key = deploy_key_name resource.key = deploy_key_name
resource.value = key.private_key resource.value = key.private_key
......
...@@ -22,7 +22,7 @@ module QA ...@@ -22,7 +22,7 @@ module QA
# Disable code_quality check in Auto DevOps pipeline as it takes # Disable code_quality check in Auto DevOps pipeline as it takes
# too long and times out the test # too long and times out the test
Factory::Resource::SecretVariable.fabricate! do |resource| Factory::Resource::CiVariable.fabricate! do |resource|
resource.project = project resource.project = project
resource.key = 'CODE_QUALITY_DISABLED' resource.key = 'CODE_QUALITY_DISABLED'
resource.value = '1' resource.value = '1'
......
...@@ -24,7 +24,7 @@ describe('AjaxFormVariableList', () => { ...@@ -24,7 +24,7 @@ describe('AjaxFormVariableList', () => {
mock = new MockAdapter(axios); mock = new MockAdapter(axios);
const ajaxVariableListEl = document.querySelector('.js-ci-variable-list-section'); const ajaxVariableListEl = document.querySelector('.js-ci-variable-list-section');
saveButton = ajaxVariableListEl.querySelector('.js-secret-variables-save-button'); saveButton = ajaxVariableListEl.querySelector('.js-ci-variables-save-button');
errorBox = container.querySelector('.js-ci-variable-error-box'); errorBox = container.querySelector('.js-ci-variable-error-box');
ajaxVariableList = new AjaxFormVariableList({ ajaxVariableList = new AjaxFormVariableList({
container, container,
...@@ -44,7 +44,7 @@ describe('AjaxFormVariableList', () => { ...@@ -44,7 +44,7 @@ describe('AjaxFormVariableList', () => {
describe('onSaveClicked', () => { describe('onSaveClicked', () => {
it('shows loading spinner while waiting for the request', done => { it('shows loading spinner while waiting for the request', done => {
const loadingIcon = saveButton.querySelector('.js-secret-variables-save-loading-icon'); const loadingIcon = saveButton.querySelector('.js-ci-variables-save-loading-icon');
mock.onPatch(VARIABLE_PATCH_ENDPOINT).reply(() => { mock.onPatch(VARIABLE_PATCH_ENDPOINT).reply(() => {
expect(loadingIcon.classList.contains(HIDE_CLASS)).toEqual(false); expect(loadingIcon.classList.contains(HIDE_CLASS)).toEqual(false);
...@@ -172,7 +172,7 @@ describe('AjaxFormVariableList', () => { ...@@ -172,7 +172,7 @@ describe('AjaxFormVariableList', () => {
container = document.querySelector('.js-ci-variable-list-section'); container = document.querySelector('.js-ci-variable-list-section');
const ajaxVariableListEl = document.querySelector('.js-ci-variable-list-section'); const ajaxVariableListEl = document.querySelector('.js-ci-variable-list-section');
saveButton = ajaxVariableListEl.querySelector('.js-secret-variables-save-button'); saveButton = ajaxVariableListEl.querySelector('.js-ci-variables-save-button');
errorBox = container.querySelector('.js-ci-variable-error-box'); errorBox = container.querySelector('.js-ci-variable-error-box');
ajaxVariableList = new AjaxFormVariableList({ ajaxVariableList = new AjaxFormVariableList({
container, container,
......
...@@ -54,7 +54,7 @@ describe Gitlab::Ci::Build::Policy::Variables do ...@@ -54,7 +54,7 @@ describe Gitlab::Ci::Build::Policy::Variables do
expect(policy).not_to be_satisfied_by(pipeline, seed) expect(policy).not_to be_satisfied_by(pipeline, seed)
end end
it 'allows to evaluate regular secret variables' do it 'allows to evaluate regular CI variables' do
create(:ci_variable, project: project, key: 'SECRET', value: 'my secret') create(:ci_variable, project: project, key: 'SECRET', value: 'my secret')
policy = described_class.new(["$SECRET == 'my secret'"]) policy = described_class.new(["$SECRET == 'my secret'"])
......
...@@ -2029,17 +2029,17 @@ describe Ci::Build do ...@@ -2029,17 +2029,17 @@ describe Ci::Build do
it { is_expected.to include(tag_variable) } it { is_expected.to include(tag_variable) }
end end
context 'when secret variable is defined' do context 'when CI variable is defined' do
let(:secret_variable) do let(:ci_variable) do
{ key: 'SECRET_KEY', value: 'secret_value', public: false } { key: 'SECRET_KEY', value: 'secret_value', public: false }
end end
before do before do
create(:ci_variable, create(:ci_variable,
secret_variable.slice(:key, :value).merge(project: project)) ci_variable.slice(:key, :value).merge(project: project))
end end
it { is_expected.to include(secret_variable) } it { is_expected.to include(ci_variable) }
end end
context 'when protected variable is defined' do context 'when protected variable is defined' do
...@@ -2074,17 +2074,17 @@ describe Ci::Build do ...@@ -2074,17 +2074,17 @@ describe Ci::Build do
end end
end end
context 'when group secret variable is defined' do context 'when group CI variable is defined' do
let(:secret_variable) do let(:ci_variable) do
{ key: 'SECRET_KEY', value: 'secret_value', public: false } { key: 'SECRET_KEY', value: 'secret_value', public: false }
end end
before do before do
create(:ci_group_variable, create(:ci_group_variable,
secret_variable.slice(:key, :value).merge(group: group)) ci_variable.slice(:key, :value).merge(group: group))
end end
it { is_expected.to include(secret_variable) } it { is_expected.to include(ci_variable) }
end end
context 'when group protected variable is defined' do context 'when group protected variable is defined' do
...@@ -2359,7 +2359,7 @@ describe Ci::Build do ...@@ -2359,7 +2359,7 @@ describe Ci::Build do
.to receive(:predefined_variables) { [project_pre_var] } .to receive(:predefined_variables) { [project_pre_var] }
allow_any_instance_of(EE::Project) allow_any_instance_of(EE::Project)
.to receive(:secret_variables_for) .to receive(:ci_variables_for)
.with(ref: 'master', environment: nil) do .with(ref: 'master', environment: nil) do
[create(:ci_variable, key: 'secret', value: 'value')] [create(:ci_variable, key: 'secret', value: 'value')]
end end
...@@ -2510,7 +2510,7 @@ describe Ci::Build do ...@@ -2510,7 +2510,7 @@ describe Ci::Build do
end end
describe '#scoped_variables_hash' do describe '#scoped_variables_hash' do
context 'when overriding secret variables' do context 'when overriding CI variables' do
before do before do
project.variables.create!(key: 'MY_VAR', value: 'my value 1') project.variables.create!(key: 'MY_VAR', value: 'my value 1')
pipeline.variables.create!(key: 'MY_VAR', value: 'my value 2') pipeline.variables.create!(key: 'MY_VAR', value: 'my value 2')
......
...@@ -653,10 +653,10 @@ describe Group do ...@@ -653,10 +653,10 @@ describe Group do
end end
end end
describe '#secret_variables_for' do describe '#ci_variables_for' do
let(:project) { create(:project, group: group) } let(:project) { create(:project, group: group) }
let!(:secret_variable) do let!(:ci_variable) do
create(:ci_group_variable, value: 'secret', group: group) create(:ci_group_variable, value: 'secret', group: group)
end end
...@@ -664,11 +664,11 @@ describe Group do ...@@ -664,11 +664,11 @@ describe Group do
create(:ci_group_variable, :protected, value: 'protected', group: group) create(:ci_group_variable, :protected, value: 'protected', group: group)
end end
subject { group.secret_variables_for('ref', project) } subject { group.ci_variables_for('ref', project) }
shared_examples 'ref is protected' do shared_examples 'ref is protected' do
it 'contains all the variables' do it 'contains all the variables' do
is_expected.to contain_exactly(secret_variable, protected_variable) is_expected.to contain_exactly(ci_variable, protected_variable)
end end
end end
...@@ -678,8 +678,8 @@ describe Group do ...@@ -678,8 +678,8 @@ describe Group do
default_branch_protection: Gitlab::Access::PROTECTION_NONE) default_branch_protection: Gitlab::Access::PROTECTION_NONE)
end end
it 'contains only the secret variables' do it 'contains only the CI variables' do
is_expected.to contain_exactly(secret_variable) is_expected.to contain_exactly(ci_variable)
end end
end end
...@@ -712,9 +712,9 @@ describe Group do ...@@ -712,9 +712,9 @@ describe Group do
end end
it 'returns all variables belong to the group and parent groups' do it 'returns all variables belong to the group and parent groups' do
expected_array1 = [protected_variable, secret_variable] expected_array1 = [protected_variable, ci_variable]
expected_array2 = [variable_child, variable_child_2, variable_child_3] expected_array2 = [variable_child, variable_child_2, variable_child_3]
got_array = group_child_3.secret_variables_for('ref', project).to_a got_array = group_child_3.ci_variables_for('ref', project).to_a
expect(got_array.shift(2)).to contain_exactly(*expected_array1) expect(got_array.shift(2)).to contain_exactly(*expected_array1)
expect(got_array).to eq(expected_array2) expect(got_array).to eq(expected_array2)
......
...@@ -2713,10 +2713,10 @@ describe Project do ...@@ -2713,10 +2713,10 @@ describe Project do
end end
end end
describe '#secret_variables_for' do describe '#ci_variables_for' do
let(:project) { create(:project) } let(:project) { create(:project) }
let!(:secret_variable) do let!(:ci_variable) do
create(:ci_variable, value: 'secret', project: project) create(:ci_variable, value: 'secret', project: project)
end end
...@@ -2724,7 +2724,7 @@ describe Project do ...@@ -2724,7 +2724,7 @@ describe Project do
create(:ci_variable, :protected, value: 'protected', project: project) create(:ci_variable, :protected, value: 'protected', project: project)
end end
subject { project.reload.secret_variables_for(ref: 'ref') } subject { project.reload.ci_variables_for(ref: 'ref') }
before do before do
stub_application_setting( stub_application_setting(
...@@ -2733,13 +2733,13 @@ describe Project do ...@@ -2733,13 +2733,13 @@ describe Project do
shared_examples 'ref is protected' do shared_examples 'ref is protected' do
it 'contains all the variables' do it 'contains all the variables' do
is_expected.to contain_exactly(secret_variable, protected_variable) is_expected.to contain_exactly(ci_variable, protected_variable)
end end
end end
context 'when the ref is not protected' do context 'when the ref is not protected' do
it 'contains only the secret variables' do it 'contains only the CI variables' do
is_expected.to contain_exactly(secret_variable) is_expected.to contain_exactly(ci_variable)
end end
end end
......
...@@ -5,7 +5,7 @@ shared_examples 'variable list' do ...@@ -5,7 +5,7 @@ shared_examples 'variable list' do
end end
end end
it 'adds new secret variable' do it 'adds new CI variable' do
page.within('.js-ci-variable-list-section .js-row:last-child') do page.within('.js-ci-variable-list-section .js-row:last-child') do
find('.js-ci-variable-input-key').set('key') find('.js-ci-variable-input-key').set('key')
find('.js-ci-variable-input-value').set('key value') find('.js-ci-variable-input-value').set('key value')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment