Merge pull request #64 from apigee/Issue63

Issue 63 fix
apigee · Sep 30, 2019 · b87bb4d · b87bb4d
2 parents 66cc7ef + cd55bb4
commit b87bb4d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 17 deletions.
diff --git a/samples/APIandConfig/shared-pom.xml b/samples/APIandConfig/shared-pom.xml
@@ -69,7 +69,7 @@
             <plugin>
                 <groupId>com.apigee.edge.config</groupId>
                 <artifactId>apigee-config-maven-plugin</artifactId>
-                <version>1.3.4</version>
+                <version>1.3.5</version>
                 <executions>
                     <execution>
                         <id>create-config-cache</id>

diff --git a/samples/EdgeConfig/shared-pom.xml b/samples/EdgeConfig/shared-pom.xml
@@ -26,7 +26,7 @@
             <plugin>
                 <groupId>com.apigee.edge.config</groupId>
                 <artifactId>apigee-config-maven-plugin</artifactId>
-                <version>1.3.4</version>
+                <version>1.3.5</version>
                 <executions>
                     <execution>
                         <id>create-config-cache</id>

diff --git a/src/main/java/com/apigee/edge/config/mavenplugin/KVMMojo.java b/src/main/java/com/apigee/edge/config/mavenplugin/KVMMojo.java
@@ -389,7 +389,7 @@ public static String createOrgKVM(ServerProfile profile, String kvm)
                                                             kvm);
         try {
 
-            logger.info("Response " + response.getContentType() + "\n" +
+            logger.debug("Response " + response.getContentType() + "\n" +
                                         response.parseAsString());
             if (response.isSuccessStatusCode())
                 logger.info("Create Success.");
@@ -410,7 +410,7 @@ public static String deleteOrgKVM(ServerProfile profile, String kvmEntry)
                                                             kvmEntry);
         try {
 
-            logger.info("Response " + response.getContentType() + "\n" +
+            logger.debug("Response " + response.getContentType() + "\n" +
                                         response.parseAsString());
             if (response.isSuccessStatusCode())
                 logger.info("Delete Success.");
@@ -462,7 +462,7 @@ public static String createEnvKVM(ServerProfile profile, String kvm)
                                                     kvm);
         try {
 
-            logger.info("Response " + response.getContentType() + "\n" +
+            logger.debug("Response " + response.getContentType() + "\n" +
                                         response.parseAsString());
             if (response.isSuccessStatusCode())
             	logger.info("Create Success.");
@@ -484,7 +484,7 @@ public static String deleteEnvKVM(ServerProfile profile,
                                                     kvmEntry);
         try {
 
-            logger.info("Response " + response.getContentType() + "\n" +
+            logger.debug("Response " + response.getContentType() + "\n" +
                                         response.parseAsString());
             if (response.isSuccessStatusCode())
                 logger.info("Delete Success.");
@@ -539,7 +539,7 @@ public static String createAPIKVM(ServerProfile profile,
                                                             kvm);
         try {
 
-            logger.info("Response " + response.getContentType() + "\n" +
+            logger.debug("Response " + response.getContentType() + "\n" +
                                         response.parseAsString());
             if (response.isSuccessStatusCode())
                 logger.info("Create Success.");
@@ -563,7 +563,7 @@ public static String deleteAPIKVM(ServerProfile profile,
                                                             kvmEntry);
         try {
 
-            logger.info("Response " + response.getContentType() + "\n" +
+            logger.debug("Response " + response.getContentType() + "\n" +
                                         response.parseAsString());
             if (response.isSuccessStatusCode())
                 logger.info("Delete Success.");

diff --git a/src/main/java/com/apigee/edge/config/mavenplugin/kvm/KvmOperations.java b/src/main/java/com/apigee/edge/config/mavenplugin/kvm/KvmOperations.java
@@ -69,7 +69,7 @@ private void updateKvmForCpsOrg(KvmValueObject kvmValueObject) throws MojoFailur
 
             try {
 
-                logger.info("Response " + response.getContentType() + "\n" +
+                logger.debug("Response " + response.getContentType() + "\n" +
                         response.parseAsString());
 
                 if (response.isSuccessStatusCode())
@@ -88,7 +88,7 @@ private void updateKvmForNonCpsOrg(KvmValueObject kvmValueObject)
     		logger.info("Override is set to false");
     		HttpResponse response = getKvm(kvmValueObject);
     		String responseString = response.parseAsString();
-    		logger.info("Get KVM Response " + response.getContentType() + "\n" + responseString);
+    		logger.debug("Get KVM Response " + response.getContentType() + "\n" + responseString);
     		if(compareJSON(responseString, kvmValueObject.getKvm())) {
     			logger.info("No change to KVM - "+ kvmValueObject.getKvmName()+". Skipping !");
     			return;
@@ -97,7 +97,7 @@ private void updateKvmForNonCpsOrg(KvmValueObject kvmValueObject)
         HttpResponse response = updateKvmEntriesForNonCpsOrg(kvmValueObject);
         try {
 
-            logger.info("Response " + response.getContentType() + "\n" +
+            logger.debug("Response " + response.getContentType() + "\n" +
                     response.parseAsString());
             if (response.isSuccessStatusCode())
                 logger.info("Update Success.");
@@ -130,7 +130,7 @@ private boolean doesEntryAlreadyExistForOrg(KvmValueObject kvmValueObject, Strin
                 return false;
             }
 
-            logger.info("Response " + response.getContentType() + "\n" +
+            logger.debug("Response " + response.getContentType() + "\n" +
                     response.parseAsString());
 
             if (response.isSuccessStatusCode()) {

diff --git a/src/main/java/com/apigee/edge/config/utils/PrintUtil.java b/src/main/java/com/apigee/edge/config/utils/PrintUtil.java
@@ -66,12 +66,17 @@ public static String formatRequest(HttpRequest request) {
             {
                 prettyRequest = prettyRequest + "\n" + "content-type" + ": " + request.getContent().getType();
 
-                if (!request.getContent().getType().contains("octet"))
+                //https://github.com/apigee/apigee-config-maven-plugin/issues/63 Not print KVM Request as it could have sensitive data
+                if (request.getUrl().toString().contains("/keyvaluemaps")) {
+                    prettyRequest = prettyRequest + "\n [Request body may contain sensitive data, not shown] \n";
+                }
+                else if (!request.getContent().getType().contains("octet"))
                 {
-                ByteArrayOutputStream out = new ByteArrayOutputStream();
-                request.getContent().writeTo(out);
-                prettyRequest = prettyRequest + "\n [Request body]\n" + out.toString();
-                } else {
+	                ByteArrayOutputStream out = new ByteArrayOutputStream();
+	                request.getContent().writeTo(out);
+	                prettyRequest = prettyRequest + "\n [Request body]\n" + out.toString();
+                } 
+                else {
                     prettyRequest = prettyRequest + "\n [Request body contains data, not shown] \n";
                 }
             }