Skip to content

Commit f522796

Browse files
sktansktan
authored
feat(codebuild): support for Docker Registry Image for Linux Arm (#26121)
Added support for usage of docker registry images when configuring CodeBuild Linux with ARM images Closes #24367 and closes #24342 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent bc3d6a7 commit f522796

11 files changed

+792
-1
lines changed

‎packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.docker-registry-arm.lit.js.snapshot/cdk.out

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"version":"32.0.0"}

‎packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.docker-registry-arm.lit.js.snapshot/codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.assets.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": "32.0.0",
3+
"files": {
4+
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
5+
"source": {
6+
"path": "codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.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-codebuild/test/integ.docker-registry-arm.lit.js.snapshot/codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.template.json

Lines changed: 36 additions & 0 deletions
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-codebuild/test/integ.docker-registry-arm.lit.js.snapshot/integ.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"version": "32.0.0",
3+
"testCases": {
4+
"codebuild-arm-docker-registry/DefaultTest": {
5+
"stacks": [
6+
"test-codebuild-arm-docker-registry"
7+
],
8+
"stackUpdateWorkflow": false,
9+
"assertionStack": "codebuild-arm-docker-registry/DefaultTest/DeployAssert",
10+
"assertionStackName": "codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0"
11+
}
12+
}
13+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.docker-registry-arm.lit.js.snapshot/manifest.json

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
{
2+
"version": "32.0.0",
3+
"artifacts": {
4+
"test-codebuild-arm-docker-registry.assets": {
5+
"type": "cdk:asset-manifest",
6+
"properties": {
7+
"file": "test-codebuild-arm-docker-registry.assets.json",
8+
"requiresBootstrapStackVersion": 6,
9+
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
10+
}
11+
},
12+
"test-codebuild-arm-docker-registry": {
13+
"type": "aws:cloudformation:stack",
14+
"environment": "aws://unknown-account/unknown-region",
15+
"properties": {
16+
"templateFile": "test-codebuild-arm-docker-registry.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}/b6f85acdb6fe284b01a4751f3c590a55e03668bb3d353a044b6d5c5e9e1ab9a6.json",
21+
"requiresBootstrapStackVersion": 6,
22+
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
23+
"additionalDependencies": [
24+
"test-codebuild-arm-docker-registry.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+
"test-codebuild-arm-docker-registry.assets"
34+
],
35+
"metadata": {
36+
"/test-codebuild-arm-docker-registry/MyProject/Role/Resource": [
37+
{
38+
"type": "aws:cdk:logicalId",
39+
"data": "MyProjectRole9BBE5233"
40+
}
41+
],
42+
"/test-codebuild-arm-docker-registry/MyProject/Role/DefaultPolicy/Resource": [
43+
{
44+
"type": "aws:cdk:logicalId",
45+
"data": "MyProjectRoleDefaultPolicyB19B7C29"
46+
}
47+
],
48+
"/test-codebuild-arm-docker-registry/MyProject/Resource": [
49+
{
50+
"type": "aws:cdk:logicalId",
51+
"data": "MyProject39F7B0AE"
52+
}
53+
],
54+
"/test-codebuild-arm-docker-registry/BootstrapVersion": [
55+
{
56+
"type": "aws:cdk:logicalId",
57+
"data": "BootstrapVersion"
58+
}
59+
],
60+
"/test-codebuild-arm-docker-registry/CheckBootstrapVersion": [
61+
{
62+
"type": "aws:cdk:logicalId",
63+
"data": "CheckBootstrapVersion"
64+
}
65+
]
66+
},
67+
"displayName": "test-codebuild-arm-docker-registry"
68+
},
69+
"codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.assets": {
70+
"type": "cdk:asset-manifest",
71+
"properties": {
72+
"file": "codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.assets.json",
73+
"requiresBootstrapStackVersion": 6,
74+
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
75+
}
76+
},
77+
"codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0": {
78+
"type": "aws:cloudformation:stack",
79+
"environment": "aws://unknown-account/unknown-region",
80+
"properties": {
81+
"templateFile": "codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.template.json",
82+
"validateOnSynth": false,
83+
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
84+
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
85+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
86+
"requiresBootstrapStackVersion": 6,
87+
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
88+
"additionalDependencies": [
89+
"codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.assets"
90+
],
91+
"lookupRole": {
92+
"arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
93+
"requiresBootstrapStackVersion": 8,
94+
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
95+
}
96+
},
97+
"dependencies": [
98+
"codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.assets"
99+
],
100+
"metadata": {
101+
"/codebuild-arm-docker-registry/DefaultTest/DeployAssert/BootstrapVersion": [
102+
{
103+
"type": "aws:cdk:logicalId",
104+
"data": "BootstrapVersion"
105+
}
106+
],
107+
"/codebuild-arm-docker-registry/DefaultTest/DeployAssert/CheckBootstrapVersion": [
108+
{
109+
"type": "aws:cdk:logicalId",
110+
"data": "CheckBootstrapVersion"
111+
}
112+
]
113+
},
114+
"displayName": "codebuild-arm-docker-registry/DefaultTest/DeployAssert"
115+
},
116+
"Tree": {
117+
"type": "cdk:tree",
118+
"properties": {
119+
"file": "tree.json"
120+
}
121+
}
122+
}
123+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.docker-registry-arm.lit.js.snapshot/test-codebuild-arm-docker-registry.assets.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": "32.0.0",
3+
"files": {
4+
"b6f85acdb6fe284b01a4751f3c590a55e03668bb3d353a044b6d5c5e9e1ab9a6": {
5+
"source": {
6+
"path": "test-codebuild-arm-docker-registry.template.json",
7+
"packaging": "file"
8+
},
9+
"destinations": {
10+
"current_account-current_region": {
11+
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12+
"objectKey": "b6f85acdb6fe284b01a4751f3c590a55e03668bb3d353a044b6d5c5e9e1ab9a6.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+
}

0 commit comments

Comments
 (0)