changed request -> translate

ammokhov · ammokhov · commit e44bc5c88ef1 · 2020-04-21T15:38:36.000-07:00
diff --git a/python/rpdk/java/templates/init/guided_aws/StubCreateHandler.java b/python/rpdk/java/templates/init/guided_aws/StubCreateHandler.java
@@ -37,7 +37,7 @@ protected ProgressEvent<ResourceModel, CallbackContext> handleRequest(
 
             // STEP 1 [check if resource already exists]
             // if target API does not support 'ResourceAlreadyExistsException' then following check is required
-            // for more information -> https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/resource-type-test-contract.html#resource-type-test-contract-communication
+            // for more information -> https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/resource-type-test-contract.html
             //.then(progress -> checkForPreCreateResourceExistence(proxy, request, progress))
 
             // STEP 2 [create/stabilize progress chain - required for resource creation]
@@ -47,13 +47,13 @@ protected ProgressEvent<ResourceModel, CallbackContext> handleRequest(
                 proxy.initiate("{{ call_graph }}::{{ operation }}", proxyClient, model, callbackContext)
 
                     // STEP 2.1 [TODO: construct a body of a request]
-                    .request(Translator::translateToCreateRequest)
+                    .translate(Translator::translateToCreateRequest)
 
                     // STEP 2.2 [TODO: make an api call]
                     .call(this::createResource)
 
                     // STEP 2.3 [TODO: stabilize step is not necessarily required but typically involves describing the resource until it is in a certain status, though it can take many forms]
-                    // for more information -> https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/resource-type-test-contract.html#resource-type-test-contract-communication
+                    // for more information -> https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/resource-type-test-contract.html
                     .stabilize(this::stabilizedOnCreate)
                     .progress())
 
@@ -104,13 +104,13 @@ private AwsResponse createResource(
             // TODO: put your create resource code here
             // e.g. https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-logs/commit/ffb15c1a2ca6eb19c051d19d79c0f022719b1493#diff-cbc963180c54a3bf4965fff3f499f365R37-R43
 
+        } catch (final AwsServiceException e) {
             /*
              * While the handler contract states that the handler must always return a progress event,
-             * you may throw any instance of BaseHandlerException (https://code.amazon.com/packages/AWSCloudFormationRPDKJavaPlugin/blobs/mainline/--/src/main/java/software/amazon/cloudformation/exceptions/BaseHandlerException.java),
-             * as the wrapper map it to a progress event. Each BaseHandlerException maps to a specific error code, and you should map service exceptions as closely as possible
-             * to more specific error codes (https://code.amazon.com/packages/AWSCloudFormationRPDKJavaPlugin/blobs/mainline/--/src/main/java/software/amazon/cloudformation/proxy/HandlerErrorCode.java)
+             * you may throw any instance of BaseHandlerException, as the wrapper map it to a progress event.
+             * Each BaseHandlerException maps to a specific error code, and you should map service exceptions as closely as possible
+             * to more specific error codes
              */
-        } catch (final AwsServiceException e) {
             throw new CfnGeneralServiceException(ResourceModel.TYPE_NAME, e);
         }
 
@@ -121,7 +121,7 @@ private AwsResponse createResource(
     /**
      * If your resource requires some form of stabilization (e.g. service does not provide strong consistency), you will need to ensure that your code
      * accounts for any potential issues, so that a subsequent read/update requests will not cause any conflicts (e.g. NotFoundException/InvalidRequestException)
-     * for more information -> https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/resource-type-test-contract.html#resource-type-test-contract-communication
+     * for more information -> https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/resource-type-test-contract.html
      * @param awsRequest the aws service request to create a resource
      * @param awsResponse the aws service response to create a resource
      * @param proxyClient the aws service client to make the call
@@ -158,15 +158,14 @@ private ProgressEvent<ResourceModel, CallbackContext> postCreate(
         final CallbackContext callbackContext = progressEvent.getCallbackContext();
         try {
             // TODO: put your post creation resource update code here
-            // e.g. https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-logs/commit/2077c92299aeb9a68ae8f4418b5e932b12a8b186#diff-c959c290785791b96fa4442573750fcdR69-R74
 
+        } catch (final AwsServiceException e) {
             /*
              * While the handler contract states that the handler must always return a progress event,
-             * you may throw any instance of BaseHandlerException (https://code.amazon.com/packages/AWSCloudFormationRPDKJavaPlugin/blobs/mainline/--/src/main/java/software/amazon/cloudformation/exceptions/BaseHandlerException.java),
-             * as the wrapper map it to a progress event. Each BaseHandlerException maps to a specific error code, and you should map service exceptions as closely as possible
-             * to more specific error codes (https://code.amazon.com/packages/AWSCloudFormationRPDKJavaPlugin/blobs/mainline/--/src/main/java/software/amazon/cloudformation/proxy/HandlerErrorCode.java)
+             * you may throw any instance of BaseHandlerException, as the wrapper map it to a progress event.
+             * Each BaseHandlerException maps to a specific error code, and you should map service exceptions as closely as possible
+             * to more specific error codes
              */
-        } catch (final AwsServiceException e) {
             throw new CfnGeneralServiceException(ResourceModel.TYPE_NAME, e);
         }
 
diff --git a/python/rpdk/java/templates/init/guided_aws/StubDeleteHandler.java b/python/rpdk/java/templates/init/guided_aws/StubDeleteHandler.java
@@ -34,7 +34,7 @@ protected ProgressEvent<ResourceModel, CallbackContext> handleRequest(
         return ProgressEvent.progress(model, callbackContext)
 
             // STEP 1 [check if resource already exists]
-            // for more information -> https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/resource-type-test-contract.html#resource-type-test-contract-communication
+            // for more information -> https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/resource-type-test-contract.html
             // if target API does not support 'ResourceNotFoundException' then following check is required
             .then(progress -> checkForPreDeleteResourceExistence(proxy, request, progress))
 
@@ -45,13 +45,13 @@ protected ProgressEvent<ResourceModel, CallbackContext> handleRequest(
                 proxy.initiate("{{ call_graph }}::{{ operation }}", proxyClient, model, callbackContext)
 
                     // STEP 2.1 [TODO: construct a body of a request]
-                    .request(Translator::translateToDeleteRequest)
+                    .translate(Translator::translateToDeleteRequest)
 
                     // STEP 2.2 [TODO: make an api call]
                     .call(this::deleteResource)
 
                     // STEP 2.3 [TODO: stabilize step is not necessarily required but typically involves describing the resource until it is in a certain status, though it can take many forms]
-                    // for more information -> https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/resource-type-test-contract.html#resource-type-test-contract-communication
+                    // for more information -> https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/resource-type-test-contract.html
                     .stabilize(this::stabilizedOnDelete)
                     .success());
     }
@@ -75,7 +75,10 @@ private ProgressEvent<ResourceModel, CallbackContext> checkForPreDeleteResourceE
             new ReadHandler().handleRequest(proxy, request, callbackContext, logger);
             return ProgressEvent.progress(model, callbackContext);
         } catch (CfnNotFoundException e) { // ResourceNotFoundException
-            logger.log(model.getPrimaryIdentifier() + " does not exist.");
+            logger.log(String.format("%s does not exist. RequestId: %s. Message: %s",
+                model.getPrimaryIdentifier(),
+                request.getClientRequestToken(),
+                e.getMessage()));
             throw e;
         }
     }
