Merge pull request #418 from david22swan/CONT-186/main

(CONT-186) Set `-deststoretype`
puppetlabs · Nov 21, 2022 · 00d1dde · 00d1dde
2 parents f845b0d + 3435f1d
commit 00d1dde
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/puppet/provider/java_ks/keytool.rb b/lib/puppet/provider/java_ks/keytool.rb
@@ -95,6 +95,7 @@ def import_ks
     ]
     cmd << '-trustcacerts' if @resource[:trustcacerts] == :true
     cmd += ['-destkeypass', @resource[:destkeypass]] unless @resource[:destkeypass].nil?
+    cmd += ['-deststoretype', storetype] unless storetype.nil?
 
     pwfile = password_file
     run_command(cmd, @resource[:target], pwfile)

diff --git a/spec/unit/puppet/provider/java_ks/keytool_spec.rb b/spec/unit/puppet/provider/java_ks/keytool_spec.rb
@@ -152,7 +152,8 @@
       it 'executes openssl and keytool with specific options' do
         expect(provider).to receive(:to_pkcs12).with("#{temp_dir}testing.stuff")
         expect(provider).to receive(:run_command).with(['mykeytool', '-importkeystore', '-srcstoretype', 'PKCS12', '-destkeystore',
-                                                        resource[:target], '-srckeystore', "#{temp_dir}testing.stuff", '-alias', resource[:name]], any_args)
+                                                        resource[:target], '-srckeystore', "#{temp_dir}testing.stuff", '-alias',
+                                                        resource[:name], '-deststoretype', :jceks], any_args)
         provider.import_ks
       end
 
@@ -161,7 +162,8 @@
         dkp[:destkeypass] = 'keypass'
         expect(provider).to receive(:to_pkcs12).with("#{temp_dir}testing.stuff")
         expect(provider).to receive(:run_command).with(['mykeytool', '-importkeystore', '-srcstoretype', 'PKCS12', '-destkeystore',
-                                                        dkp[:target], '-srckeystore', "#{temp_dir}testing.stuff", '-alias', dkp[:name], '-destkeypass', dkp[:destkeypass]], any_args)
+                                                        dkp[:target], '-srckeystore', "#{temp_dir}testing.stuff", '-alias', dkp[:name],
+                                                        '-destkeypass', dkp[:destkeypass], '-deststoretype', dkp[:storetype]], any_args)
         provider.import_ks
       end
     end