Merge pull request #376 from puppetlabs/pdksync_IAC-1709/main/add_deb…

…ian_11_support pdksync - (IAC-1709) - Add Support for Debian 11
puppetlabs · Aug 13, 2021 · 7dfae98 · 7dfae98
2 parents 0a8247e + 72c1011
commit 7dfae98
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/metadata.json b/metadata.json
@@ -53,7 +53,8 @@
       "operatingsystemrelease": [
         "8",
         "9",
-        "10"
+        "10",
+        "11"
       ]
     },
     {

diff --git a/spec/acceptance/pkcs12_spec.rb b/spec/acceptance/pkcs12_spec.rb
@@ -50,7 +50,8 @@
 
       idempotent_apply(pp)
 
-      expectations = if os[:family] == 'windows' || (os[:family] == 'ubuntu' && os[:release] == '20.04')
+      expectations = if os[:family] == 'windows' || (os[:family] == 'ubuntu' && os[:release] == '20.04') ||
+                        (os[:family] == 'debian' && os[:release] =~ %r{^11})
                        [
                          %r{Alias name: leaf cert},
                          %r{Entry type: (keyEntry|PrivateKeyEntry)},

diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
@@ -195,6 +195,8 @@ class { 'java': }
       @resource_path = "['C:/Program Files/Java/jdk1.#{java_major}.0_#{java_minor}/bin/']"
     when 'ubuntu'
       @ensure_ks = 'present' if os[:release] == '20.04'
+    when 'debian'
+      @ensure_ks = 'present' if os[:release].match?(%r{^11})
     end
   end
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,7 +53,8 @@ @@
           "operatingsystemrelease": [
             "8",
             "9",
-            "10"
+            "10",
+            "11"
           ]
         },
         {
@@ Expand Down @@