Add support to download hook target data for stack-level hooks

Stack level hooks will not be provided with invocation payload information, unlike resource level hooks. Instead, Hooks Service will pass in an S3 presigned URL that points to a file that contains the stack-level invocation payload. The base hook handler (before it reaches the customer's handler code), will use that URL to download the data and set it on the target model that is passed to the customer's handler.

Author: brianlaoaws

src/main/java/software/amazon/cloudformation/HookAbstractWrapper.java

@@ -17,6 +17,7 @@
 import com.amazonaws.AmazonServiceException;
 import com.amazonaws.retry.RetryUtils;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.google.common.annotations.VisibleForTesting;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,8 +28,6 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.Map;
-
-import com.google.common.annotations.VisibleForTesting;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
@@ -389,8 +388,7 @@ public Map<String, Object> retrieveHookInvocationPayloadFromS3(final String s3Pr
 
             try {
                 URL presignedUrl = new URL(s3PresignedUrl);
-                SdkHttpRequest httpRequest = SdkHttpRequest.builder().method(SdkHttpMethod.GET).uri(presignedUrl.toURI())
-                        .build();
+                SdkHttpRequest httpRequest = SdkHttpRequest.builder().method(SdkHttpMethod.GET).uri(presignedUrl.toURI()).build();
 
                 HttpExecuteRequest executeRequest = HttpExecuteRequest.builder().request(httpRequest).build();
 

src/main/java/software/amazon/cloudformation/proxy/hook/targetmodel/ChangedResource.java

@@ -15,7 +15,10 @@
 package software.amazon.cloudformation.proxy.hook.targetmodel;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
 @Builder

src/main/java/software/amazon/cloudformation/proxy/hook/targetmodel/StackHookTargetModel.java

@@ -19,8 +19,12 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
 import java.util.List;
-import lombok.*;
 
 @EqualsAndHashCode(callSuper = false)
 @Getter
@@ -33,13 +37,13 @@ public class StackHookTargetModel extends HookTargetModel {
     };
 
     @JsonProperty("Template")
-    private String template;
+    private Object template;
 
     @JsonProperty("PreviousTemplate")
-    private String previousTemplate;
+    private Object previousTemplate;
 
     @JsonProperty("ResolvedTemplate")
-    private String resolvedTemplate;
+    private Object resolvedTemplate;
 
     @JsonProperty("ChangedResources")
     private List<ChangedResource> changedResources;

src/test/java/software/amazon/cloudformation/HookLambdaWrapperTest.java

@@ -23,6 +23,8 @@
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -33,9 +35,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -408,16 +407,19 @@ public void testIsHookInvocationPayloadRemote() {
             Assertions.assertThrows(TerminalException.class, () -> wrapper.isHookInvocationPayloadRemote(requestData));
         });
 
-       Assertions.assertThrows(TerminalException.class, () -> wrapper.isHookInvocationPayloadRemote(null));
+        Assertions.assertThrows(TerminalException.class, () -> wrapper.isHookInvocationPayloadRemote(null));
 
-       HookRequestData bothFieldsPopulated = HookRequestData.builder().targetModel(ImmutableMap.of("foo", "bar")).payload("http://s3PresignedUrl").build();
-       HookRequestData onlyTargetModelPopulated = HookRequestData.builder().targetModel(ImmutableMap.of("foo", "bar")).payload(null).build();
-       HookRequestData onlyPayloadPopulated = HookRequestData.builder().targetModel(Collections.emptyMap()).payload("http://s3PresignedUrl").build();
+        HookRequestData bothFieldsPopulated = HookRequestData.builder().targetModel(ImmutableMap.of("foo", "bar"))
+            .payload("http://s3PresignedUrl").build();
+        HookRequestData onlyTargetModelPopulated = HookRequestData.builder().targetModel(ImmutableMap.of("foo", "bar"))
+            .payload(null).build();
+        HookRequestData onlyPayloadPopulated = HookRequestData.builder().targetModel(Collections.emptyMap())
+            .payload("http://s3PresignedUrl").build();
 
-       Assertions.assertFalse(wrapper.isHookInvocationPayloadRemote(bothFieldsPopulated));
-       Assertions.assertFalse(wrapper.isHookInvocationPayloadRemote(onlyTargetModelPopulated));
-       Assertions.assertTrue(wrapper.isHookInvocationPayloadRemote(onlyPayloadPopulated));
-   }
+        Assertions.assertFalse(wrapper.isHookInvocationPayloadRemote(bothFieldsPopulated));
+        Assertions.assertFalse(wrapper.isHookInvocationPayloadRemote(onlyTargetModelPopulated));
+        Assertions.assertTrue(wrapper.isHookInvocationPayloadRemote(onlyPayloadPopulated));
+    }
 
     private final String expectedStringWhenStrictDeserializingWithExtraneousFields = "Unrecognized field \"targetName\" (class software.amazon.cloudformation.proxy.hook.HookInvocationRequest), not marked as ignorable (10 known properties: \"requestContext\", \"stackId\", \"clientRequestToken\", \"hookModel\", \"hookTypeName\", \"requestData\", \"actionInvocationPoint\", \"awsAccountId\", \"changeSetId\", \"hookTypeVersion\"])\n"
         + " at [Source: (String)\"{\n" + "    \"clientRequestToken\": \"123456\",\n" + "    \"awsAccountId\": \"123456789012\",\n"