Merge pull request #399 from cbntss/ensure_absent

Don't require certificate or private key params when ensure: absent
puppetlabs · May 24, 2022 · b51a8e4 · b51a8e4
2 parents 7048b5a + eb0df8b
commit b51a8e4
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/lib/puppet/type/java_ks.rb b/lib/puppet/type/java_ks.rb
@@ -240,16 +240,18 @@ def self.title_patterns
   end
 
   validate do
-    unless value(:certificate) || value(:certificate_content)
-      raise Puppet::Error, "You must pass one of 'certificate' or 'certificate_content'"
-    end
+    if self[:ensure] != :absent
+      unless value(:certificate) || value(:certificate_content)
+        raise Puppet::Error, "You must pass one of 'certificate' or 'certificate_content'"
+      end
 
-    if value(:certificate) && value(:certificate_content)
-      raise Puppet::Error, "You must pass either 'certificate' or 'certificate_content', not both."
-    end
+      if value(:certificate) && value(:certificate_content)
+        raise Puppet::Error, "You must pass either 'certificate' or 'certificate_content', not both."
+      end
 
-    if value(:private_key) && value(:private_key_content)
-      raise Puppet::Error, "You must pass either 'private_key' or 'private_key_content', not both."
+      if value(:private_key) && value(:private_key_content)
+        raise Puppet::Error, "You must pass either 'private_key' or 'private_key_content', not both."
+      end
     end
 
     if value(:password) && value(:password_file)