Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve ADF version references in main template #351

Merged
merged 3 commits into from
Apr 14, 2021
Merged

Improve ADF version references in main template #351

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb1f120
Improve ADF version references in main template
sbkok Apr 12, 2021
b32f19f
Merge branch 'master' into improvement/adf-version-references
sbkok Apr 14, 2021
e3e7a0c
Use version metadata on new Version parameter too
sbkok Apr 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions src/template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ Metadata:
HomePageUrl: https://github.com/awslabs/aws-deployment-framework
SemanticVersion: 3.1.2
SourceCodeUrl: https://github.com/awslabs/aws-deployment-framework
Mappings:
Metadata:
ADF:
Version: 3.1.2
Parameters:
CrossAccountAccessRoleName:
Type: String
Expand Down Expand Up @@ -193,7 +197,7 @@ Resources:
TERMINATION_PROTECTION: false
MASTER_ACCOUNT_ID: !Ref AWS::AccountId
ORGANIZATION_ID: !GetAtt Organization.OrganizationId
ADF_VERSION: 3.1.2
ADF_VERSION: !FindInMap ['Metadata', 'ADF', 'Version']
ADF_LOG_LEVEL: INFO
FunctionName: StackWaiter
Role: !GetAtt LambdaRole.Arn
Expand All @@ -214,7 +218,7 @@ Resources:
DEPLOYMENT_ACCOUNT_BUCKET: !GetAtt SharedModulesBucketName.Value
MASTER_ACCOUNT_ID: !Ref AWS::AccountId
ORGANIZATION_ID: !GetAtt Organization.OrganizationId
ADF_VERSION: 3.1.2
ADF_VERSION: !FindInMap ['Metadata', 'ADF', 'Version']
ADF_LOG_LEVEL: INFO
FunctionName: DetermineEventFunction
Role: !GetAtt LambdaRole.Arn
Expand All @@ -235,7 +239,7 @@ Resources:
DEPLOYMENT_ACCOUNT_BUCKET: !GetAtt SharedModulesBucketName.Value
MASTER_ACCOUNT_ID: !Ref AWS::AccountId
ORGANIZATION_ID: !GetAtt Organization.OrganizationId
ADF_VERSION: 3.1.2
ADF_VERSION: !FindInMap ['Metadata', 'ADF', 'Version']
ADF_LOG_LEVEL: INFO
FunctionName: CrossAccountExecuteFunction
Role: !GetAtt LambdaRole.Arn
Expand All @@ -254,7 +258,7 @@ Resources:
S3_BUCKET_NAME: !Ref BootstrapTemplatesBucket
TERMINATION_PROTECTION: false
MASTER_ACCOUNT_ID: !Ref AWS::AccountId
ADF_VERSION: 3.1.2
ADF_VERSION: !FindInMap ['Metadata', 'ADF', 'Version']
ADF_LOG_LEVEL: INFO
FunctionName: RoleStackDeploymentFunction
Role: !GetAtt LambdaRole.Arn
Expand All @@ -273,7 +277,7 @@ Resources:
S3_BUCKET_NAME: !Ref BootstrapTemplatesBucket
TERMINATION_PROTECTION: false
MASTER_ACCOUNT_ID: !Ref AWS::AccountId
ADF_VERSION: 3.1.2
ADF_VERSION: !FindInMap ['Metadata', 'ADF', 'Version']
ADF_LOG_LEVEL: INFO
FunctionName: MovedToRootActionFunction
Role: !GetAtt LambdaRole.Arn
Expand All @@ -292,7 +296,7 @@ Resources:
S3_BUCKET_NAME: !Ref BootstrapTemplatesBucket
TERMINATION_PROTECTION: false
MASTER_ACCOUNT_ID: !Ref AWS::AccountId
ADF_VERSION: 3.1.2
ADF_VERSION: !FindInMap ['Metadata', 'ADF', 'Version']
ADF_LOG_LEVEL: INFO
FunctionName: UpdateResourcePoliciesFunction
Role: !GetAtt LambdaRole.Arn
Expand Down Expand Up @@ -472,7 +476,7 @@ Resources:
Image: "aws/codebuild/standard:5.0"
EnvironmentVariables:
- Name: ADF_VERSION
Value: 3.1.2
Value: !FindInMap ['Metadata', 'ADF', 'Version']
- Name: TERMINATION_PROTECTION
Value: false
- Name: PYTHONPATH
Expand Down Expand Up @@ -736,7 +740,7 @@ Resources:
Type: Custom::InitialCommit
Properties:
ServiceToken: !GetAtt InitialCommitHandler.Arn
Version: 3.1.2
Version: !FindInMap ['Metadata', 'ADF', 'Version']
RepositoryArn: !GetAtt CodeCommitRepository.Arn
DirectoryName: bootstrap_repository
ExistingAccountId: !Ref DeploymentAccountId
Expand Down Expand Up @@ -775,7 +779,7 @@ Resources:
ServiceToken: !GetAtt CrossRegionBucketHandler.Arn
Region: !Ref DeploymentAccountMainRegion
BucketNamePrefix: !Sub "adf-shared-modules-${DeploymentAccountMainRegion}"
Version: 3.1.2
Version: !FindInMap ['Metadata', 'ADF', 'Version']
PolicyDocument:
Statement:
- Action:
Expand Down Expand Up @@ -959,7 +963,7 @@ Resources:
Id: adf-codepipeline-trigger-bootstrap
Outputs:
ADFVersionNumber:
Value: 3.1.2
Value: !FindInMap ['Metadata', 'ADF', 'Version']
Export:
Name: "ADFVersionNumber"
LayerArn:
Expand Down