Skip to content

Commit 1b18a19

Browse files
daschaadaschaa
authored
feat(kms): add required aliasname prefix to aliasnames with tokens (#25116)
Closes #25033. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent a2cd6c9 commit 1b18a19

File tree

11 files changed

+626
-5
lines changed

11 files changed

+626
-5
lines changed

‎packages/@aws-cdk-testing/framework-integ/test/aws-kms/test/integ.key-alias.js.snapshot/TestStack.assets.json

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": "31.0.0",
3+
"files": {
4+
"a9ca98b70cfab72ff09e4071d78a7a0da7ba609be2b17443a68bd1750fa18069": {
5+
"source": {
6+
"path": "TestStack.template.json",
7+
"packaging": "file"
8+
},
9+
"destinations": {
10+
"current_account-current_region": {
11+
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12+
"objectKey": "a9ca98b70cfab72ff09e4071d78a7a0da7ba609be2b17443a68bd1750fa18069.json",
13+
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
14+
}
15+
}
16+
}
17+
},
18+
"dockerImages": {}
19+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-kms/test/integ.key-alias.js.snapshot/TestStack.template.json

+95
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
{
2+
"Resources": {
3+
"keyFEDD6EC0": {
4+
"Type": "AWS::KMS::Key",
5+
"Properties": {
6+
"KeyPolicy": {
7+
"Statement": [
8+
{
9+
"Action": "kms:*",
10+
"Effect": "Allow",
11+
"Principal": {
12+
"AWS": {
13+
"Fn::Join": [
14+
"",
15+
[
16+
"arn:",
17+
{
18+
"Ref": "AWS::Partition"
19+
},
20+
":iam::",
21+
{
22+
"Ref": "AWS::AccountId"
23+
},
24+
":root"
25+
]
26+
]
27+
}
28+
},
29+
"Resource": "*"
30+
}
31+
],
32+
"Version": "2012-10-17"
33+
}
34+
},
35+
"UpdateReplacePolicy": "Retain",
36+
"DeletionPolicy": "Retain"
37+
},
38+
"keyAliasCEB16DF2": {
39+
"Type": "AWS::KMS::Alias",
40+
"Properties": {
41+
"AliasName": {
42+
"Fn::Join": [
43+
"",
44+
[
45+
"alias/MyKey",
46+
{
47+
"Ref": "AWS::AccountId"
48+
}
49+
]
50+
]
51+
},
52+
"TargetKeyId": {
53+
"Fn::GetAtt": [
54+
"keyFEDD6EC0",
55+
"Arn"
56+
]
57+
}
58+
}
59+
}
60+
},
61+
"Parameters": {
62+
"BootstrapVersion": {
63+
"Type": "AWS::SSM::Parameter::Value<String>",
64+
"Default": "/cdk-bootstrap/hnb659fds/version",
65+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
66+
}
67+
},
68+
"Rules": {
69+
"CheckBootstrapVersion": {
70+
"Assertions": [
71+
{
72+
"Assert": {
73+
"Fn::Not": [
74+
{
75+
"Fn::Contains": [
76+
[
77+
"1",
78+
"2",
79+
"3",
80+
"4",
81+
"5"
82+
],
83+
{
84+
"Ref": "BootstrapVersion"
85+
}
86+
]
87+
}
88+
]
89+
},
90+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
91+
}
92+
]
93+
}
94+
}
95+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-kms/test/integ.key-alias.js.snapshot/cdk.out

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"version":"31.0.0"}

‎packages/@aws-cdk-testing/framework-integ/test/aws-kms/test/integ.key-alias.js.snapshot/integ.json

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": "31.0.0",
3+
"testCases": {
4+
"kms-key-alias-tokenized/DefaultTest": {
5+
"stacks": [
6+
"TestStack"
7+
],
8+
"assertionStack": "kms-key-alias-tokenized/DefaultTest/DeployAssert",
9+
"assertionStackName": "kmskeyaliastokenizedDefaultTestDeployAssertB7F64730"
10+
}
11+
}
12+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-kms/test/integ.key-alias.js.snapshot/kmskeyaliastokenizedDefaultTestDeployAssertB7F64730.assets.json

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": "31.0.0",
3+
"files": {
4+
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
5+
"source": {
6+
"path": "kmskeyaliastokenizedDefaultTestDeployAssertB7F64730.template.json",
7+
"packaging": "file"
8+
},
9+
"destinations": {
10+
"current_account-current_region": {
11+
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12+
"objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
13+
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
14+
}
15+
}
16+
}
17+
},
18+
"dockerImages": {}
19+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-kms/test/integ.key-alias.js.snapshot/kmskeyaliastokenizedDefaultTestDeployAssertB7F64730.template.json

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"Parameters": {
3+
"BootstrapVersion": {
4+
"Type": "AWS::SSM::Parameter::Value<String>",
5+
"Default": "/cdk-bootstrap/hnb659fds/version",
6+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
7+
}
8+
},
9+
"Rules": {
10+
"CheckBootstrapVersion": {
11+
"Assertions": [
12+
{
13+
"Assert": {
14+
"Fn::Not": [
15+
{
16+
"Fn::Contains": [
17+
[
18+
"1",
19+
"2",
20+
"3",
21+
"4",
22+
"5"
23+
],
24+
{
25+
"Ref": "BootstrapVersion"
26+
}
27+
]
28+
}
29+
]
30+
},
31+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
32+
}
33+
]
34+
}
35+
}
36+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-kms/test/integ.key-alias.js.snapshot/manifest.json

