conga-aem-crypto-cli: Allow to generate AEM crypto keys without specifying and Ansible vault password.

stefanseifert · stefanseifert · commit 80d092559903 · 2019-10-28T16:10:02.000+01:00
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,12 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="1.9.4" date="not released">
+      <action type="fix" dev="sseifert">
+        conga-aem-crypto-cli: Allow to generate AEM crypto keys without specifying and Ansible vault password.
+      </action>
+    </release>
+
     <release version="1.9.2" date="2019-10-01">
       <action type="add" dev="sseifert" issue="WTOOL-54">
         conga-aem-maven-plugin: Add two more bundles to "Bundle Status Whitelist Bundle Names" property.
diff --git a/tooling/conga-aem-crypto-cli/src/main/java/io/wcm/devops/conga/plugins/aem/tooling/crypto/cli/CryptoKeys.java b/tooling/conga-aem-crypto-cli/src/main/java/io/wcm/devops/conga/plugins/aem/tooling/crypto/cli/CryptoKeys.java
@@ -49,7 +49,11 @@ private CryptoKeys() {
    * @throws GeneralSecurityException Security exception
    */
   public static Stream<File> generate(File targetDir, boolean ansibleVaultEncrypt) throws GeneralSecurityException {
-    return generate(targetDir, ansibleVaultEncrypt, AnsibleVaultPassword.get());
+    String ansibleVaultPassword = null;
+    if (ansibleVaultEncrypt) {
+      ansibleVaultPassword = AnsibleVaultPassword.get();
+    }
+    return generate(targetDir, ansibleVaultEncrypt, ansibleVaultPassword);
   }
 
   /**
