Commit 5eb940da authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg Committed by Grzegorz Bizon

Replace invalid chars while seeding environments

parent 6a3da45a
No related merge requests found
...@@ -33,7 +33,7 @@ class Gitlab::Seeder::Environments ...@@ -33,7 +33,7 @@ class Gitlab::Seeder::Environments
create_deployment!( create_deployment!(
merge_request.source_project, merge_request.source_project,
"review/#{merge_request.source_branch}", "review/#{merge_request.source_branch.gsub(/[^a-zA-Z0-9]/, '')}",
merge_request.source_branch, merge_request.source_branch,
merge_request.diff_head_sha merge_request.diff_head_sha
) )
......
...@@ -43,7 +43,7 @@ module Gitlab ...@@ -43,7 +43,7 @@ module Gitlab
end end
def environment_name_regex_message def environment_name_regex_message
"can contain only letters, digits, '-', '_', '/', '$', '{', '}', '.' and spaces" "can contain only letters, digits, '-', '_', '/', '$', '{', '}', '.', and spaces"
end end
def kubernetes_namespace_regex def kubernetes_namespace_regex
......
...@@ -20,6 +20,18 @@ describe Gitlab::Regex, lib: true do ...@@ -20,6 +20,18 @@ describe Gitlab::Regex, lib: true do
it { is_expected.to match('foo@bar') } it { is_expected.to match('foo@bar') }
end end
describe '.environment_slug_regex' do
subject { described_class.environment_name_regex }
it { is_expected.to match('foo') }
it { is_expected.to match('foo-1') }
it { is_expected.to match('FOO') }
it { is_expected.to match('foo/1') }
it { is_expected.to match('foo.1') }
it { is_expected.not_to match('9&foo') }
it { is_expected.not_to match('foo-^') }
end
describe '.environment_slug_regex' do describe '.environment_slug_regex' do
subject { described_class.environment_slug_regex } subject { described_class.environment_slug_regex }
......
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