Skip to content

Commit 5b2d89b

Browse files
AWSAWS
AWS
authored and
AWS
committed
Release: 2.3.1
1 parent 08f76ab commit 5b2d89b

File tree

3 files changed

+29
-32
lines changed

3 files changed

+29
-32
lines changed

‎customizations-for-aws-control-tower.template

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# permissions and limitations under the License.
1313

1414
AWSTemplateFormatVersion: '2010-09-09'
15-
Description: '(SO0089) - customizations-for-aws-control-tower Solution. Version: v2.3.0'
15+
Description: '(SO0089) - customizations-for-aws-control-tower Solution. Version: v2.3.1'
1616

1717
Parameters:
1818
PipelineApprovalStage:
@@ -119,7 +119,7 @@ Mappings:
119119
SourceBucketName:
120120
Name: control-tower-cfct-assets-prod
121121
SourceKeyName:
122-
Name: customizations-for-aws-control-tower/v2.3.0/custom-control-tower-configuration.zip
122+
Name: customizations-for-aws-control-tower/v2.3.1/custom-control-tower-configuration.zip
123123
CustomControlTowerPipelineS3TriggerKey:
124124
Name: custom-control-tower-configuration.zip
125125
CustomControlTowerPipelineS3NonTriggerKey:
@@ -137,7 +137,7 @@ Mappings:
137137
SolutionID: 'SO0089'
138138
MetricsURL: 'https://metrics.awssolutionsbuilder.com/generic'
139139
Data:
140-
AddonTemplate: 'https://s3.amazonaws.com/control-tower-cfct-assets-prod/customizations-for-aws-control-tower/v2.3.0/custom-control-tower-initiation.template'
140+
AddonTemplate: 'https://s3.amazonaws.com/control-tower-cfct-assets-prod/customizations-for-aws-control-tower/v2.3.1/custom-control-tower-initiation.template'
141141
AWSControlTower:
142142
ExecutionRole:
143143
Name: "AWSControlTowerExecution"
@@ -284,7 +284,7 @@ Resources:
284284
Code:
285285
S3:
286286
Bucket: control-tower-cfct-assets-prod
287-
Key: !Sub customizations-for-aws-control-tower/v2.3.0/custom-control-tower-configuration-${AWS::Region}.zip
287+
Key: !Sub customizations-for-aws-control-tower/v2.3.1/custom-control-tower-configuration-${AWS::Region}.zip
288288

