From a1577c418bdef23c3672a5bd3ca14d2d49cf7eb3 Mon Sep 17 00:00:00 2001
From: Wenbing Li <libruce@amazon.com>
Date: Fri, 4 Dec 2020 17:07:05 -0800
Subject: [PATCH] Revert "Log response payload for better troubleshooting
 (#320)"

This reverts commit 4bdae6ec8d27543fa0ca9a4d50515cdf325ad953.
---
 .../cloudformation/AbstractWrapper.java       | 26 ++-----------------
 .../amazon/cloudformation/WrapperTest.java    | 12 +--------
 2 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/src/main/java/software/amazon/cloudformation/AbstractWrapper.java b/src/main/java/software/amazon/cloudformation/AbstractWrapper.java
index 61bbfa04..1286a9e1 100644
--- a/src/main/java/software/amazon/cloudformation/AbstractWrapper.java
+++ b/src/main/java/software/amazon/cloudformation/AbstractWrapper.java
@@ -231,7 +231,7 @@ public void processRequest(final InputStream inputStream, final OutputStream out
         } finally {
             // A response will be output on all paths, though CloudFormation will
             // not block on invoking the handlers, but rather listen for callbacks
-            writeResponse(outputStream, handlerResponse, request);
+            writeResponse(outputStream, handlerResponse);
             publishExceptionCodeAndCountMetrics(request == null ? null : request.getAction(), handlerResponse.getErrorCode());
         }
     }
@@ -376,9 +376,7 @@ public void processRequest(final InputStream inputStream, final OutputStream out
 
     }
 
-    protected void writeResponse(final OutputStream outputStream,
-                                 final ProgressEvent<ResourceT, CallbackT> response,
-                                 final HandlerRequest<ResourceT, CallbackT> request)
+    protected void writeResponse(final OutputStream outputStream, final ProgressEvent<ResourceT, CallbackT> response)
         throws IOException {
         if (response.getResourceModel() != null) {
             // strip write only properties on final results, we will need the intact model
@@ -389,21 +387,10 @@ protected void writeResponse(final OutputStream outputStream,
         }
 
         String output = this.serializer.serialize(response);
-        if (response.getStatus() != OperationStatus.IN_PROGRESS) {
-            // if status is not IN_PROGRESS, it means the response has been sanitized
-            final String logicalResourceId = getLogicalResourceId(request);
-            final String stackId = getStackId(request);
-            this.log(String.format("StackId=%s LogicalResourceId=%s Response=%s", stackId, logicalResourceId, output));
-        }
         outputStream.write(output.getBytes(StandardCharsets.UTF_8));
         outputStream.flush();
     }
 
-    protected void writeResponse(final OutputStream outputStream, final ProgressEvent<ResourceT, CallbackT> response)
-        throws IOException {
-        this.writeResponse(outputStream, response, null);
-    }
-
     protected ResourceT sanitizeModel(final ResourceT model) throws IOException {
         // strip write only properties on final results, we will need the intact model
         // while provisioning
@@ -587,15 +574,6 @@ protected String getStackId(final HandlerRequest<ResourceT, CallbackT> request)
         return null;
     }
 
-    @VisibleForTesting
-    protected String getLogicalResourceId(final HandlerRequest<ResourceT, CallbackT> request) {
-        if (request != null && request.getRequestData() != null) {
-            return request.getRequestData().getLogicalResourceId();
-        }
-
-        return null;
-    }
-
     private void replaceInMap(final Map<String, String> targetMap, final Map<String, String> sourceMap) {
         if (targetMap == null) {
             return;
diff --git a/src/test/java/software/amazon/cloudformation/WrapperTest.java b/src/test/java/software/amazon/cloudformation/WrapperTest.java
index 941aecd5..d935b2f3 100755
--- a/src/test/java/software/amazon/cloudformation/WrapperTest.java
+++ b/src/test/java/software/amazon/cloudformation/WrapperTest.java
@@ -160,7 +160,7 @@ public void invokeHandler_nullResponse_returnsFailure(final String requestDataPa
             }
 
             verify(providerEventsLogger).refreshClient();
-            verify(providerEventsLogger, times(3)).publishLogEvent(any());
+            verify(providerEventsLogger, times(2)).publishLogEvent(any());
             verifyNoMoreInteractions(providerEventsLogger);
 
             // verify output response
@@ -1029,14 +1029,4 @@ public void getStackId_setAndGetStackId() {
         assertThat(stackId).isNotNull();
         assertThat(stackId).isEqualTo("AWSStackId");
     }
-
-    @Test
-    public void getLogicalResourceId_setAndGetLogicalResourceId() {
-        final HandlerRequest<TestModel, TestContext> request = new HandlerRequest<>();
-        final RequestData<TestModel> requestData = new RequestData<>();
-        requestData.setLogicalResourceId("MyResource");
-        request.setRequestData(requestData);
-
-        assertThat(wrapper.getLogicalResourceId(request)).isEqualTo("MyResource");
-    }
 }