|
23 | 23 | import com.amazonaws.services.lambda.runtime.Context;
|
24 | 24 | import com.amazonaws.services.lambda.runtime.LambdaLogger;
|
25 | 25 | import com.fasterxml.jackson.core.type.TypeReference;
|
| 26 | +import com.google.common.collect.ImmutableList; |
| 27 | +import com.google.common.collect.ImmutableMap; |
26 | 28 | import java.io.ByteArrayOutputStream;
|
27 | 29 | import java.io.File;
|
28 | 30 | import java.io.FileInputStream;
|
|
33 | 35 | import java.util.Collections;
|
34 | 36 | import java.util.List;
|
35 | 37 | import java.util.Map;
|
36 |
| - |
37 |
| -import com.google.common.collect.ImmutableList; |
38 |
| -import com.google.common.collect.ImmutableMap; |
39 | 38 | import org.junit.jupiter.api.Assertions;
|
40 | 39 | import org.junit.jupiter.api.BeforeEach;
|
41 | 40 | import org.junit.jupiter.api.Test;
|
@@ -408,16 +407,19 @@ public void testIsHookInvocationPayloadRemote() {
|
408 | 407 | Assertions.assertThrows(TerminalException.class, () -> wrapper.isHookInvocationPayloadRemote(requestData));
|
409 | 408 | });
|
410 | 409 |
|
411 |
| - Assertions.assertThrows(TerminalException.class, () -> wrapper.isHookInvocationPayloadRemote(null)); |
| 410 | + Assertions.assertThrows(TerminalException.class, () -> wrapper.isHookInvocationPayloadRemote(null)); |
412 | 411 |
|
413 |
| - HookRequestData bothFieldsPopulated = HookRequestData.builder().targetModel(ImmutableMap.of("foo", "bar")).payload("http://s3PresignedUrl").build(); |
414 |
| - HookRequestData onlyTargetModelPopulated = HookRequestData.builder().targetModel(ImmutableMap.of("foo", "bar")).payload(null).build(); |
415 |
| - HookRequestData onlyPayloadPopulated = HookRequestData.builder().targetModel(Collections.emptyMap()).payload("http://s3PresignedUrl").build(); |
| 412 | + HookRequestData bothFieldsPopulated = HookRequestData.builder().targetModel(ImmutableMap.of("foo", "bar")) |
| 413 | + .payload("http://s3PresignedUrl").build(); |
| 414 | + HookRequestData onlyTargetModelPopulated = HookRequestData.builder().targetModel(ImmutableMap.of("foo", "bar")) |
| 415 | + .payload(null).build(); |
| 416 | + HookRequestData onlyPayloadPopulated = HookRequestData.builder().targetModel(Collections.emptyMap()) |
| 417 | + .payload("http://s3PresignedUrl").build(); |
416 | 418 |
|
417 |
| - Assertions.assertFalse(wrapper.isHookInvocationPayloadRemote(bothFieldsPopulated)); |
418 |
| - Assertions.assertFalse(wrapper.isHookInvocationPayloadRemote(onlyTargetModelPopulated)); |
419 |
| - Assertions.assertTrue(wrapper.isHookInvocationPayloadRemote(onlyPayloadPopulated)); |
420 |
| - } |
| 419 | + Assertions.assertFalse(wrapper.isHookInvocationPayloadRemote(bothFieldsPopulated)); |
| 420 | + Assertions.assertFalse(wrapper.isHookInvocationPayloadRemote(onlyTargetModelPopulated)); |
| 421 | + Assertions.assertTrue(wrapper.isHookInvocationPayloadRemote(onlyPayloadPopulated)); |
| 422 | + } |
421 | 423 |
|
422 | 424 | 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"
|
423 | 425 | + " at [Source: (String)\"{\n" + " \"clientRequestToken\": \"123456\",\n" + " \"awsAccountId\": \"123456789012\",\n"
|
|
0 commit comments