Skip to content

Commit 992dedb

Browse files
author
AWS
committed
Amazon Elastic Container Registry Update: This release adds Amazon ECR to Amazon ECR pull through cache rules support.
1 parent 2c04edf commit 992dedb

File tree

2 files changed

+65
-9
lines changed

2 files changed

+65
-9
lines changed

‎.changes/next-release/feature-AmazonElasticContainerRegistry-3c6d22b.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"type": "feature",
3+
"category": "Amazon Elastic Container Registry",
4+
"contributor": "",
5+
"description": "This release adds Amazon ECR to Amazon ECR pull through cache rules support."
6+
}

‎services/ecr/src/main/resources/codegen-resources/service-2.json

Lines changed: 59 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1131,11 +1131,11 @@
11311131
"members":{
11321132
"ecrRepositoryPrefix":{
11331133
"shape":"PullThroughCacheRuleRepositoryPrefix",
1134-
"documentation":"<p>The repository name prefix to use when caching images from the source registry.</p>"
1134+
"documentation":"<p>The repository name prefix to use when caching images from the source registry.</p> <important> <p>There is always an assumed <code>/</code> applied to the end of the prefix. If you specify <code>ecr-public</code> as the prefix, Amazon ECR treats that as <code>ecr-public/</code>.</p> </important>"
11351135
},
11361136
"upstreamRegistryUrl":{
11371137
"shape":"Url",
1138-
"documentation":"<p>The registry URL of the upstream public registry to use as the source for the pull through cache rule. The following is the syntax to use for each supported upstream registry.</p> <ul> <li> <p>Amazon ECR Public (<code>ecr-public</code>) - <code>public.ecr.aws</code> </p> </li> <li> <p>Docker Hub (<code>docker-hub</code>) - <code>registry-1.docker.io</code> </p> </li> <li> <p>Quay (<code>quay</code>) - <code>quay.io</code> </p> </li> <li> <p>Kubernetes (<code>k8s</code>) - <code>registry.k8s.io</code> </p> </li> <li> <p>GitHub Container Registry (<code>github-container-registry</code>) - <code>ghcr.io</code> </p> </li> <li> <p>Microsoft Azure Container Registry (<code>azure-container-registry</code>) - <code>&lt;custom&gt;.azurecr.io</code> </p> </li> </ul>"
1138+
"documentation":"<p>The registry URL of the upstream public registry to use as the source for the pull through cache rule. The following is the syntax to use for each supported upstream registry.</p> <ul> <li> <p>Amazon ECR (<code>ecr</code>) – <code>dkr.ecr.&lt;region&gt;.amazonaws.com</code> </p> </li> <li> <p>Amazon ECR Public (<code>ecr-public</code>) – <code>public.ecr.aws</code> </p> </li> <li> <p>Docker Hub (<code>docker-hub</code>) – <code>registry-1.docker.io</code> </p> </li> <li> <p>GitHub Container Registry (<code>github-container-registry</code>) – <code>ghcr.io</code> </p> </li> <li> <p>GitLab Container Registry (<code>gitlab-container-registry</code>) – <code>registry.gitlab.com</code> </p> </li> <li> <p>Kubernetes (<code>k8s</code>) – <code>registry.k8s.io</code> </p> </li> <li> <p>Microsoft Azure Container Registry (<code>azure-container-registry</code>) – <code>&lt;custom&gt;.azurecr.io</code> </p> </li> <li> <p>Quay (<code>quay</code>) – <code>quay.io</code> </p> </li> </ul>"
11391139
},
11401140
"registryId":{
11411141
"shape":"RegistryId",
@@ -1148,6 +1148,14 @@
11481148
"credentialArn":{
11491149
"shape":"CredentialArn",
11501150
"documentation":"<p>The Amazon Resource Name (ARN) of the Amazon Web Services Secrets Manager secret that identifies the credentials to authenticate to the upstream registry.</p>"
1151+
},
1152+
"customRoleArn":{
1153+
"shape":"CustomRoleArn",
1154+
"documentation":"<p>Amazon Resource Name (ARN) of the IAM role to be assumed by Amazon ECR to authenticate to the ECR upstream registry. This role must be in the same account as the registry that you are configuring.</p>"
1155+
},
1156+
"upstreamRepositoryPrefix":{
1157+
"shape":"PullThroughCacheRuleRepositoryPrefix",
1158+
"documentation":"<p>The repository name prefix of the upstream registry to match with the upstream repository name. When this field isn't specified, Amazon ECR will use the <code>ROOT</code>.</p>"
11511159
}
11521160
}
11531161
},
@@ -1177,6 +1185,14 @@
11771185
"credentialArn":{
11781186
"shape":"CredentialArn",
11791187
"documentation":"<p>The Amazon Resource Name (ARN) of the Amazon Web Services Secrets Manager secret associated with the pull through cache rule.</p>"
1188+
},
1189+
"customRoleArn":{
1190+
"shape":"CustomRoleArn",
1191+
"documentation":"<p>The ARN of the IAM role associated with the pull through cache rule.</p>"
1192+
},
1193+
"upstreamRepositoryPrefix":{
1194+
"shape":"PullThroughCacheRuleRepositoryPrefix",
1195+
"documentation":"<p>The upstream repository prefix associated with the pull through cache rule.</p>"
11801196
}
11811197
}
11821198
},
@@ -1430,6 +1446,14 @@
14301446
"credentialArn":{
14311447
"shape":"CredentialArn",
14321448
"documentation":"<p>The Amazon Resource Name (ARN) of the Amazon Web Services Secrets Manager secret associated with the pull through cache rule.</p>"
1449+
},
1450+
"customRoleArn":{
1451+
"shape":"CustomRoleArn",
1452+
"documentation":"<p>The ARN of the IAM role associated with the pull through cache rule.</p>"
1453+
},
1454+
"upstreamRepositoryPrefix":{
1455+
"shape":"PullThroughCacheRuleRepositoryPrefix",
1456+
"documentation":"<p>The upstream repository prefix associated with the pull through cache rule.</p>"
14331457
}
14341458
}
14351459
},
@@ -2258,7 +2282,7 @@
22582282
},
22592283
"imageSizeInBytes":{
22602284
"shape":"ImageSizeInBytes",
2261-
"documentation":"<p>The size, in bytes, of the image in the repository.</p> <p>If the image is a manifest list, this will be the max size of all manifests in the list.</p> <note> <p>Beginning with Docker version 1.9, the Docker client compresses image layers before pushing them to a V2 Docker registry. The output of the <code>docker images</code> command shows the uncompressed image size, so it may return a larger image size than the image sizes returned by <a>DescribeImages</a>.</p> </note>"
2285+
"documentation":"<p>The size, in bytes, of the image in the repository.</p> <p>If the image is a manifest list, this will be the max size of all manifests in the list.</p> <note> <p>Starting with Docker version 1.9, the Docker client compresses image layers before pushing them to a V2 Docker registry. The output of the <code>docker images</code> command shows the uncompressed image size. Therefore, Docker might return a larger image than the image sizes returned by <a>DescribeImages</a>.</p> </note>"
22622286
},
22632287
"imagePushedAt":{
22642288
"shape":"PushTimestamp",
@@ -3052,6 +3076,14 @@
30523076
"shape":"CredentialArn",
30533077
"documentation":"<p>The ARN of the Secrets Manager secret associated with the pull through cache rule.</p>"
30543078
},
3079+
"customRoleArn":{
3080+
"shape":"CustomRoleArn",
3081+
"documentation":"<p>The ARN of the IAM role associated with the pull through cache rule.</p>"
3082+
},
3083+
"upstreamRepositoryPrefix":{
3084+
"shape":"PullThroughCacheRuleRepositoryPrefix",
3085+
"documentation":"<p>The upstream repository prefix associated with the pull through cache rule.</p>"
3086+
},
30553087
"upstreamRegistry":{
30563088
"shape":"UpstreamRegistry",
30573089
"documentation":"<p>The name of the upstream source registry associated with the pull through cache rule.</p>"
@@ -3087,7 +3119,7 @@
30873119
"type":"string",
30883120
"max":30,
30893121
"min":2,
3090-
"pattern":"(?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*"
3122+
"pattern":"^((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*/?|ROOT)$"
30913123
},
30923124
"PullThroughCacheRuleRepositoryPrefixList":{
30933125
"type":"list",
@@ -3599,7 +3631,7 @@
35993631
},
36003632
"repositoryPolicy":{
36013633
"shape":"RepositoryPolicyText",
3602-
"documentation":"<p>he repository policy to apply to repositories created using the template. A repository policy is a permissions policy associated with a repository to control access permissions. </p>"
3634+
"documentation":"<p>The repository policy to apply to repositories created using the template. A repository policy is a permissions policy associated with a repository to control access permissions. </p>"
36033635
},
36043636
"lifecyclePolicy":{
36053637
"shape":"LifecyclePolicyTextForRepositoryCreationTemplate",
@@ -4212,10 +4244,7 @@
42124244
},
42134245
"UpdatePullThroughCacheRuleRequest":{
42144246
"type":"structure",
4215-
"required":[
4216-
"ecrRepositoryPrefix",
4217-
"credentialArn"
4218-
],
4247+
"required":["ecrRepositoryPrefix"],
42194248
"members":{
42204249
"registryId":{
42214250
"shape":"RegistryId",
@@ -4228,6 +4257,10 @@
42284257
"credentialArn":{
42294258
"shape":"CredentialArn",
42304259
"documentation":"<p>The Amazon Resource Name (ARN) of the Amazon Web Services Secrets Manager secret that identifies the credentials to authenticate to the upstream registry.</p>"
4260+
},
4261+
"customRoleArn":{
4262+
"shape":"CustomRoleArn",
4263+
"documentation":"<p>Amazon Resource Name (ARN) of the IAM role to be assumed by Amazon ECR to authenticate to the ECR upstream registry. This role must be in the same account as the registry that you are configuring.</p>"
42314264
}
42324265
}
42334266
},
@@ -4249,6 +4282,14 @@
42494282
"credentialArn":{
42504283
"shape":"CredentialArn",
42514284
"documentation":"<p>The Amazon Resource Name (ARN) of the Amazon Web Services Secrets Manager secret associated with the pull through cache rule.</p>"
4285+
},
4286+
"customRoleArn":{
4287+
"shape":"CustomRoleArn",
4288+
"documentation":"<p>The ARN of the IAM role associated with the pull through cache rule.</p>"
4289+
},
4290+
"upstreamRepositoryPrefix":{
4291+
"shape":"PullThroughCacheRuleRepositoryPrefix",
4292+
"documentation":"<p>The upstream repository prefix associated with the pull through cache rule.</p>"
42524293
}
42534294
}
42544295
},
@@ -4380,6 +4421,7 @@
43804421
"UpstreamRegistry":{
43814422
"type":"string",
43824423
"enum":[
4424+
"ecr",
43834425
"ecr-public",
43844426
"quay",
43854427
"k8s",
@@ -4423,6 +4465,14 @@
44234465
"shape":"CredentialArn",
44244466
"documentation":"<p>The Amazon Resource Name (ARN) of the Amazon Web Services Secrets Manager secret associated with the pull through cache rule.</p>"
44254467
},
4468+
"customRoleArn":{
4469+
"shape":"CustomRoleArn",
4470+
"documentation":"<p>The ARN of the IAM role associated with the pull through cache rule.</p>"
4471+
},
4472+
"upstreamRepositoryPrefix":{
4473+
"shape":"PullThroughCacheRuleRepositoryPrefix",
4474+
"documentation":"<p>The upstream repository prefix associated with the pull through cache rule.</p>"
4475+
},
44264476
"isValid":{
44274477
"shape":"IsPTCRuleValid",
44284478
"documentation":"<p>Whether or not the pull through cache rule was validated. If <code>true</code>, Amazon ECR was able to reach the upstream registry and authentication was successful. If <code>false</code>, there was an issue and validation failed. The <code>failure</code> reason indicates the cause.</p>"

0 commit comments

Comments
 (0)