Skip to content

Commit 33886e7

Browse files
author
awstools
committed
feat(client-ecr): Added KMS_DSSE to EncryptionType
1 parent 1a98084 commit 33886e7

9 files changed

+67
-30
lines changed

‎clients/client-ecr/src/commands/CreateRepositoryCommand.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export interface CreateRepositoryCommandOutput extends CreateRepositoryResponse,
5050
* scanOnPush: true || false,
5151
* },
5252
* encryptionConfiguration: { // EncryptionConfiguration
53-
* encryptionType: "AES256" || "KMS", // required
53+
* encryptionType: "AES256" || "KMS" || "KMS_DSSE", // required
5454
* kmsKey: "STRING_VALUE",
5555
* },
5656
* };
@@ -68,7 +68,7 @@ export interface CreateRepositoryCommandOutput extends CreateRepositoryResponse,
6868
* // scanOnPush: true || false,
6969
* // },
7070
* // encryptionConfiguration: { // EncryptionConfiguration
71-
* // encryptionType: "AES256" || "KMS", // required
71+
* // encryptionType: "AES256" || "KMS" || "KMS_DSSE", // required
7272
* // kmsKey: "STRING_VALUE",
7373
* // },
7474
* // },

‎clients/client-ecr/src/commands/CreateRepositoryCreationTemplateCommand.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export interface CreateRepositoryCreationTemplateCommandOutput
4848
* prefix: "STRING_VALUE", // required
4949
* description: "STRING_VALUE",
5050
* encryptionConfiguration: { // EncryptionConfigurationForRepositoryCreationTemplate
51-
* encryptionType: "AES256" || "KMS", // required
51+
* encryptionType: "AES256" || "KMS" || "KMS_DSSE", // required
5252
* kmsKey: "STRING_VALUE",
5353
* },
5454
* resourceTags: [ // TagList
@@ -73,7 +73,7 @@ export interface CreateRepositoryCreationTemplateCommandOutput
7373
* // prefix: "STRING_VALUE",
7474
* // description: "STRING_VALUE",
7575
* // encryptionConfiguration: { // EncryptionConfigurationForRepositoryCreationTemplate
76-
* // encryptionType: "AES256" || "KMS", // required
76+
* // encryptionType: "AES256" || "KMS" || "KMS_DSSE", // required
7777
* // kmsKey: "STRING_VALUE",
7878
* // },
7979
* // resourceTags: [ // TagList

‎clients/client-ecr/src/commands/DeleteRepositoryCommand.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export interface DeleteRepositoryCommandOutput extends DeleteRepositoryResponse,
5656
* // scanOnPush: true || false,
5757
* // },
5858
* // encryptionConfiguration: { // EncryptionConfiguration
59-
* // encryptionType: "AES256" || "KMS", // required
59+
* // encryptionType: "AES256" || "KMS" || "KMS_DSSE", // required
6060
* // kmsKey: "STRING_VALUE",
6161
* // },
6262
* // },

‎clients/client-ecr/src/commands/DeleteRepositoryCreationTemplateCommand.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export interface DeleteRepositoryCreationTemplateCommandOutput
5151
* // prefix: "STRING_VALUE",
5252
* // description: "STRING_VALUE",
5353
* // encryptionConfiguration: { // EncryptionConfigurationForRepositoryCreationTemplate
54-
* // encryptionType: "AES256" || "KMS", // required
54+
* // encryptionType: "AES256" || "KMS" || "KMS_DSSE", // required
5555
* // kmsKey: "STRING_VALUE",
5656
* // },
5757
* // resourceTags: [ // TagList

‎clients/client-ecr/src/commands/DescribeRepositoriesCommand.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export interface DescribeRepositoriesCommandOutput extends DescribeRepositoriesR
5858
* // scanOnPush: true || false,
5959
* // },
6060
* // encryptionConfiguration: { // EncryptionConfiguration
61-
* // encryptionType: "AES256" || "KMS", // required
61+
* // encryptionType: "AES256" || "KMS" || "KMS_DSSE", // required
6262
* // kmsKey: "STRING_VALUE",
6363
* // },
6464
* // },

‎clients/client-ecr/src/commands/DescribeRepositoryCreationTemplatesCommand.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export interface DescribeRepositoryCreationTemplatesCommandOutput
6161
* // prefix: "STRING_VALUE",
6262
* // description: "STRING_VALUE",
6363
* // encryptionConfiguration: { // EncryptionConfigurationForRepositoryCreationTemplate
64-
* // encryptionType: "AES256" || "KMS", // required
64+
* // encryptionType: "AES256" || "KMS" || "KMS_DSSE", // required
6565
* // kmsKey: "STRING_VALUE",
6666
* // },
6767
* // resourceTags: [ // TagList

‎clients/client-ecr/src/commands/UpdateRepositoryCreationTemplateCommand.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export interface UpdateRepositoryCreationTemplateCommandOutput
4444
* prefix: "STRING_VALUE", // required
4545
* description: "STRING_VALUE",
4646
* encryptionConfiguration: { // EncryptionConfigurationForRepositoryCreationTemplate
47-
* encryptionType: "AES256" || "KMS", // required
47+
* encryptionType: "AES256" || "KMS" || "KMS_DSSE", // required
4848
* kmsKey: "STRING_VALUE",
4949
* },
5050
* resourceTags: [ // TagList
@@ -69,7 +69,7 @@ export interface UpdateRepositoryCreationTemplateCommandOutput
6969
* // prefix: "STRING_VALUE",
7070
* // description: "STRING_VALUE",
7171
* // encryptionConfiguration: { // EncryptionConfigurationForRepositoryCreationTemplate
72-
* // encryptionType: "AES256" || "KMS", // required
72+
* // encryptionType: "AES256" || "KMS" || "KMS_DSSE", // required
7373
* // kmsKey: "STRING_VALUE",
7474
* // },
7575
* // resourceTags: [ // TagList

‎clients/client-ecr/src/models/models_0.ts‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,6 +1035,7 @@ export class UnsupportedUpstreamRegistryException extends __BaseException {
10351035
export const EncryptionType = {
10361036
AES256: "AES256",
10371037
KMS: "KMS",
1038+
KMS_DSSE: "KMS_DSSE",
10381039
} as const;
10391040

10401041
/**
@@ -1061,10 +1062,12 @@ export interface EncryptionConfiguration {
10611062
* <p>If you use the <code>KMS</code> encryption type, the contents of the repository will
10621063
* be encrypted using server-side encryption with Key Management Service key stored in KMS. When you
10631064
* use KMS to encrypt your data, you can either use the default Amazon Web Services managed KMS key
1064-
* for Amazon ECR, or specify your own KMS key, which you already created. For more
1065-
* information, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html">Protecting data using server-side
1066-
* encryption with an KMS key stored in Key Management Service (SSE-KMS)</a> in the
1067-
* <i>Amazon Simple Storage Service Console Developer Guide</i>.</p>
1065+
* for Amazon ECR, or specify your own KMS key, which you already created.</p>
1066+
* <p>If you use the <code>KMS_DSSE</code> encryption type, the contents of the repository
1067+
* will be encrypted with two layers of encryption using server-side encryption with the
1068+
* KMS Management Service key stored in KMS. Similar to the KMS encryption type, you
1069+
* can either use the default Amazon Web Services managed KMS key for Amazon ECR, or specify your own KMS
1070+
* key, which you've already created. </p>
10681071
* <p>If you use the <code>AES256</code> encryption type, Amazon ECR uses server-side encryption
10691072
* with Amazon S3-managed encryption keys which encrypts the images in the repository using an
10701073
* AES256 encryption algorithm. For more information, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html">Protecting data using
@@ -1445,9 +1448,9 @@ export interface CreateRepositoryCreationTemplateRequest {
14451448

14461449
/**
14471450
* <p>The ARN of the role to be assumed by Amazon ECR. This role must be in the same account as
1448-
* the registry that you are configuring. Amazon ECR will assume your supplied role when
1449-
* the customRoleArn is specified. When this field isn't specified, Amazon ECR will
1450-
* use the service-linked role for the repository creation template.</p>
1451+
* the registry that you are configuring. Amazon ECR will assume your supplied role when the
1452+
* customRoleArn is specified. When this field isn't specified, Amazon ECR will use the
1453+
* service-linked role for the repository creation template.</p>
14511454
* @public
14521455
*/
14531456
customRoleArn?: string;
@@ -1517,9 +1520,9 @@ export interface RepositoryCreationTemplate {
15171520
appliedFor?: RCTAppliedFor[];
15181521

15191522
/**
1520-
* <p>The ARN of the role to be assumed by Amazon ECR. Amazon ECR will assume your supplied role when
1521-
* the customRoleArn is specified. When this field isn't specified, Amazon ECR will
1522-
* use the service-linked role for the repository creation template.</p>
1523+
* <p>The ARN of the role to be assumed by Amazon ECR. Amazon ECR will assume your supplied role
1524+
* when the customRoleArn is specified. When this field isn't specified, Amazon ECR will use the
1525+
* service-linked role for the repository creation template.</p>
15231526
* @public
15241527
*/
15251528
customRoleArn?: string;
@@ -4892,9 +4895,9 @@ export interface UpdateRepositoryCreationTemplateRequest {
48924895

48934896
/**
48944897
* <p>The ARN of the role to be assumed by Amazon ECR. This role must be in the same account as
4895-
* the registry that you are configuring. Amazon ECR will assume your supplied role when
4896-
* the customRoleArn is specified. When this field isn't specified, Amazon ECR will
4897-
* use the service-linked role for the repository creation template.</p>
4898+
* the registry that you are configuring. Amazon ECR will assume your supplied role when the
4899+
* customRoleArn is specified. When this field isn't specified, Amazon ECR will use the
4900+
* service-linked role for the repository creation template.</p>
48984901
* @public
48994902
*/
49004903
customRoleArn?: string;

‎codegen/sdk-codegen/aws-models/ecr.json‎

Lines changed: 41 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
},
207207
"aws.protocols#awsJson1_1": {},
208208
"smithy.api#documentation": "<fullname>Amazon Elastic Container Registry</fullname>\n <p>Amazon Elastic Container Registry (Amazon ECR) is a managed container image registry service. Customers can use the\n familiar Docker CLI, or their preferred client, to push, pull, and manage images. Amazon ECR\n provides a secure, scalable, and reliable registry for your Docker or Open Container\n Initiative (OCI) images. Amazon ECR supports private repositories with resource-based\n permissions using IAM so that specific users or Amazon EC2 instances can access\n repositories and images.</p>\n <p>Amazon ECR has service endpoints in each supported Region. For more information, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/ecr.html\">Amazon ECR endpoints</a> in the\n <i>Amazon Web Services General Reference</i>.</p>",
209-
"smithy.api#title": "Amazon EC2 Container Registry",
209+
"smithy.api#title": "Amazon Elastic Container Registry",
210210
"smithy.api#xmlNamespace": {
211211
"uri": "http://ecr.amazonaws.com/doc/2015-09-21/"
212212
},
@@ -2142,7 +2142,7 @@
21422142
"customRoleArn": {
21432143
"target": "com.amazonaws.ecr#CustomRoleArn",
21442144
"traits": {
2145-
"smithy.api#documentation": "<p>The ARN of the role to be assumed by Amazon ECR. This role must be in the same account as\n the registry that you are configuring. Amazon ECR will assume your supplied role when\n the customRoleArn is specified. When this field isn't specified, Amazon ECR will\n use the service-linked role for the repository creation template.</p>"
2145+
"smithy.api#documentation": "<p>The ARN of the role to be assumed by Amazon ECR. This role must be in the same account as\n the registry that you are configuring. Amazon ECR will assume your supplied role when the\n customRoleArn is specified. When this field isn't specified, Amazon ECR will use the\n service-linked role for the repository creation template.</p>"
21462146
}
21472147
}
21482148
},
@@ -3329,7 +3329,20 @@
33293329
"outputToken": "nextToken",
33303330
"items": "repositories",
33313331
"pageSize": "maxResults"
3332-
}
3332+
},
3333+
"smithy.test#smokeTests": [
3334+
{
3335+
"id": "DescribeRepositoriesSuccess",
3336+
"params": {},
3337+
"vendorParams": {
3338+
"region": "us-west-2"
3339+
},
3340+
"vendorParamsShape": "aws.test#AwsVendorParams",
3341+
"expect": {
3342+
"success": {}
3343+
}
3344+
}
3345+
]
33333346
}
33343347
},
33353348
"com.amazonaws.ecr#DescribeRepositoriesRequest": {
@@ -3486,7 +3499,7 @@
34863499
"encryptionType": {
34873500
"target": "com.amazonaws.ecr#EncryptionType",
34883501
"traits": {
3489-
"smithy.api#documentation": "<p>The encryption type to use.</p>\n <p>If you use the <code>KMS</code> encryption type, the contents of the repository will\n be encrypted using server-side encryption with Key Management Service key stored in KMS. When you\n use KMS to encrypt your data, you can either use the default Amazon Web Services managed KMS key\n for Amazon ECR, or specify your own KMS key, which you already created. For more\n information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html\">Protecting data using server-side\n encryption with an KMS key stored in Key Management Service (SSE-KMS)</a> in the\n <i>Amazon Simple Storage Service Console Developer Guide</i>.</p>\n <p>If you use the <code>AES256</code> encryption type, Amazon ECR uses server-side encryption\n with Amazon S3-managed encryption keys which encrypts the images in the repository using an\n AES256 encryption algorithm. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html\">Protecting data using\n server-side encryption with Amazon S3-managed encryption keys (SSE-S3)</a> in the\n <i>Amazon Simple Storage Service Console Developer Guide</i>.</p>",
3502+
"smithy.api#documentation": "<p>The encryption type to use.</p>\n <p>If you use the <code>KMS</code> encryption type, the contents of the repository will\n be encrypted using server-side encryption with Key Management Service key stored in KMS. When you\n use KMS to encrypt your data, you can either use the default Amazon Web Services managed KMS key\n for Amazon ECR, or specify your own KMS key, which you already created.</p>\n <p>If you use the <code>KMS_DSSE</code> encryption type, the contents of the repository\n will be encrypted with two layers of encryption using server-side encryption with the\n KMS Management Service key stored in KMS. Similar to the KMS encryption type, you\n can either use the default Amazon Web Services managed KMS key for Amazon ECR, or specify your own KMS\n key, which you've already created. </p>\n <p>If you use the <code>AES256</code> encryption type, Amazon ECR uses server-side encryption\n with Amazon S3-managed encryption keys which encrypts the images in the repository using an\n AES256 encryption algorithm. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html\">Protecting data using\n server-side encryption with Amazon S3-managed encryption keys (SSE-S3)</a> in the\n <i>Amazon Simple Storage Service Console Developer Guide</i>.</p>",
34903503
"smithy.api#required": {}
34913504
}
34923505
},
@@ -3536,6 +3549,12 @@
35363549
"traits": {
35373550
"smithy.api#enumValue": "KMS"
35383551
}
3552+
},
3553+
"KMS_DSSE": {
3554+
"target": "smithy.api#Unit",
3555+
"traits": {
3556+
"smithy.api#enumValue": "KMS_DSSE"
3557+
}
35393558
}
35403559
}
35413560
},
@@ -5550,7 +5569,22 @@
55505569
"outputToken": "nextToken",
55515570
"items": "imageIds",
55525571
"pageSize": "maxResults"
5553-
}
5572+
},
5573+
"smithy.test#smokeTests": [
5574+
{
5575+
"id": "ListImagesFailure",
5576+
"params": {
5577+
"repositoryName": "not-a-real-repository"
5578+
},
5579+
"vendorParams": {
5580+
"region": "us-west-2"
5581+
},
5582+
"vendorParamsShape": "aws.test#AwsVendorParams",
5583+
"expect": {
5584+
"failure": {}
5585+
}
5586+
}
5587+
]
55545588
}
55555589
},
55565590
"com.amazonaws.ecr#ListImagesFilter": {
@@ -6910,7 +6944,7 @@
69106944
"customRoleArn": {
69116945
"target": "com.amazonaws.ecr#CustomRoleArn",
69126946
"traits": {
6913-
"smithy.api#documentation": "<p>The ARN of the role to be assumed by Amazon ECR. Amazon ECR will assume your supplied role when\n the customRoleArn is specified. When this field isn't specified, Amazon ECR will\n use the service-linked role for the repository creation template.</p>"
6947+
"smithy.api#documentation": "<p>The ARN of the role to be assumed by Amazon ECR. Amazon ECR will assume your supplied role\n when the customRoleArn is specified. When this field isn't specified, Amazon ECR will use the\n service-linked role for the repository creation template.</p>"
69146948
}
69156949
},
69166950
"createdAt": {
@@ -8223,7 +8257,7 @@
82238257
"customRoleArn": {
82248258
"target": "com.amazonaws.ecr#CustomRoleArn",
82258259
"traits": {
8226-
"smithy.api#documentation": "<p>The ARN of the role to be assumed by Amazon ECR. This role must be in the same account as\n the registry that you are configuring. Amazon ECR will assume your supplied role when\n the customRoleArn is specified. When this field isn't specified, Amazon ECR will\n use the service-linked role for the repository creation template.</p>"
8260+
"smithy.api#documentation": "<p>The ARN of the role to be assumed by Amazon ECR. This role must be in the same account as\n the registry that you are configuring. Amazon ECR will assume your supplied role when the\n customRoleArn is specified. When this field isn't specified, Amazon ECR will use the\n service-linked role for the repository creation template.</p>"
82278261
}
82288262
}
82298263
},

0 commit comments

Comments
 (0)