Commit e261b4b8 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'allow_numeric_values_in_gitlab_ci_yml' into 'master'

Allow numeric values in gitlab-ci.yml

Closes #30017

See merge request !10607
parents ae8511df 295cecfb
---
title: Allow numeric values in gitlab-ci.yml
merge_request: 10607
author: blackst0ne
......@@ -147,6 +147,10 @@ variables:
DATABASE_URL: "postgres://postgres@postgres/my_database"
```
>**Note:**
Integers (as well as strings) are legal both for variable's name and value.
Floats are not legal and cannot be used.
These variables can be later used in all executed commands and scripts.
The YAML-defined variables are also set to all created service containers,
thus allowing to fine tune them. Variables can be also defined on a
......@@ -1152,7 +1156,7 @@ Example:
```yaml
variables:
GET_SOURCES_ATTEMPTS: "3"
GET_SOURCES_ATTEMPTS: 3
```
You can set them in the global [`variables`](#variables) section or the
......
......@@ -21,7 +21,13 @@ module Gitlab
def validate_variables(variables)
variables.is_a?(Hash) &&
variables.all? { |key, value| validate_string(key) && validate_string(value) }
variables.flatten.all? do |value|
validate_string(value) || validate_integer(value)
end
end
def validate_integer(value)
value.is_a?(Integer)
end
def validate_string(value)
......
......@@ -15,6 +15,10 @@ module Gitlab
def self.default
{}
end
def value
Hash[@config.map { |key, value| [key.to_s, value.to_s] }]
end
end
end
end
......
......@@ -113,7 +113,7 @@ describe Gitlab::Ci::Config::Entry::Global do
describe '#variables_value' do
it 'returns variables' do
expect(global.variables_value).to eq(VAR: 'value')
expect(global.variables_value).to eq('VAR' => 'value')
end
end
......@@ -154,7 +154,7 @@ describe Gitlab::Ci::Config::Entry::Global do
services: ['postgres:9.1', 'mysql:5.5'],
stage: 'test',
cache: { key: 'k', untracked: true, paths: ['public/'] },
variables: { VAR: 'value' },
variables: { 'VAR' => 'value' },
ignore: false,
after_script: ['make clean'] },
spinach: { name: :spinach,
......
......@@ -13,6 +13,14 @@ describe Gitlab::Ci::Config::Entry::Variables do
it 'returns hash with key value strings' do
expect(entry.value).to eq config
end
context 'with numeric keys and values in the config' do
let(:config) { { 10 => 20 } }
it 'converts numeric key and numeric value into strings' do
expect(entry.value).to eq('10' => '20')
end
end
end
describe '#errors' do
......
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