Commit c7c927c6 authored by Peter Leitzen's avatar Peter Leitzen

Merge branch 'mc_rocha-move-dast-configuration-to-ee-333770' into 'master'

Move DAST CI Job keys to the EE Variant

See merge request gitlab-org/gitlab!72829
parents 4bab02a1 cc91cf3e
...@@ -22,10 +22,21 @@ module EE ...@@ -22,10 +22,21 @@ module EE
metadata: { composable_class: ::Gitlab::Ci::Config::Entry::Secret } metadata: { composable_class: ::Gitlab::Ci::Config::Entry::Secret }
end end
EE_ALLOWED_KEYS = %i[dast_configuration secrets].freeze
override :value override :value
def value def value
super.merge({ dast_configuration: dast_configuration_value, secrets: secrets_value }.compact) super.merge({ dast_configuration: dast_configuration_value, secrets: secrets_value }.compact)
end end
class_methods do
extend ::Gitlab::Utils::Override
override :allowed_keys
def allowed_keys
super + EE_ALLOWED_KEYS
end
end
end end
end end
end end
......
...@@ -14,10 +14,10 @@ module Gitlab ...@@ -14,10 +14,10 @@ module Gitlab
ALLOWED_KEYS = %i[tags script type image services start_in artifacts ALLOWED_KEYS = %i[tags script type image services start_in artifacts
cache dependencies before_script after_script cache dependencies before_script after_script
environment coverage retry parallel interruptible timeout environment coverage retry parallel interruptible timeout
release dast_configuration secrets].freeze release].freeze
validations do validations do
validates :config, allowed_keys: ALLOWED_KEYS + PROCESSABLE_ALLOWED_KEYS validates :config, allowed_keys: Gitlab::Ci::Config::Entry::Job.allowed_keys + PROCESSABLE_ALLOWED_KEYS
validates :script, presence: true validates :script, presence: true
with_options allow_nil: true do with_options allow_nil: true do
...@@ -178,6 +178,10 @@ module Gitlab ...@@ -178,6 +178,10 @@ module Gitlab
allow_failure_defined? ? static_allow_failure : manual_action? allow_failure_defined? ? static_allow_failure : manual_action?
end end
def self.allowed_keys
ALLOWED_KEYS
end
private private
def allow_failure_criteria def allow_failure_criteria
......
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