openstack
/
puppet-barbican
Code Issues Proposed changes

Merge "Accept a list value for p11_crypto_plugin_token_labels"

This commit is contained in:
Zuul 2021-03-26 17:29:55 +00:00 committed by Gerrit Code Review
parent 76041ed805 b4e7b594ed
commit 01b5832afb
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/plugins/p11_crypto.pp
View File

@ -110,7 +110,7 @@ Use the p11_crypto_plugin_token_labels parameter instead')
'p11_crypto_plugin/hmac_label': value => $p11_crypto_plugin_hmac_label;
'p11_crypto_plugin/token_serial_number': value => $p11_crypto_plugin_token_serial_number;
'p11_crypto_plugin/token_label': value => $p11_crypto_plugin_token_label_real;
'p11_crypto_plugin/token_labels': value => $p11_crypto_plugin_token_labels;
'p11_crypto_plugin/token_labels': value => join(any2array($p11_crypto_plugin_token_labels), ',');
'p11_crypto_plugin/slot_id': value => $p11_crypto_plugin_slot_id;
'p11_crypto_plugin/encryption_mechanism': value => $p11_crypto_plugin_encryption_mechanism;
'p11_crypto_plugin/hmac_key_type': value => $p11_crypto_plugin_hmac_key_type;

11
spec/classes/barbican_plugins_p11_crypto_spec.rb
View File

@ -85,6 +85,17 @@ describe 'barbican::plugins::p11_crypto' do
'secretstore:pkcs11/global_default') \
.with_value('true')
end
context 'when p11_crypto_plugin_token_labels is a list' do
before do
params.merge!( :p11_crypto_plugin_token_labels => ['token_label1', 'token_label2'] )
end
it 'is_expected.to set p11 parameters' do
is_expected.to contain_barbican_config('p11_crypto_plugin/token_labels') \
.with_value('token_label1,token_label2')
end
end
end
end