Skip to content

Commit 3e48083

Browse files
AWSAWS
AWS
authored and
AWS
committed
Release: v2.5.2
1 parent 8d79ba3 commit 3e48083

File tree

4 files changed

+72
-71
lines changed

4 files changed

+72
-71
lines changed

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v2.5.1
1+
v2.5.2

‎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.5.1'
15+
Description: '(SO0089) - customizations-for-aws-control-tower Solution. Version: v2.5.2'
1616

1717
Parameters:
1818
PipelineApprovalStage:
@@ -127,7 +127,7 @@ Mappings:
127127
SourceBucketName:
128128
Name: control-tower-cfct-assets-prod
129129
SourceKeyName:
130-
Name: customizations-for-aws-control-tower/v2.5.1/custom-control-tower-configuration.zip
130+
Name: customizations-for-aws-control-tower/v2.5.2/custom-control-tower-configuration.zip
131131
CustomControlTowerPipelineS3TriggerKey:
132132
Name: custom-control-tower-configuration.zip
133133
CustomControlTowerPipelineS3NonTriggerKey:
@@ -145,7 +145,7 @@ Mappings:
145145
SolutionID: 'SO0089'
146146
MetricsURL: 'https://metrics.awssolutionsbuilder.com/generic'
147147
Data:
148-
AddonTemplate: 'https://s3.amazonaws.com/control-tower-cfct-assets-prod/customizations-for-aws-control-tower/v2.5.1/custom-control-tower-initiation.template'
148+
AddonTemplate: 'https://s3.amazonaws.com/control-tower-cfct-assets-prod/customizations-for-aws-control-tower/v2.5.2/custom-control-tower-initiation.template'
149149
AWSControlTower:
150150
ExecutionRole:
151151
Name: "AWSControlTowerExecution"
@@ -292,7 +292,7 @@ Resources:
292292
Code:
293293
S3:
294294
Bucket: control-tower-cfct-assets-prod
295-
Key: !Sub customizations-for-aws-control-tower/v2.5.1/custom-control-tower-configuration-${AWS::Region}.zip
295+
Key: !Sub customizations-for-aws-control-tower/v2.5.2/custom-control-tower-configuration-${AWS::Region}.zip
296296

