Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(CAT-2100) Add Debian 12 support #459

Closed
wants to merge 1 commit into from
Closed

(CAT-2100) Add Debian 12 support #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .fixtures.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ fixtures:
provision: 'https://github.com/puppetlabs/provision.git'
puppet_agent:
repo: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
ref: v4.13.0
ref: v4.21.0
forge_modules:
chocolatey: "puppetlabs/chocolatey"
java: "puppetlabs/java"
Expand Down
3 changes: 2 additions & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
"operatingsystem": "Debian",
"operatingsystemrelease": [
"10",
"11"
"11",
"12"
]
},
{
Expand Down
65 changes: 47 additions & 18 deletions spec/acceptance/pkcs12_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,22 @@
idempotent_apply(pp)
end

expectations = [
%r{Alias name: leaf cert},
%r{Entry type: (keyEntry|PrivateKeyEntry)},
%r{Certificate chain length: 3},
%r{^Serial number: 5.*^Serial number: 4.*^Serial number: 3}m,
]
expectations = if os[:family] == 'debian' && os[:release] =~ %r{^12}
[
%r{Alias name: leaf cert},
%r{Entry type: (keyEntry|PrivateKeyEntry)},
%r{Certificate chain length: 2},
%r{^Serial number: 5.*^Serial number: 6}m,
]
else
[
%r{Alias name: leaf cert},
%r{Entry type: (keyEntry|PrivateKeyEntry)},
%r{Certificate chain length: 3},
%r{^Serial number: 5.*^Serial number: 4.*^Serial number: 3}m,
]
end

it 'verifies the private key and chain' do
run_shell(keytool_command("-list -v -keystore #{@temp_dir}pkcs12.ks -storepass puppet"), expect_failures: true) do |r|
expectations.each do |expect|
Expand Down Expand Up @@ -93,12 +103,22 @@
idempotent_apply(pp)
end

expectations = [
%r{Alias name: leaf_cert},
%r{Entry type: (keyEntry|PrivateKeyEntry)},
%r{Certificate chain length: 3},
%r{^Serial number: 5.*^Serial number: 4.*^Serial number: 3}m,
]
expectations = if os[:family] == 'debian' && os[:release] =~ %r{^12}
[
%r{Alias name: leaf_cert},
%r{Entry type: (keyEntry|PrivateKeyEntry)},
%r{Certificate chain length: 2},
%r{^Serial number: 5.*^Serial number: 6}m,
]
else
[
%r{Alias name: leaf_cert},
%r{Entry type: (keyEntry|PrivateKeyEntry)},
%r{Certificate chain length: 3},
%r{^Serial number: 5.*^Serial number: 4.*^Serial number: 3}m,
]
end

it 'verifies the private key and chain' do
run_shell(keytool_command("-list -v -keystore #{@temp_dir}pkcs12.ks -storepass puppet"), expect_failures: true) do |r|
expectations.each do |expect|
Expand Down Expand Up @@ -133,12 +153,21 @@
idempotent_apply(pp)
end

expectations = [
%r{Alias name: leaf_cert},
%r{Entry type: (keyEntry|PrivateKeyEntry)},
%r{Certificate chain length: 3},
%r{^Serial number: 5.*^Serial number: 4.*^Serial number: 3}m,
]
expectations = if os[:family] == 'debian' && os[:release] =~ %r{^12}
[
%r{Alias name: leaf_cert},
%r{Entry type: (keyEntry|PrivateKeyEntry)},
%r{Certificate chain length: 2},
%r{^Serial number: 5.*^Serial number: 6}m,
]
else
[
%r{Alias name: leaf_cert},
%r{Entry type: (keyEntry|PrivateKeyEntry)},
%r{Certificate chain length: 3},
%r{^Serial number: 5.*^Serial number: 4.*^Serial number: 3}m,
]
end
it 'verifies the private key and chain' do
run_shell(keytool_command("-list -v -keystore #{@temp_dir}pkcs12.ks -storepass puppet"), expect_failures: true) do |r|
expectations.each do |expect|
Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper_acceptance_local.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ class { 'java': }
when 'ubuntu'
@ensure_ks = 'present' if ['20.04', '22.04'].include?(os[:release])
when 'debian'
@ensure_ks = 'present' if os[:release].match?(%r{^11})
@ensure_ks = 'present' if os[:release].match?(%r{^11|12})
end
end
end
Loading