Version 1.2.1

Author: Joshua Leaverton

CHANGELOG.md

@@ -4,18 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.0.0] - 2020-01-10
-### Added
-- Initial public release
-
-## [1.1.0] - 2020-02-25
-### Known Issue Fix and Code Optimization
-- Fixed Stack Instance Deletion Issue: In case there are existing stack instances but
-none of those instances belongs to the accounts specified in the user manifest
-file as the input for the StackSet state machine, the deletion of the existing
-stack instances would fail. This issue is not applicable if at least one account
-in the input account list has an existing stack instance.
-- Code Optimization for Best Practice
+## [1.2.1] - 2020-10-01
+### Changed
+- Fix the issue related to incompatibility between latest version of BotoCore and AWS CLI. Ref:[Boto3 Issue #2596](https://github.com/boto/boto3/issues/2596)
 
 ## [1.2.0] - 2020-06-20
 ### Added
@@ -30,4 +21,17 @@ in the input account list has an existing stack instance.
 - Optimizes the CloudFormation resource stage to trigger step function execution only if there is difference between the configuration and deployed stack sets.
 - Fixes the issue in the build stage of the CodePipeline by updating manifest version to match the manifest schema.
 - Fixes the issue for comparing deployed stack set templates and parameters [#4](https://github.com/awslabs/aws-control-tower-customizations/issues/4)
-- Fixes the issue for updating the variables in the files using Jinja [#17](https://github.com/awslabs/aws-control-tower-customizations/issues/17)
+- Fixes the issue for updating the variables in the files using Jinja [#17](https://github.com/awslabs/aws-control-tower-customizations/issues/17)
+
+## [1.1.0] - 2020-02-25
+### Known Issue Fix and Code Optimization
+- Fixed Stack Instance Deletion Issue: In case there are existing stack instances but
+none of those instances belongs to the accounts specified in the user manifest
+file as the input for the StackSet state machine, the deletion of the existing
+stack instances would fail. This issue is not applicable if at least one account
+in the input account list has an existing stack instance.
+- Code Optimization for Best Practice
+
+## [1.0.0] - 2020-01-10
+### Added
+- Initial public release

deployment/custom-control-tower-initiation.template

@@ -996,7 +996,7 @@ Resources:
               Effect: "Allow"
               Principal:
                 AWS:
-                    - Fn::Sub: ${StateMachineLambdaRole.Arn}
+                    - Fn::Sub: ${CustomControlTowerStateMachineLambdaRole.Arn}
                     - Fn::Sub: ${CustomControlTowerDeploymentLambdaRole.Arn}
                     - Fn::Sub: ${CustomControlTowerCodePipelineRole.Arn}
                     - Fn::Sub: ${CustomControlTowerCodeBuildRole.Arn}
@@ -1018,7 +1018,7 @@ Resources:
             region: !Sub ${AWS::Region}
       ServiceToken: !GetAtt CustomControlTowerDeploymentLambda.Arn
 
-  StateMachineLambdaRole:
+  CustomControlTowerStateMachineLambdaRole:
     Type: AWS::IAM::Role
     Metadata:
       cfn_nag:
@@ -1030,7 +1030,7 @@ Resources:
           - id: W11
             reason: "Allow Resource * for KMS/SSM/Org/SC/CFN API. Key ID is generated by the service. Other resources are customer defined."
     Properties:
-      RoleName: StateMachineLambdaRole
+      RoleName: CustomControlTowerStateMachineLambdaRole
       AssumeRolePolicyDocument:
         Version: '2012-10-17'
         Statement:
@@ -1217,7 +1217,7 @@ Resources:
       Description: Custom Control Tower State Machine Handler
       Handler: state_machine_router.lambda_handler
       MemorySize: 1024
-      Role: !GetAtt 'StateMachineLambdaRole.Arn'
+      Role: !GetAtt 'CustomControlTowerStateMachineLambdaRole.Arn'
       Runtime: python3.8
       Timeout: 300
       TracingConfig:

source/bin/codebuild_scripts/install_stage_dependencies.sh

@@ -25,6 +25,7 @@ install_common_pip_packages () {
     pip install --upgrade yorm
     pip install --upgrade jinja2
     pip install --upgrade boto3
+    pip install --upgrade awscli
     pip install --upgrade requests
 }