+117
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
{
2+
"version": "31.0.0",
3+
"artifacts": {
4+
"TestStack.assets": {
5+
"type": "cdk:asset-manifest",
6+
"properties": {
7+
"file": "TestStack.assets.json",
8+
"requiresBootstrapStackVersion": 6,
9+
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
10+
}
11+
},
12+
"TestStack": {
13+
"type": "aws:cloudformation:stack",
14+
"environment": "aws://unknown-account/unknown-region",
15+
"properties": {
16+
"templateFile": "TestStack.template.json",
17+
"validateOnSynth": false,
18+
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
19+
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
20+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a9ca98b70cfab72ff09e4071d78a7a0da7ba609be2b17443a68bd1750fa18069.json",
21+
"requiresBootstrapStackVersion": 6,
22+
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
23+
"additionalDependencies": [
24+
"TestStack.assets"
25+
],
26+
"lookupRole": {
27+
"arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
28+
"requiresBootstrapStackVersion": 8,
29+
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
30+
}
31+
},
32+
"dependencies": [
33+
"TestStack.assets"
34+
],
35+
"metadata": {
36+
"/TestStack/key/Resource": [
37+
{
38+
"type": "aws:cdk:logicalId",
39+
"data": "keyFEDD6EC0"
40+
}
41+
],
42+
"/TestStack/key/Alias/Resource": [
43+
{
44+
"type": "aws:cdk:logicalId",
45+
"data": "keyAliasCEB16DF2"
46+
}
47+
],
48+
"/TestStack/BootstrapVersion": [
49+
{
50+
"type": "aws:cdk:logicalId",
51+
"data": "BootstrapVersion"
52+
}
53+
],
54+
"/TestStack/CheckBootstrapVersion": [
55+
{
56+
"type": "aws:cdk:logicalId",
57+
"data": "CheckBootstrapVersion"
58+
}
59+
]
60+
},
61+
"displayName": "TestStack"
62+
},
63+
"kmskeyaliastokenizedDefaultTestDeployAssertB7F64730.assets": {
64+
"type": "cdk:asset-manifest",
65+
"properties": {
66+
"file": "kmskeyaliastokenizedDefaultTestDeployAssertB7F64730.assets.json",
67+
"requiresBootstrapStackVersion": 6,
68+
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
69+
}
70+
},
71+
"kmskeyaliastokenizedDefaultTestDeployAssertB7F64730": {
72+
"type": "aws:cloudformation:stack",
73+
"environment": "aws://unknown-account/unknown-region",
74+
"properties": {
75+
"templateFile": "kmskeyaliastokenizedDefaultTestDeployAssertB7F64730.template.json",
76+
"validateOnSynth": false,
77+
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
78+
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
79+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
80+
"requiresBootstrapStackVersion": 6,
81+
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
82+
"additionalDependencies": [
83+
"kmskeyaliastokenizedDefaultTestDeployAssertB7F64730.assets"
84+
],
85+
"lookupRole": {
86+
"arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
87+
"requiresBootstrapStackVersion": 8,
88+
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
89+
}
90+
},
91+
"dependencies": [
92+
"kmskeyaliastokenizedDefaultTestDeployAssertB7F64730.assets"
93+
],
94+
"metadata": {
95+
"/kms-key-alias-tokenized/DefaultTest/DeployAssert/BootstrapVersion": [
96+
{
97+
"type": "aws:cdk:logicalId",
98+
"data": "BootstrapVersion"
99+
}
100+
],
101+
"/kms-key-alias-tokenized/DefaultTest/DeployAssert/CheckBootstrapVersion": [
102+
{
103+
"type": "aws:cdk:logicalId",
104+
"data": "CheckBootstrapVersion"
105+
}
106+
]
107+
},
108+
"displayName": "kms-key-alias-tokenized/DefaultTest/DeployAssert"
109+
},
110+
"Tree": {
111+
"type": "cdk:tree",
112+
"properties": {
113+
"file": "tree.json"
114+
}
115+
}
116+
}
117+
}

0 commit comments

Comments
 (0)