@@ -95,13 +98,13 @@ private AwsResponse deleteResource(
             // TODO: put your delete resource code here
             // e.g. https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-logs/commit/2077c92299aeb9a68ae8f4418b5e932b12a8b186#diff-82aedf3b1de1e4a4948229fa3cac03f0R21-R30
 
+        } catch (final AwsServiceException e) {
             /*
              * While the handler contract states that the handler must always return a progress event,
-             * you may throw any instance of BaseHandlerException (https://code.amazon.com/packages/AWSCloudFormationRPDKJavaPlugin/blobs/mainline/--/src/main/java/software/amazon/cloudformation/exceptions/BaseHandlerException.java),
-             * as the wrapper map it to a progress event. Each BaseHandlerException maps to a specific error code, and you should map service exceptions as closely as possible
-             * to more specific error codes (https://code.amazon.com/packages/AWSCloudFormationRPDKJavaPlugin/blobs/mainline/--/src/main/java/software/amazon/cloudformation/proxy/HandlerErrorCode.java)
+             * you may throw any instance of BaseHandlerException, as the wrapper map it to a progress event.
+             * Each BaseHandlerException maps to a specific error code, and you should map service exceptions as closely as possible
+             * to more specific error codes
              */
-        } catch (final AwsServiceException e) {
             throw new CfnGeneralServiceException(ResourceModel.TYPE_NAME, e);
         }
 
@@ -111,7 +114,7 @@ private AwsResponse deleteResource(
 
     /**
      * If deletion of your resource requires some form of stabilization (e.g. propagation delay)
-     * for more information -> https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/resource-type-test-contract.html#resource-type-test-contract-communication
+     * for more information -> https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/resource-type-test-contract.html
      * @param awsRequest the aws service request to delete a resource
      * @param awsResponse the aws service response to delete a resource
      * @param proxyClient the aws service client to make the call
diff --git a/python/rpdk/java/templates/init/guided_aws/StubReadHandler.java b/python/rpdk/java/templates/init/guided_aws/StubReadHandler.java
@@ -34,7 +34,7 @@ protected ProgressEvent<ResourceModel, CallbackContext> handleRequest(
         return proxy.initiate("{{ call_graph }}::{{ operation }}", proxyClient, model, callbackContext)
 
             // STEP 2 [TODO: construct a body of a request]
-            .request(Translator::translateToReadRequest)
+            .translate(Translator::translateToReadRequest)
 
             // STEP 3 [TODO: make an api call]
             .call((awsRequest, sdkProxyClient) -> readResource(awsRequest, sdkProxyClient , model))
@@ -61,6 +61,12 @@ private AwsResponse readResource(
 
             // e.g. https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-logs/commit/2077c92299aeb9a68ae8f4418b5e932b12a8b186#diff-5761e3a9f732dc1ef84103dc4bc93399R41-R46
         } catch (final AwsServiceException e) { // ResourceNotFoundException
+            /*
+             * While the handler contract states that the handler must always return a progress event,
+             * you may throw any instance of BaseHandlerException, as the wrapper map it to a progress event.
+             * Each BaseHandlerException maps to a specific error code, and you should map service exceptions as closely as possible
+             * to more specific error codes
+             */
             throw new CfnGeneralServiceException(ResourceModel.TYPE_NAME, e); // e.g. https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-logs/commit/2077c92299aeb9a68ae8f4418b5e932b12a8b186#diff-5761e3a9f732dc1ef84103dc4bc93399R56-R63
         }
 
