Read about our upcoming Code of Conduct on this issue

Commit 0f1318b2 authored by Grzegorz Bizon's avatar Grzegorz Bizon
Browse files

DRY project-level predefined variables

parent ed5cbce48901
......@@ -257,12 +257,10 @@ def variables(environment: persisted_environment)
variables.concat(project.predefined_variables)
variables.concat(pipeline.predefined_variables)
variables.concat(runner.predefined_variables) if runner
variables.concat(project.container_registry_variables)
variables.concat(project.deployment_variables) if has_environment?
variables.concat(project.auto_devops_variables)
variables.concat(yaml_variables)
variables.concat(user_variables)
variables.concat(project.group.secret_variables_for(ref, project).map(&:to_runner_variable)) if project.group
variables.concat(project.group.secret_variables_for(ref, project)) if project.group
variables.concat(secret_variables(environment: environment))
variables.concat(trigger_request.user_variables) if trigger_request
variables.concat(pipeline.variables)
......
......@@ -1581,21 +1581,21 @@ def predefined_variables
variables.append(key: 'CI_PROJECT_NAMESPACE', value: namespace.full_path, public: true)
variables.append(key: 'CI_PROJECT_URL', value: web_url, public: true)
variables.append(key: 'CI_PROJECT_VISIBILITY', value: visibility, public: true)
variables.concat(container_registry_variables)
variables.concat(auto_devops_variables)
end
end
def container_registry_variables
return [] unless Gitlab.config.registry.enabled
Gitlab::Ci::Variables::Collection.new.tap do |variables|
return variables unless Gitlab.config.registry.enabled
variables = [
{ key: 'CI_REGISTRY', value: Gitlab.config.registry.host_port, public: true }
]
variables.append(key: 'CI_REGISTRY', value: Gitlab.config.registry.host_port, public: true)
if container_registry_enabled?
variables << { key: 'CI_REGISTRY_IMAGE', value: container_registry_url, public: true }
if container_registry_enabled?
variables.append(key: 'CI_REGISTRY_IMAGE', value: container_registry_url, public: true)
end
end
variables
end
def secret_variables_for(ref:, environment: nil)
......@@ -1624,7 +1624,7 @@ def deployment_variables
def auto_devops_variables
return [] unless auto_devops_enabled?
(auto_devops || build_auto_devops)&.variables
(auto_devops || build_auto_devops)&.predefined_variables
end
def append_or_update_attribute(name, value)
......
......@@ -14,9 +14,11 @@ def has_domain?
domain.present? || instance_domain.present?
end
def variables
variables = []
variables << { key: 'AUTO_DEVOPS_DOMAIN', value: domain.presence || instance_domain, public: true } if has_domain?
variables
def predefined_variables
Gitlab::Ci::Variables::Collection.new.tap do |variables|
variables.append(key: 'AUTO_DEVOPS_DOMAIN',
value: domain.presence || instance_domain,
public: true) if has_domain?
end
end
end
......@@ -14,6 +14,10 @@ def initialize(**options)
}
end
def [](key)
@variable.fetch(key)
end
def ==(other)
to_hash == self.class.fabricate(other).to_hash
end
......@@ -39,6 +43,8 @@ def self.fabricate(resource)
self.new(resource.to_hash)
when ::Ci::PipelineVariable
self.new(resource.to_hash)
when ::Ci::GroupVariable
self.new(resource.to_hash)
when self
resource.dup
else
......
......@@ -36,14 +36,14 @@
end
end
describe '#variables' do
describe '#predefined_variables' do
let(:auto_devops) { build_stubbed(:project_auto_devops, project: project, domain: domain) }
context 'when domain is defined' do
let(:domain) { 'example.com' }
it 'returns AUTO_DEVOPS_DOMAIN' do
expect(auto_devops.variables).to include(domain_variable)
expect(auto_devops.predefined_variables).to include(domain_variable)
end
end
......@@ -55,7 +55,7 @@
allow(Gitlab::CurrentSettings).to receive(:auto_devops_domain).and_return('example.com')
end
it { expect(auto_devops.variables).to include(domain_variable) }
it { expect(auto_devops.predefined_variables).to include(domain_variable) }
end
context 'when there is no instance domain specified' do
......@@ -63,7 +63,7 @@
allow(Gitlab::CurrentSettings).to receive(:auto_devops_domain).and_return(nil)
end
it { expect(auto_devops.variables).not_to include(domain_variable) }
it { expect(auto_devops.predefined_variables).not_to include(domain_variable) }
end
end
......
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