297297
# SSM Parameter to store the git repository name
298298
CustomControlTowerRepoNameParameter:
@@ -551,7 +551,7 @@ Resources:
551551
- {KMSKeyName: !FindInMap [KMS, Alias, Name]}
552552
Source:
553553
Type: CODEPIPELINE
554-
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 --frontend noninteractive\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.5.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"
554+
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 --frontend noninteractive\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.5.2/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"
555555
Environment:
556556
ComputeType: BUILD_GENERAL1_SMALL
557557
Image: "aws/codebuild/standard:5.0"
@@ -570,13 +570,13 @@ Resources:
570570
- Name: LOG_LEVEL
571571
Value: !FindInMap [LambdaFunction, Logging, Level]
572572
- Name: WAIT_TIME
573-
Value: "30"
573+
Value: "15"
574574
- Name: KMS_KEY_ALIAS_NAME
575575
Value: !FindInMap [KMS, Alias, Name]
576576
- Name: SOLUTION_ID
577577
Value: !FindInMap [ Solution, Metrics, SolutionID ]
578578
- Name: SOLUTION_VERSION
579-
Value: v2.5.1
579+
Value: v2.5.2
580580
Artifacts:
581581
Name: !Sub ${CustomControlTowerPipelineArtifactS3Bucket}-Built
582582
Type: CODEPIPELINE
@@ -679,7 +679,7 @@ Resources:
679679
- {KMSKeyName: !FindInMap [KMS, Alias, Name]}
680680
Source:
681681
Type: CODEPIPELINE
682-
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.5.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"
682+
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.5.2/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"
683683
Environment:
684684
ComputeType: BUILD_GENERAL1_SMALL
685685
Image: "aws/codebuild/standard:5.0"
@@ -690,7 +690,7 @@ Resources:
690690
- Name: LOG_LEVEL
691691
Value: !FindInMap [LambdaFunction, Logging, Level]
692692
- Name: WAIT_TIME
693-
Value: "30"
693+
Value: "15"
694694
- Name: STAGE_NAME
695695
Value: "scp"
696696
- Name: ARTIFACT_BUCKET
@@ -700,7 +700,7 @@ Resources:
700700
- Name: SOLUTION_ID
701701
Value: !FindInMap [ Solution, Metrics, SolutionID ]
702702
- Name: SOLUTION_VERSION
703-
Value: v2.5.1
703+
Value: v2.5.2
704704
Artifacts:
705705
Name: !Sub ${CustomControlTowerPipelineArtifactS3Bucket}-Built
706706
Type: CODEPIPELINE
@@ -855,7 +855,7 @@ Resources:
855855
- {KMSKeyName: !FindInMap [KMS, Alias, Name]}
856856
Source:
857857
Type: CODEPIPELINE
858-
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.5.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"
858+
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.5.2/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"
859859
Environment:
860860
ComputeType: BUILD_GENERAL1_SMALL
861861
Image: "aws/codebuild/standard:5.0"
@@ -866,7 +866,7 @@ Resources:
866866
- Name: LOG_LEVEL
867867
Value: !FindInMap [LambdaFunction, Logging, Level]
868868
- Name: WAIT_TIME
869-
Value: "30"
869+
Value: "15"
870870
- Name: STAGE_NAME
871871
Value: "stackset"
872872
- Name: ARTIFACT_BUCKET
@@ -880,7 +880,7 @@ Resources:
880880
- Name: SOLUTION_ID
881881
Value: !FindInMap [Solution, Metrics, SolutionID]
882882
- Name: SOLUTION_VERSION
883-
Value: v2.5.1
883+
Value: v2.5.2
884884
- Name: METRICS_URL
885885
Value: !FindInMap [Solution, Metrics, MetricsURL]
886886
- Name: CONTROL_TOWER_BASELINE_CONFIG_STACKSET
@@ -1003,10 +1003,10 @@ Resources:
10031003
Variables:
10041004
LOG_LEVEL: !FindInMap [LambdaFunction, Logging, Level]
10051005
SOLUTION_ID: !FindInMap [Solution, Metrics, SolutionID]
1006-
SOLUTION_VERSION: v2.5.1
1006+
SOLUTION_VERSION: v2.5.2
10071007
Code:
10081008
S3Bucket: !Sub "control-tower-cfct-assets-prod-${AWS::Region}"
1009-
S3Key: customizations-for-aws-control-tower/v2.5.1/custom-control-tower-config-deployer.zip
1009+
S3Key: customizations-for-aws-control-tower/v2.5.2/custom-control-tower-config-deployer.zip
10101010
FunctionName: CustomControlTowerDeploymentLambda
10111011
Description: Custom Control Tower Deployment Lambda
10121012
Handler: config_deployer.lambda_handler
@@ -1273,14 +1273,14 @@ Resources:
12731273
ADMINISTRATION_ROLE_ARN: !Sub arn:${AWS::Partition}:iam::${AWS::AccountId}:role/service-role/AWSControlTowerStackSetRole
12741274
EXECUTION_ROLE_NAME: !FindInMap [AWSControlTower, ExecutionRole, Name]
12751275
SOLUTION_ID: !FindInMap [Solution, Metrics, SolutionID]
1276-
SOLUTION_VERSION: v2.5.1
1276+
SOLUTION_VERSION: v2.5.2
12771277
METRICS_URL: !FindInMap [Solution, Metrics, MetricsURL]
12781278
MAX_CONCURRENT_PERCENT: !Ref MaxConcurrentPercentage
12791279
FAILED_TOLERANCE_PERCENT: !Ref FailureTolerancePercentage
12801280
REGION_CONCURRENCY_TYPE: !Ref RegionConcurrencyType
12811281
Code:
12821282
S3Bucket: !Sub "control-tower-cfct-assets-prod-${AWS::Region}"
1283-
S3Key: customizations-for-aws-control-tower/v2.5.1/custom-control-tower-state-machine.zip
1283+
S3Key: customizations-for-aws-control-tower/v2.5.2/custom-control-tower-state-machine.zip
12841284
FunctionName: CustomControlTowerStateMachineLambda
12851285
Description: Custom Control Tower State Machine Handler
12861286
Handler: state_machine_router.lambda_handler
@@ -2888,10 +2888,10 @@ Resources:
28882888
LOG_LEVEL: !FindInMap [LambdaFunction, Logging, Level]
28892889
CODE_PIPELINE_NAME: !Ref CustomControlTowerCodePipeline
28902890
SOLUTION_ID: !FindInMap [ Solution, Metrics, SolutionID ]
2891-
SOLUTION_VERSION: v2.5.1
2891+
SOLUTION_VERSION: v2.5.2
28922892
Code:
28932893
S3Bucket: !Sub "control-tower-cfct-assets-prod-${AWS::Region}"
2894-
S3Key: customizations-for-aws-control-tower/v2.5.1/custom-control-tower-lifecycle-event-handler.zip
2894+
S3Key: customizations-for-aws-control-tower/v2.5.2/custom-control-tower-lifecycle-event-handler.zip
28952895
Description: Custom Control Tower Lifecyle event Lambda to handle lifecycle events
28962896
Handler: lifecycle_event_handler.lambda_handler
28972897
MemorySize: 512
@@ -3062,6 +3062,6 @@ Outputs:
30623062
Value: !Ref CustomControlTowerPipelineS3Bucket
30633063
CustomControlTowerSolutionVersion:
30643064
Description: Version Number
3065-
Value: "v2.5.1"
3065+
Value: "v2.5.2"
30663066
Export:
30673067
Name: Custom-Control-Tower-Version

‎deployment/custom-control-tower-initiation.template‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ Resources:
570570
- Name: LOG_LEVEL
571571
Value: !FindInMap [LambdaFunction, Logging, Level]
572572
- Name: WAIT_TIME
573-
Value: "30"
573+
Value: "15"
574574
- Name: KMS_KEY_ALIAS_NAME
575575
Value: !FindInMap [KMS, Alias, Name]
576576
- Name: SOLUTION_ID
@@ -690,7 +690,7 @@ Resources:
690690
- Name: LOG_LEVEL
691691
Value: !FindInMap [LambdaFunction, Logging, Level]
692692
- Name: WAIT_TIME
693-
Value: "30"
693+
Value: "15"
694694
- Name: STAGE_NAME
695695
Value: "scp"
696696
- Name: ARTIFACT_BUCKET
@@ -866,7 +866,7 @@ Resources:
866866
- Name: LOG_LEVEL
867867
Value: !FindInMap [LambdaFunction, Logging, Level]
868868
- Name: WAIT_TIME
869-
Value: "30"
869+
Value: "15"
870870
- Name: STAGE_NAME
871871
Value: "stackset"
872872
- Name: ARTIFACT_BUCKET

0 commit comments

Comments
 (0)