diff --git a/python/rpdk/java/templates/init/guided_aws/StubUpdateHandler.java b/python/rpdk/java/templates/init/guided_aws/StubUpdateHandler.java
@@ -34,14 +34,14 @@ protected ProgressEvent<ResourceModel, CallbackContext> handleRequest(
         return proxy.initiate("{{ call_graph }}::{{ operation }}", proxyClient, model, callbackContext)
 
             // STEP 2 [TODO: construct a body of a request]
-            .request(Translator::translateToUpdateRequest)
+            .translate(Translator::translateToUpdateRequest)
 
             // STEP 3 [TODO: make an api call]
             .call(this::updateResource)
 
             // STEP 4 [TODO: stabilize step is not necessarily required but typically involves describing the resource until it is in a certain status, though it can take many forms]
             // stabilization step may or may not be needed after each API call
-            // for more information -> https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/resource-type-test-contract.html#resource-type-test-contract-communication
+            // for more information -> https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/resource-type-test-contract.html
             .stabilize(this::stabilizedOnFirstUpdate)
             .progress()
 
@@ -68,13 +68,13 @@ private AwsResponse updateResource(
             // TODO: put your update resource code here
             // e.g. https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-logs/commit/2077c92299aeb9a68ae8f4418b5e932b12a8b186#diff-c959c290785791b96fa4442573750fcdR69-R74
 
+        } catch (final AwsServiceException e) {
             /*
              * While the handler contract states that the handler must always return a progress event,
-             * you may throw any instance of BaseHandlerException (https://code.amazon.com/packages/AWSCloudFormationRPDKJavaPlugin/blobs/mainline/--/src/main/java/software/amazon/cloudformation/exceptions/BaseHandlerException.java),
-             * as the wrapper map it to a progress event. Each BaseHandlerException maps to a specific error code, and you should map service exceptions as closely as possible
-             * to more specific error codes (https://code.amazon.com/packages/AWSCloudFormationRPDKJavaPlugin/blobs/mainline/--/src/main/java/software/amazon/cloudformation/proxy/HandlerErrorCode.java)
+             * you may throw any instance of BaseHandlerException, as the wrapper map it to a progress event.
+             * Each BaseHandlerException maps to a specific error code, and you should map service exceptions as closely as possible
+             * to more specific error codes
              */
-        } catch (final AwsServiceException e) {
             throw new CfnGeneralServiceException(ResourceModel.TYPE_NAME, e);
         }
 
@@ -85,7 +85,7 @@ private AwsResponse updateResource(
     /**
      * If your resource requires some form of stabilization (e.g. service does not provide strong consistency), you will need to ensure that your code
      * accounts for any potential issues, so that a subsequent read/update requests will not cause any conflicts (e.g. NotFoundException/InvalidRequestException)
-     * for more information -> https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/resource-type-test-contract.html#resource-type-test-contract-communication
+     * for more information -> https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/resource-type-test-contract.html
      * @param awsResponse the aws service  update resource response
      * @param proxyClient the aws service client to make the call
      * @param model resource model
@@ -123,13 +123,13 @@ private ProgressEvent<ResourceModel, CallbackContext> secondUpdate(
         try {
             // TODO: put your post update resource code here
 
+        } catch (final AwsServiceException e) {
             /*
              * While the handler contract states that the handler must always return a progress event,
-             * you may throw any instance of BaseHandlerException (https://code.amazon.com/packages/AWSCloudFormationRPDKJavaPlugin/blobs/mainline/--/src/main/java/software/amazon/cloudformation/exceptions/BaseHandlerException.java),
-             * as the wrapper map it to a progress event. Each BaseHandlerException maps to a specific error code, and you should map service exceptions as closely as possible
-             * to more specific error codes (https://code.amazon.com/packages/AWSCloudFormationRPDKJavaPlugin/blobs/mainline/--/src/main/java/software/amazon/cloudformation/proxy/HandlerErrorCode.java)
+             * you may throw any instance of BaseHandlerException, as the wrapper map it to a progress event.
+             * Each BaseHandlerException maps to a specific error code, and you should map service exceptions as closely as possible
+             * to more specific error codes
              */
-        } catch (final AwsServiceException e) {
             throw new CfnGeneralServiceException(ResourceModel.TYPE_NAME, e);
         }
 
