openstack/puppet-mistral
Code Issues Proposed changes

Convert (allow|deny)list to comma-separated string

Browse Source 
This is follow-up of 64543a028f9b4b7f89e997d0e17a2ef10c5acffb .

These options are defined as ListOpt, so array values should be
rendered as a comma-seprated strings.

Change-Id: Id763f60274d965cf697873b1649b7de27094d842
This commit is contained in:
Takashi Kajinami 2025-05-02 22:53:08 +09:00
parent 64543a028f
commit ba711f966c
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/action_providers.pp
View File

@ -21,7 +21,7 @@ class mistral::action_providers (
) {
mistral_config {
'action_providers/allowlist': value => $allowlist;
'action_providers/denylist': value => $denylist;
'action_providers/allowlist': value => join(any2array($allowlist), ',');
'action_providers/denylist': value => join(any2array($denylist), ',');
}
}

4
manifests/legacy_action_providers.pp
View File

@ -44,7 +44,7 @@ class mistral::legacy_action_providers (
'legacy_action_providers/load_action_plugins': value => $load_action_plugins;
'legacy_action_providers/load_action_generators': value => $load_action_generators;
'legacy_action_providers/only_builtin_actions': value => $only_builtin_actions;
'legacy_action_providers/allowlist': value => $allowlist;
'legacy_action_providers/denylist': value => $denylist;
'legacy_action_providers/allowlist': value => join(any2array($allowlist), ',');
'legacy_action_providers/denylist': value => join(any2array($denylist), ',');
}
}

8
spec/classes/mistral_action_providers_spec.rb
View File

@ -16,14 +16,14 @@ describe 'mistral::action_providers' do
context 'with parameters' do
before do
params.merge!({
:allowlist => ['test'],
:denylist => ['test2'],
:allowlist => ['allow0', 'allow1'],
:denylist => ['deny0', 'deny1'],
})
end
it {
is_expected.to contain_mistral_config('action_providers/allowlist').with_value(['test'])
is_expected.to contain_mistral_config('action_providers/denylist').with_value(['test2'])
is_expected.to contain_mistral_config('action_providers/allowlist').with_value('allow0,allow1')
is_expected.to contain_mistral_config('action_providers/denylist').with_value('deny0,deny1')
}
end
end

8
spec/classes/mistral_legacy_action_providers_spec.rb
View File

@ -22,8 +22,8 @@ describe 'mistral::legacy_action_providers' do
:load_action_plugins => true,
:load_action_generators => false,
:only_builtin_actions => true,
:allowlist => ['test'],
:denylist => ['test2'],
:allowlist => ['allow0', 'allow1'],
:denylist => ['deny0', 'deny1'],
})
end
@ -31,8 +31,8 @@ describe 'mistral::legacy_action_providers' do
is_expected.to contain_mistral_config('legacy_action_providers/load_action_plugins').with_value(true)
is_expected.to contain_mistral_config('legacy_action_providers/load_action_generators').with_value(false)
is_expected.to contain_mistral_config('legacy_action_providers/only_builtin_actions').with_value(true)
is_expected.to contain_mistral_config('legacy_action_providers/allowlist').with_value(['test'])
is_expected.to contain_mistral_config('legacy_action_providers/denylist').with_value(['test2'])
is_expected.to contain_mistral_config('legacy_action_providers/allowlist').with_value('allow0,allow1')
is_expected.to contain_mistral_config('legacy_action_providers/denylist').with_value('deny0,deny1')
}
end
end