289289
# SSM Parameter to store the git repository name
290290
CustomControlTowerRepoNameParameter:
@@ -543,10 +543,10 @@ Resources:
543543
- {KMSKeyName: !FindInMap [KMS, Alias, Name]}
544544
Source:
545545
Type: CODEPIPELINE
546-
BuildSpec: "version: 0.2\nphases:\n install:\n runtime-versions:\n python: 3.8\n ruby: 2.6\n commands:\n - export current=$(pwd)\n - if [ -f manifest.yaml ];then export current=$(pwd);else if [ -f custom-control-tower-configuration/manifest.yaml ]; then export current=$(pwd)/custom-control-tower-configuration; else echo 'manifest.yaml does not exist at the root level of custom-control-tower-configuration.zip or inside custom-control-tower-configuration folder, please check the ZIP file'; exit 1; fi; fi;\n # https://github.com/aws-solutions/aws-control-tower-customizations/issues/102\n - apt-mark hold java-1.8.0-amazon-corretto-jdk\n - apt-get -q update 1> /dev/null && apt-get -q upgrade -y 1> /dev/null\n - apt-get -q install zip wget python-pip libyaml-dev -y 1>/dev/null\n - export LC_ALL='en_US.UTF-8'\n - locale-gen en_US en_US.UTF-8\n - dpkg-reconfigure locales\n pre_build:\n commands:\n - cd $current\n - echo 'Download CustomControlTower Scripts'\n - aws s3 cp --quiet s3://control-tower-cfct-assets-prod/customizations-for-aws-control-tower/v2.3.0/custom-control-tower-scripts.zip $current\n - unzip -q -o $current/custom-control-tower-scripts.zip -d $current\n - cp codebuild_scripts/* .\n - bash install_stage_dependencies.sh $STAGE_NAME\n build:\n commands:\n - echo 'Starting build $(date) in $(pwd)'\n - echo 'bash execute_stage_scripts.sh $STAGE_NAME $LOG_LEVEL $WAIT_TIME $SM_ARN $ARTIFACT_BUCKET $KMS_KEY_ALIAS_NAME $BOOL_VALUES $NONE_TYPE_VALUES'\n - bash execute_stage_scripts.sh $STAGE_NAME $LOG_LEVEL $WAIT_TIME $SM_ARN $ARTIFACT_BUCKET $KMS_KEY_ALIAS_NAME $BOOL_VALUES $NONE_TYPE_VALUES \n - echo 'Running build scripts completed $(date)'\n post_build:\n commands:\n - echo 'Starting post build $(date) in $(pwd)'\n - echo 'build completed on $(date)'\n\nartifacts:\n files:\n - '**/*'\n\n"
546+
BuildSpec: "version: 0.2\nphases:\n install:\n runtime-versions:\n python: 3.8\n ruby: 2.6\n commands:\n - export current=$(pwd)\n - if [ -f manifest.yaml ];then export current=$(pwd);else if [ -f custom-control-tower-configuration/manifest.yaml ]; then export current=$(pwd)/custom-control-tower-configuration; else echo 'manifest.yaml does not exist at the root level of custom-control-tower-configuration.zip or inside custom-control-tower-configuration folder, please check the ZIP file'; exit 1; fi; fi;\n - apt-get -q update 1> /dev/null\n - apt-get -q install zip wget python3-pip libyaml-dev -y 1>/dev/null\n - export LC_ALL='en_US.UTF-8'\n - locale-gen en_US en_US.UTF-8\n - dpkg-reconfigure locales\n pre_build:\n commands:\n - cd $current\n - echo 'Download CustomControlTower Scripts'\n - aws s3 cp --quiet s3://control-tower-cfct-assets-prod/customizations-for-aws-control-tower/v2.3.1/custom-control-tower-scripts.zip $current\n - unzip -q -o $current/custom-control-tower-scripts.zip -d $current\n - cp codebuild_scripts/* .\n - bash install_stage_dependencies.sh $STAGE_NAME\n build:\n commands:\n - echo 'Starting build $(date) in $(pwd)'\n - echo 'bash execute_stage_scripts.sh $STAGE_NAME $LOG_LEVEL $WAIT_TIME $SM_ARN $ARTIFACT_BUCKET $KMS_KEY_ALIAS_NAME $BOOL_VALUES $NONE_TYPE_VALUES'\n - bash execute_stage_scripts.sh $STAGE_NAME $LOG_LEVEL $WAIT_TIME $SM_ARN $ARTIFACT_BUCKET $KMS_KEY_ALIAS_NAME $BOOL_VALUES $NONE_TYPE_VALUES \n - echo 'Running build scripts completed $(date)'\n post_build:\n commands:\n - echo 'Starting post build $(date) in $(pwd)'\n - echo 'build completed on $(date)'\n\nartifacts:\n files:\n - '**/*'\n\n"
547547
Environment:
548548
ComputeType: BUILD_GENERAL1_SMALL
549-
Image: "aws/codebuild/standard:4.0"
549+
Image: "aws/codebuild/standard:5.0"
550550
Type: LINUX_CONTAINER
551551
EnvironmentVariables:
552552
- Name: ARTIFACT_BUCKET
@@ -568,7 +568,7 @@ Resources:
568568
- Name: SOLUTION_ID
569569
Value: !FindInMap [ Solution, Metrics, SolutionID ]
570570
- Name: SOLUTION_VERSION
571-
Value: v2.3.0
571+
Value: v2.3.1
572572
Artifacts:
573573
Name: !Sub ${CustomControlTowerPipelineArtifactS3Bucket}-Built
574574
Type: CODEPIPELINE
@@ -671,10 +671,10 @@ Resources:
671671
- {KMSKeyName: !FindInMap [KMS, Alias, Name]}
672672
Source:
673673
Type: CODEPIPELINE
674-
BuildSpec: "version: 0.2\nphases:\n install:\n runtime-versions:\n python: 3.8\n ruby: 2.6\n commands:\n - export current=$(pwd)\n - if [ -f manifest.yaml ];then export current=$(pwd);else if [ -f custom-control-tower-configuration/manifest.yaml ]; then export current=$(pwd)/custom-control-tower-configuration; else echo 'manifest.yaml does not exist at the root level of custom-control-tower-configuration.zip or inside custom-control-tower-configuration folder, please check the ZIP file'; exit 1; fi; fi;\n # https://github.com/aws-solutions/aws-control-tower-customizations/issues/102\n - apt-mark hold java-1.8.0-amazon-corretto-jdk\n - apt-get -q update 1> /dev/null && apt-get -q upgrade -y 1> /dev/null\n - apt-get -q install zip wget python-pip libyaml-dev -y 1> /dev/null \n pre_build:\n commands:\n - cd $current\n - echo 'Download CustomControlTower Scripts'\n - aws s3 cp --quiet s3://control-tower-cfct-assets-prod/customizations-for-aws-control-tower/v2.3.0/custom-control-tower-scripts.zip $current\n - unzip -q -o $current/custom-control-tower-scripts.zip -d $current\n - cp codebuild_scripts/* .\n - bash install_stage_dependencies.sh $STAGE_NAME\n build:\n commands:\n - echo 'Starting build $(date) in $(pwd)'\n - echo 'bash execute_stage_scripts.sh $STAGE_NAME $LOG_LEVEL $WAIT_TIME $SM_ARN $ARTIFACT_BUCKET $KMS_KEY_ALIAS_NAME $BOOL_VALUES $NONE_TYPE_VALUES'\n - bash execute_stage_scripts.sh $STAGE_NAME $LOG_LEVEL $WAIT_TIME $SM_ARN $ARTIFACT_BUCKET $KMS_KEY_ALIAS_NAME $BOOL_VALUES $NONE_TYPE_VALUES\n - echo 'Running build scripts completed $(date)'\n post_build:\n commands:\n - echo 'Starting post build $(date) in $(pwd)'\n - echo 'build completed on $(date)'\n\nartifacts:\n files:\n - '**/*'\n"
674+
BuildSpec: "version: 0.2\nphases:\n install:\n runtime-versions:\n python: 3.8\n ruby: 2.6\n commands:\n - export current=$(pwd)\n - if [ -f manifest.yaml ];then export current=$(pwd);else if [ -f custom-control-tower-configuration/manifest.yaml ]; then export current=$(pwd)/custom-control-tower-configuration; else echo 'manifest.yaml does not exist at the root level of custom-control-tower-configuration.zip or inside custom-control-tower-configuration folder, please check the ZIP file'; exit 1; fi; fi;\n - apt-get -q update 1> /dev/null\n - apt-get -q install zip wget python3-pip libyaml-dev -y 1> /dev/null \n pre_build:\n commands:\n - cd $current\n - echo 'Download CustomControlTower Scripts'\n - aws s3 cp --quiet s3://control-tower-cfct-assets-prod/customizations-for-aws-control-tower/v2.3.1/custom-control-tower-scripts.zip $current\n - unzip -q -o $current/custom-control-tower-scripts.zip -d $current\n - cp codebuild_scripts/* .\n - bash install_stage_dependencies.sh $STAGE_NAME\n build:\n commands:\n - echo 'Starting build $(date) in $(pwd)'\n - echo 'bash execute_stage_scripts.sh $STAGE_NAME $LOG_LEVEL $WAIT_TIME $SM_ARN $ARTIFACT_BUCKET $KMS_KEY_ALIAS_NAME $BOOL_VALUES $NONE_TYPE_VALUES'\n - bash execute_stage_scripts.sh $STAGE_NAME $LOG_LEVEL $WAIT_TIME $SM_ARN $ARTIFACT_BUCKET $KMS_KEY_ALIAS_NAME $BOOL_VALUES $NONE_TYPE_VALUES\n - echo 'Running build scripts completed $(date)'\n post_build:\n commands:\n - echo 'Starting post build $(date) in $(pwd)'\n - echo 'build completed on $(date)'\n\nartifacts:\n files:\n - '**/*'\n"
675675
Environment:
676676
ComputeType: BUILD_GENERAL1_SMALL
677-
Image: "aws/codebuild/standard:4.0"
677+
Image: "aws/codebuild/standard:5.0"
678678
Type: LINUX_CONTAINER
679679
EnvironmentVariables:
680680
- Name: SM_ARN
@@ -692,7 +692,7 @@ Resources:
692692
- Name: SOLUTION_ID
693693
Value: !FindInMap [ Solution, Metrics, SolutionID ]
694694
- Name: SOLUTION_VERSION
695-
Value: v2.3.0
695+
Value: v2.3.1
696696
Artifacts:
697697
Name: !Sub ${CustomControlTowerPipelineArtifactS3Bucket}-Built
698698
Type: CODEPIPELINE
@@ -846,10 +846,10 @@ Resources:
846846
- {KMSKeyName: !FindInMap [KMS, Alias, Name]}
847847
Source:
848848
Type: CODEPIPELINE
849-
BuildSpec: "version: 0.2\nphases:\n install:\n runtime-versions:\n python: 3.8\n ruby: 2.6\n commands:\n - export current=$(pwd)\n - if [ -f manifest.yaml ];then export current=$(pwd);else if [ -f custom-control-tower-configuration/manifest.yaml ]; then export current=$(pwd)/custom-control-tower-configuration; else echo 'manifest.yaml does not exist at the root level of custom-control-tower-configuration.zip or inside custom-control-tower-configuration folder, please check the ZIP file'; exit 1; fi; fi;\n # https://github.com/aws-solutions/aws-control-tower-customizations/issues/102\n - apt-mark hold java-1.8.0-amazon-corretto-jdk\n - apt-get -q update 1> /dev/null && apt-get -q upgrade -y 1> /dev/null\n - apt-get -q install zip wget python-pip libyaml-dev -y 1> /dev/null\n pre_build:\n commands:\n - cd $current\n - echo 'Download CustomControlTower Scripts'\n - aws s3 cp --quiet s3://control-tower-cfct-assets-prod/customizations-for-aws-control-tower/v2.3.0/custom-control-tower-scripts.zip $current\n - unzip -q -o $current/custom-control-tower-scripts.zip -d $current\n - cp codebuild_scripts/* .\n - bash install_stage_dependencies.sh $STAGE_NAME\n build:\n commands:\n - echo 'Starting build $(date) in $(pwd)'\n - echo 'bash execute_stage_scripts.sh $STAGE_NAME $LOG_LEVEL $WAIT_TIME $SM_ARN $ARTIFACT_BUCKET $KMS_KEY_ALIAS_NAME $BOOL_VALUES $NONE_TYPE_VALUES'\n - bash execute_stage_scripts.sh $STAGE_NAME $LOG_LEVEL $WAIT_TIME $SM_ARN $ARTIFACT_BUCKET $KMS_KEY_ALIAS_NAME $BOOL_VALUES $NONE_TYPE_VALUES\n - echo 'Running build scripts completed $(date)'\n post_build:\n commands:\n - echo 'Starting post build $(date) in $(pwd)'\n - echo 'build completed on $(date)'\n\nartifacts:\n files:\n - '**/*'\n"
849+
BuildSpec: "version: 0.2\nphases:\n install:\n runtime-versions:\n python: 3.8\n ruby: 2.6\n commands:\n - export current=$(pwd)\n - if [ -f manifest.yaml ];then export current=$(pwd);else if [ -f custom-control-tower-configuration/manifest.yaml ]; then export current=$(pwd)/custom-control-tower-configuration; else echo 'manifest.yaml does not exist at the root level of custom-control-tower-configuration.zip or inside custom-control-tower-configuration folder, please check the ZIP file'; exit 1; fi; fi;\n - apt-get -q update 1> /dev/null\n - apt-get -q install zip wget python3-pip libyaml-dev -y 1> /dev/null\n pre_build:\n commands:\n - cd $current\n - echo 'Download CustomControlTower Scripts'\n - aws s3 cp --quiet s3://control-tower-cfct-assets-prod/customizations-for-aws-control-tower/v2.3.1/custom-control-tower-scripts.zip $current\n - unzip -q -o $current/custom-control-tower-scripts.zip -d $current\n - cp codebuild_scripts/* .\n - bash install_stage_dependencies.sh $STAGE_NAME\n build:\n commands:\n - echo 'Starting build $(date) in $(pwd)'\n - echo 'bash execute_stage_scripts.sh $STAGE_NAME $LOG_LEVEL $WAIT_TIME $SM_ARN $ARTIFACT_BUCKET $KMS_KEY_ALIAS_NAME $BOOL_VALUES $NONE_TYPE_VALUES'\n - bash execute_stage_scripts.sh $STAGE_NAME $LOG_LEVEL $WAIT_TIME $SM_ARN $ARTIFACT_BUCKET $KMS_KEY_ALIAS_NAME $BOOL_VALUES $NONE_TYPE_VALUES\n - echo 'Running build scripts completed $(date)'\n post_build:\n commands:\n - echo 'Starting post build $(date) in $(pwd)'\n - echo 'build completed on $(date)'\n\nartifacts:\n files:\n - '**/*'\n"
850850
Environment:
851851
ComputeType: BUILD_GENERAL1_SMALL
852-
Image: "aws/codebuild/standard:4.0"
852+
Image: "aws/codebuild/standard:5.0"
853853
Type: LINUX_CONTAINER
854854
EnvironmentVariables:
855855
- Name: SM_ARN
@@ -869,7 +869,7 @@ Resources:
869869
- Name: SOLUTION_ID
870870
Value: !FindInMap [Solution, Metrics, SolutionID]
871871
- Name: SOLUTION_VERSION
872-
Value: v2.3.0
872+
Value: v2.3.1
873873
- Name: METRICS_URL
874874
Value: !FindInMap [Solution, Metrics, MetricsURL]
875875
- Name: CONTROL_TOWER_BASELINE_CONFIG_STACKSET
@@ -992,10 +992,10 @@ Resources:
992992
Variables:
993993
LOG_LEVEL: !FindInMap [LambdaFunction, Logging, Level]
994994
SOLUTION_ID: !FindInMap [Solution, Metrics, SolutionID]
995-
SOLUTION_VERSION: v2.3.0
995+
SOLUTION_VERSION: v2.3.1
996996
Code:
997997
S3Bucket: !Sub "control-tower-cfct-assets-prod-${AWS::Region}"
998-
S3Key: customizations-for-aws-control-tower/v2.3.0/custom-control-tower-config-deployer.zip
998+
S3Key: customizations-for-aws-control-tower/v2.3.1/custom-control-tower-config-deployer.zip
999999
FunctionName: CustomControlTowerDeploymentLambda
10001000
Description: Custom Control Tower Deployment Lambda
10011001
Handler: config_deployer.lambda_handler
@@ -1262,14 +1262,14 @@ Resources:
12621262
ADMINISTRATION_ROLE_ARN: !Sub arn:${AWS::Partition}:iam::${AWS::AccountId}:role/service-role/AWSControlTowerStackSetRole
12631263
EXECUTION_ROLE_NAME: !FindInMap [AWSControlTower, ExecutionRole, Name]
12641264
SOLUTION_ID: !FindInMap [Solution, Metrics, SolutionID]
1265-
SOLUTION_VERSION: v2.3.0
1265+
SOLUTION_VERSION: v2.3.1
12661266
METRICS_URL: !FindInMap [Solution, Metrics, MetricsURL]
12671267
MAX_CONCURRENT_PERCENT: !Ref MaxConcurrentPercentage
12681268
FAILED_TOLERANCE_PERCENT: !Ref FailureTolerancePercentage
12691269
REGION_CONCURRENCY_TYPE: !Ref RegionConcurrencyType
12701270
Code:
12711271
S3Bucket: !Sub "control-tower-cfct-assets-prod-${AWS::Region}"
1272-
S3Key: customizations-for-aws-control-tower/v2.3.0/custom-control-tower-state-machine.zip
1272+
S3Key: customizations-for-aws-control-tower/v2.3.1/custom-control-tower-state-machine.zip
12731273
FunctionName: CustomControlTowerStateMachineLambda
12741274
Description: Custom Control Tower State Machine Handler
12751275
Handler: state_machine_router.lambda_handler
@@ -2877,10 +2877,10 @@ Resources:
28772877
LOG_LEVEL: !FindInMap [LambdaFunction, Logging, Level]
28782878
CODE_PIPELINE_NAME: !Ref CustomControlTowerCodePipeline
28792879
SOLUTION_ID: !FindInMap [ Solution, Metrics, SolutionID ]
2880-
SOLUTION_VERSION: v2.3.0
2880+
SOLUTION_VERSION: v2.3.1
28812881
Code:
28822882
S3Bucket: !Sub "control-tower-cfct-assets-prod-${AWS::Region}"
2883-
S3Key: customizations-for-aws-control-tower/v2.3.0/custom-control-tower-lifecycle-event-handler.zip
2883+
S3Key: customizations-for-aws-control-tower/v2.3.1/custom-control-tower-lifecycle-event-handler.zip
28842884
Description: Custom Control Tower Lifecyle event Lambda to handle lifecycle events
28852885
Handler: lifecycle_event_handler.lambda_handler
28862886
MemorySize: 512
@@ -3051,6 +3051,6 @@ Outputs:
30513051
Value: !Ref CustomControlTowerPipelineS3Bucket
30523052
CustomControlTowerSolutionVersion:
30533053
Description: Version Number
3054-
Value: "v2.3.0"
3054+
Value: "v2.3.1"
30553055
Export:
30563056
Name: Custom-Control-Tower-Version

0 commit comments

Comments
 (0)