Skip to content

Commit 00d1dde

Browse files
authored
Merge pull request #418 from david22swan/CONT-186/main
(CONT-186) Set `-deststoretype`
2 parents f845b0d + 3435f1d commit 00d1dde

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

lib/puppet/provider/java_ks/keytool.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ def import_ks
9595
]
9696
cmd << '-trustcacerts' if @resource[:trustcacerts] == :true
9797
cmd += ['-destkeypass', @resource[:destkeypass]] unless @resource[:destkeypass].nil?
98+
cmd += ['-deststoretype', storetype] unless storetype.nil?
9899

99100
pwfile = password_file
100101
run_command(cmd, @resource[:target], pwfile)

spec/unit/puppet/provider/java_ks/keytool_spec.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@
152152
it 'executes openssl and keytool with specific options' do
153153
expect(provider).to receive(:to_pkcs12).with("#{temp_dir}testing.stuff")
154154
expect(provider).to receive(:run_command).with(['mykeytool', '-importkeystore', '-srcstoretype', 'PKCS12', '-destkeystore',
155-
resource[:target], '-srckeystore', "#{temp_dir}testing.stuff", '-alias', resource[:name]], any_args)
155+
resource[:target], '-srckeystore', "#{temp_dir}testing.stuff", '-alias',
156+
resource[:name], '-deststoretype', :jceks], any_args)
156157
provider.import_ks
157158
end
158159

@@ -161,7 +162,8 @@
161162
dkp[:destkeypass] = 'keypass'
162163
expect(provider).to receive(:to_pkcs12).with("#{temp_dir}testing.stuff")
163164
expect(provider).to receive(:run_command).with(['mykeytool', '-importkeystore', '-srcstoretype', 'PKCS12', '-destkeystore',
164-
dkp[:target], '-srckeystore', "#{temp_dir}testing.stuff", '-alias', dkp[:name], '-destkeypass', dkp[:destkeypass]], any_args)
165+
dkp[:target], '-srckeystore', "#{temp_dir}testing.stuff", '-alias', dkp[:name],
166+
'-destkeypass', dkp[:destkeypass], '-deststoretype', dkp[:storetype]], any_args)
165167
provider.import_ks
166168
end
167169
end

0 commit comments

Comments
 (0)