Modified help messages and removed some logging

caseyduquettesc · Jul 7, 2022 · 7fdd831 · 7fdd831
1 parent 020f1fb
commit 7fdd831
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 29 deletions.
diff --git a/src/main/java/com/google/jenkins/plugins/computeengine/InstanceConfiguration.java b/src/main/java/com/google/jenkins/plugins/computeengine/InstanceConfiguration.java
@@ -370,12 +370,11 @@ public Instance instance() throws IOException {
 
     if (windowsConfiguration == null) {
       if (sshConfiguration != null) {
-        log.info("User selected to use a custom private ssh key");
+        log.info("User selected to use a custom ssh private key");
         sshKeyCredential =
             configureSSHPrivateKey(sshConfiguration.getCustomPrivateKeyCredentialsId(), runAsUser);
-        log.info(
-            "User selected credential id: " + sshConfiguration.getCustomPrivateKeyCredentialsId());
       } else {
+        log.info("User selected to use an autogenerated ssh key pair");
         sshKeyCredential = configureSSHKeyPair(instance, runAsUser);
       }
     }

diff --git a/...le/jenkins/plugins/computeengine/SshConfiguration/help-customPrivateKeyCredentialsId.html b/...le/jenkins/plugins/computeengine/SshConfiguration/help-customPrivateKeyCredentialsId.html
@@ -22,19 +22,13 @@
   Example private key format: <br/>
   <code>
     -----BEGIN RSA PRIVATE KEY-----<br/>
-    MIICXAIBAAKBgQCI2WI1RnM0GGDPRc3pRk3AZxs7ZqY1FDz1lpOsgquxvb36b7G5
-    16v+G/3vduBs0tmfbbsA2jop2PZ1dwPlth1GeEJY6ne/kapvkG+hjcoghDzUu3PE
-    3Vwgd48IU7MADuBxBn28D8eUlH94FR5sCojl1NeZ3F1GGtbgiIHG3Zyr2QIDAQAB
-    AoGAfsWaQ64StLTModaRbMMy7cTWJk3uNIed/QfTn2ChexNBtYjZBEb1zn3R3I6s
-    UkN1VEqLjLucW/3gOmrZUmhFbwUpfivI61BdDeDXkqMO9/n9t3RaZciSCTlnRL+s
-    7OGHSu/XnqIrDtG4jEx09F1nOO+O1TQvSaY8Z+Mrdw5tPP0CQQD3q7ElJBr7Xi7o
-    JT9Ho68sI2zi+FXq4x5+7BbeNFTv8GrH0MviGatbLjdi18FHvaxDflrDtwvtLGY+
-    DTgbXOLbAkEAjXOUVs6COEW5Xoe44M2whNXi0A25BaR+0UEx/MJqcXY9bZ4hoOkN
-    88hQum8td/hjdRbbBXPtTTGm4lxClJKYWwJBAMAvm9OtU76xFAcSOCt4Kcs/ZhQu
-    DkWpnhVxUEF3LF3QGpwZOsyljKHBmDr8H0BzP4RUPUxX80pExMXr7hjVmDcCQA8R
-    QbrhcoOWAcHtCSeBIY10zx1EaPIN7KhTnoSDHR2K784uavyd9quCKf9B+oDuB4Ig
-    diIlkCCJ6nHwS/NRjkMCQAZ61YhY8jhkCBONrFfx9pdXNIzQF5NCxShMm79gDnp9
-    wjWcyy7pIUfBrtiZCuojGGTdNBhvG20ohMp/lfs52Hg=<br/>
+    --------------------Some private key----------------------------
+    --------------------Some private key----------------------------
+    --------------------Some private key----------------------------
+    --------------------Some private key----------------------------
+    --------------------Some private key----------------------------
+    --------------------Some private key----------------------------
+    --------------------Some private key----------------------------<br/>
     -----END RSA PRIVATE KEY-----<br/>
   </code>
 </div>
diff --git a/...ogle/jenkins/plugins/computeengine/WindowsConfiguration/help-privateKeyCredentialsId.html b/...ogle/jenkins/plugins/computeengine/WindowsConfiguration/help-privateKeyCredentialsId.html
@@ -22,19 +22,13 @@
     Example private key format: <br/>
     <code>
         -----BEGIN RSA PRIVATE KEY-----<br/>
-        MIICXAIBAAKBgQCI2WI1RnM0GGDPRc3pRk3AZxs7ZqY1FDz1lpOsgquxvb36b7G5
-        16v+G/3vduBs0tmfbbsA2jop2PZ1dwPlth1GeEJY6ne/kapvkG+hjcoghDzUu3PE
-        3Vwgd48IU7MADuBxBn28D8eUlH94FR5sCojl1NeZ3F1GGtbgiIHG3Zyr2QIDAQAB
-        AoGAfsWaQ64StLTModaRbMMy7cTWJk3uNIed/QfTn2ChexNBtYjZBEb1zn3R3I6s
-        UkN1VEqLjLucW/3gOmrZUmhFbwUpfivI61BdDeDXkqMO9/n9t3RaZciSCTlnRL+s
-        7OGHSu/XnqIrDtG4jEx09F1nOO+O1TQvSaY8Z+Mrdw5tPP0CQQD3q7ElJBr7Xi7o
-        JT9Ho68sI2zi+FXq4x5+7BbeNFTv8GrH0MviGatbLjdi18FHvaxDflrDtwvtLGY+
-        DTgbXOLbAkEAjXOUVs6COEW5Xoe44M2whNXi0A25BaR+0UEx/MJqcXY9bZ4hoOkN
-        88hQum8td/hjdRbbBXPtTTGm4lxClJKYWwJBAMAvm9OtU76xFAcSOCt4Kcs/ZhQu
-        DkWpnhVxUEF3LF3QGpwZOsyljKHBmDr8H0BzP4RUPUxX80pExMXr7hjVmDcCQA8R
-        QbrhcoOWAcHtCSeBIY10zx1EaPIN7KhTnoSDHR2K784uavyd9quCKf9B+oDuB4Ig
-        diIlkCCJ6nHwS/NRjkMCQAZ61YhY8jhkCBONrFfx9pdXNIzQF5NCxShMm79gDnp9
-        wjWcyy7pIUfBrtiZCuojGGTdNBhvG20ohMp/lfs52Hg=<br/>
+        --------------------Some private key----------------------------
+        --------------------Some private key----------------------------
+        --------------------Some private key----------------------------
+        --------------------Some private key----------------------------
+        --------------------Some private key----------------------------
+        --------------------Some private key----------------------------
+        --------------------Some private key----------------------------<br/>
         -----END RSA PRIVATE KEY-----<br/>
     </code>
 </div>