Add bearerToken to response and pass it to handler as clientRequestToken (#43)

* Add bearerToken to response as well as pass it to handler as clientRequestToken

* Also add errorCode to response

Author: John Tompkins

python/rpdk/java/templates/HandlerWrapper.java

@@ -97,6 +97,7 @@ public InputStream provideResourceSchema() {
 
         return new ResourceHandlerRequest<>(
             request.getAwsAccountId(),
+            request.getBearerToken(),
             request.getNextToken(),
             request.getRegion(),
             request.getResourceType(),

src/main/java/com/aws/cfn/LambdaWrapper.java

@@ -114,7 +114,7 @@ public void handleRequest(final InputStream inputStream,
         } 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, createProgressResponse(handlerResponse));
+            writeResponse(outputStream, createProgressResponse(handlerResponse, request.getBearerToken()));
         }
     }
 
@@ -237,11 +237,13 @@ public ProgressEvent<ResourceT, CallbackT> processInvocation(final HandlerReques
         return handlerResponse;
     }
 
-    private Response<ResourceT> createProgressResponse(final ProgressEvent<ResourceT, CallbackT> progressEvent) {
+    private Response<ResourceT> createProgressResponse(final ProgressEvent<ResourceT, CallbackT> progressEvent, final String bearerToken) {
         final Response<ResourceT> response = new Response<>();
         response.setMessage(progressEvent.getMessage());
         response.setOperationStatus(progressEvent.getStatus());
         response.setResourceModel(progressEvent.getResourceModel());
+        response.setBearerToken(bearerToken);
+        response.setErrorCode(progressEvent.getErrorCode());
         return response;
     }
 

src/main/java/com/aws/cfn/Response.java

@@ -8,6 +8,17 @@
 
 @Data
 public class Response<ResourceT> {
+    /**
+     * The bearerToken is used to report progress back to CloudFormation and is passed
+     * back to CloudFormation
+     */
+    private String bearerToken;
+
+    /**
+     * The errorCode is used to report granular failures back to CloudFormation
+     */
+    private HandlerErrorCode errorCode;
+
     /**
      * The operationStatus indicates whether the handler has reached a terminal state or
      * is still computing and requires more time to complete

src/main/java/com/aws/cfn/proxy/ResourceHandlerRequest.java

@@ -16,6 +16,7 @@
 @Builder(toBuilder = true)
 public class ResourceHandlerRequest<T> {
     private String awsAccountId;
+    private String clientRequestToken;
     private String nextToken;
     private String region;
     private String resourceType;

src/test/java/com/aws/cfn/LambdaWrapperTest.java

@@ -128,7 +128,7 @@ private void testInvokeHandler_NullResponse(final String requestDataPath,
         // verify output response
         assertThat(
             out.toString(),
-            is(equalTo("{\"operationStatus\":\"FAILED\",\"resourceModel\":{\"property2\":123,\"property1\":\"abc\"}," +
+            is(equalTo("{\"operationStatus\":\"FAILED\",\"bearerToken\":\"123456\",\"resourceModel\":{\"property2\":123,\"property1\":\"abc\"}," +
                     "\"message\":\"Handler failed to provide a response.\"}"))
         );
     }
@@ -205,7 +205,7 @@ private void testInvokeHandler_Failed(final String requestDataPath,
         // verify output response
         assertThat(
             out.toString(),
-            is(equalTo("{\"operationStatus\":\"FAILED\",\"message\":\"Custom Fault\"}"))
+            is(equalTo("{\"operationStatus\":\"FAILED\",\"bearerToken\":\"123456\",\"message\":\"Custom Fault\"}"))
         );
     }
 
@@ -281,7 +281,7 @@ private void testInvokeHandler_CompleteSynchronously(final String requestDataPat
         // verify output response
         assertThat(
             out.toString(),
-            is(equalTo("{\"operationStatus\":\"SUCCESS\"}"))
+            is(equalTo("{\"operationStatus\":\"SUCCESS\",\"bearerToken\":\"123456\"}"))
         );
     }
 
@@ -363,7 +363,7 @@ private void testInvokeHandler_InProgress(final String requestDataPath,
         // verify output response
         assertThat(
             out.toString(),
-            is(equalTo("{\"operationStatus\":\"IN_PROGRESS\",\"resourceModel\":{}}"))
+            is(equalTo("{\"operationStatus\":\"IN_PROGRESS\",\"bearerToken\":\"123456\",\"resourceModel\":{}}"))
         );
     }
 
@@ -447,7 +447,7 @@ private void testReInvokeHandler_InProgress(final String requestDataPath,
         // verify output response
         assertThat(
             out.toString(),
-            is(equalTo("{\"operationStatus\":\"IN_PROGRESS\",\"resourceModel\":{}}"))
+            is(equalTo("{\"operationStatus\":\"IN_PROGRESS\",\"bearerToken\":\"123456\",\"resourceModel\":{}}"))
         );
     }
 
@@ -526,7 +526,7 @@ private void testInvokeHandler_SchemaValidationFailure(final String requestDataP
         // verify output response
         assertThat(
             out.toString(),
-            is(equalTo( "{\"operationStatus\":\"FAILED\",\"resourceModel\":{\"property2\":123,\"property1\":\"abc\"}}"))
+            is(equalTo( "{\"operationStatus\":\"FAILED\",\"bearerToken\":\"123456\",\"resourceModel\":{\"property2\":123,\"property1\":\"abc\"}}"))
         );
     }
 
@@ -584,7 +584,7 @@ public void testInvokeHandler_WithMalformedRequest() throws IOException {
         // verify output response
         assertThat(
             out.toString(),
-            is(equalTo("{\"operationStatus\":\"SUCCESS\",\"resourceModel\":{}}"))
+            is(equalTo("{\"operationStatus\":\"SUCCESS\",\"bearerToken\":\"123456\",\"resourceModel\":{}}"))
         );
     }
 }