Handling null-values in parameters and tags.

lambda-cform/lambda-cform-account/src/site/markdown/guide/usage.md

@@ -128,7 +128,7 @@ object.
             accountName: "dev"
             administratorRoleName: "OrganizationAdmin"
             # assume OrganizationUnit is a resource created by lambda-cform-organization-unit handler
-            ouId: !GetAtt "OrganizationUnit.id"
+            ouId: !GetAtt "OrganizationUnit.Id"
 
     InvitedAccount:
         Type: "AWS::CloudFormation::CustomResource"

lambda-cform/lambda-cform-stackset-instance/src/main/java/pl/wrzasq/lambda/cform/stackset/instance/service/StackSetInstanceManager.java

@@ -8,7 +8,9 @@
 package pl.wrzasq.lambda.cform.stackset.instance.service;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import com.amazonaws.services.cloudformation.AmazonCloudFormation;
@@ -226,7 +228,10 @@ private String updateStackInstance(StackInstanceRequest input)
      */
     private static Collection<Parameter> buildSdkParameters(StackInstanceRequest input)
     {
-        return input.getParameterOverrides().entrySet().stream()
+        return Optional.ofNullable(input.getParameterOverrides())
+            .orElse(Collections.emptyMap())
+            .entrySet()
+            .stream()
             .map(
                 (Map.Entry<String, String> entry) ->
                     new Parameter()

lambda-cform/lambda-cform-stackset-instance/src/site/markdown/guide/usage.md

@@ -95,7 +95,7 @@ object.
             Code:
                 # put your source bucket
                 S3Bucket: "your-bucket"
-                S3Key: "lambda-cform-stackset-1.0.6-standalone.jar"
+                S3Key: "lambda-cform-stackset-instance-1.0.6-standalone.jar"
             Handler: "pl.wrzasq.lambda.cform.stackset.instance.Handler::handle"
             MemorySize: 256
             Description: "AWS CloudFormation stack instance manager deployment."
@@ -110,7 +110,7 @@ object.
             # reference to deploy function
             ServiceToken: !GetAtt "StackInstanceManager.Arn"
             # reference to resource provisioned by lambda-cform-stackset
-            stackSetName: !GetAtt "StackSet.Name"
+            stackSetName: !GetAtt "StackSet.StackSetName"
             # reference to resource provisioned by lambda-cform-account
             accountId: !GetAtt "Account.Id"
             region: !Ref "AWS::Region"

lambda-cform/lambda-cform-stackset-instance/src/test/java/test/pl/wrzasq/lambda/cform/stackset/instance/service/StackSetInstanceManagerTest.java

@@ -87,7 +87,7 @@ public void deployStackInstance()
     {
         StackInstance stackInstance = new StackInstance();
 
-        StackSetInstanceManager manager = new StackSetInstanceManager(this.cloudFormation);
+        StackSetInstanceManager manager = this.createStackSetInstanceManager();
 
         Mockito
             .when(this.cloudFormation.describeStackInstance(this.describeRequest.capture()))
@@ -227,7 +227,7 @@ public void deployStackInstanceUpdate()
     {
         StackInstance stackInstance = new StackInstance();
 
-        StackSetInstanceManager manager = new StackSetInstanceManager(this.cloudFormation);
+        StackSetInstanceManager manager = this.createStackSetInstanceManager();
 
         Mockito
             .when(this.cloudFormation.describeStackInstance(this.describeRequest.capture()))
@@ -349,7 +349,7 @@ public void deployStackInstanceUpdate()
     @Test
     public void deployStackInstanceFailed()
     {
-        StackSetInstanceManager manager = new StackSetInstanceManager(this.cloudFormation);
+        StackSetInstanceManager manager = this.createStackSetInstanceManager();
 
         Mockito
             .when(this.cloudFormation.describeStackInstance(Mockito.any(DescribeStackInstanceRequest.class)))
@@ -380,10 +380,52 @@ public void deployStackInstanceFailed()
         );
     }
 
+    @Test
+    public void deployStackSetInstanceNullParameters()
+    {
+        StackInstance stackInstance = new StackInstance();
+
+        StackSetInstanceManager manager = this.createStackSetInstanceManager();
+
+        Mockito
+            .when(this.cloudFormation.describeStackInstance(this.describeRequest.capture()))
+            .thenThrow(StackInstanceNotFoundException.class)
+            .thenReturn(
+                new DescribeStackInstanceResult()
+                    .withStackInstance(stackInstance)
+            );
+        Mockito
+            .when(this.cloudFormation.createStackInstances(this.createRequest.capture()))
+            .thenReturn(
+                new CreateStackInstancesResult()
+                    .withOperationId(StackSetInstanceManagerTest.OPERATION_ID)
+            );
+        Mockito
+            .when(this.cloudFormation.describeStackSetOperation(this.describeOperationRequest.capture()))
+            .thenReturn(
+                new DescribeStackSetOperationResult()
+                    .withStackSetOperation(
+                        new StackSetOperation()
+                            .withStatus(StackSetOperationStatus.SUCCEEDED)
+                    )
+            );
+
+        StackInstanceRequest input = StackSetInstanceManagerTest.createStackInstanceRequest();
+        input.setParameterOverrides(null);
+
+        manager.deployStackInstance(input, null);
+
+        CreateStackInstancesRequest request = this.createRequest.getValue();
+        Assertions.assertTrue(
+            request.getParameterOverrides().isEmpty(),
+            "StackSetInstanceManager.deployStackInstance() should set empty mapping if no parameters were given."
+        );
+    }
+
     @Test
     public void deleteStackInstance()
     {
-        StackSetInstanceManager manager = new StackSetInstanceManager(this.cloudFormation);
+        StackSetInstanceManager manager = this.createStackSetInstanceManager();
 
         manager.deleteStackInstance(null, StackSetInstanceManagerTest.PHYSICAL_ID);
 
@@ -415,4 +457,11 @@ private static StackInstanceRequest createStackInstanceRequest()
         request.setParameterOverrides(StackSetInstanceManagerTest.PARAMETERS);
         return request;
     }
+
+    private StackSetInstanceManager createStackSetInstanceManager()
+    {
+        StackSetInstanceManager manager = new StackSetInstanceManager(this.cloudFormation);
+        manager.setSleepInterval(1);
+        return manager;
+    }
 }

lambda-cform/lambda-cform-stackset/src/main/java/pl/wrzasq/lambda/cform/stackset/service/StackSetManager.java

@@ -8,7 +8,9 @@
 package pl.wrzasq.lambda.cform.stackset.service;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import com.amazonaws.services.cloudformation.AmazonCloudFormation;
@@ -202,7 +204,10 @@ private void updateStackSet(StackSetRequest input)
      */
     private static Collection<Parameter> buildSdkParameters(StackSetRequest input)
     {
-        return input.getParameters().entrySet().stream()
+        return Optional.ofNullable(input.getParameters())
+            .orElse(Collections.emptyMap())
+            .entrySet()
+            .stream()
             .map(
                 (Map.Entry<String, String> entry) ->
                     new Parameter()
@@ -220,7 +225,10 @@ private static Collection<Parameter> buildSdkParameters(StackSetRequest input)
      */
     private static Collection<Tag> buildSdkTags(StackSetRequest input)
     {
-        return input.getTags().entrySet().stream()
+        return Optional.ofNullable(input.getTags())
+            .orElse(Collections.emptyMap())
+            .entrySet()
+            .stream()
             .map(
                 (Map.Entry<String, String> entry) ->
                     new Tag()

lambda-cform/lambda-cform-stackset/src/test/java/test/pl/wrzasq/lambda/cform/stackset/service/StackSetManagerTest.java

@@ -360,6 +360,38 @@ public void deployStackSetNotExists()
         );
     }
 
+    @Test
+    public void deployStackSetNullParameters()
+    {
+        StackSetManager manager = new StackSetManager(this.cloudFormation);
+
+        Mockito
+            .when(this.cloudFormation.describeStackSet(this.describeRequest.capture()))
+            .thenThrow(StackSetNotFoundException.class);
+        Mockito
+            .when(this.cloudFormation.createStackSet(this.createRequest.capture()))
+            .thenReturn(
+                new CreateStackSetResult()
+                    .withStackSetId(StackSetManagerTest.STACK_SET_ID_1)
+            );
+
+        StackSetRequest input = StackSetManagerTest.createStackSetRequest();
+        input.setParameters(null);
+        input.setTags(null);
+
+        manager.deployStackSet(input, null);
+
+        CreateStackSetRequest request = this.createRequest.getValue();
+        Assertions.assertTrue(
+            request.getParameters().isEmpty(),
+            "StackSetManager.deployStackSet() should set empty mapping if no parameters were given."
+        );
+        Assertions.assertTrue(
+            request.getTags().isEmpty(),
+            "StackSetManager.deployStackSet() should set empty mapping no tags were given."
+        );
+    }
+
     @Test
     public void deleteStackSet()
     {