From 5dc1d96e77ec2359a77aed7266c4e7769d04e084 Mon Sep 17 00:00:00 2001 From: Iiro Huikko Date: Fri, 23 Oct 2020 21:58:56 +0300 Subject: [PATCH 1/2] fix(ses-actions): invalid action in policy statement created when using SES S3 action (#11061) Current SES S3 action does not work out of the box because there is a typo in a policy statement action. This PR fixes that `km:Encrypt` => `kms:Encrypt`. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- packages/@aws-cdk/aws-ses-actions/lib/s3.ts | 2 +- packages/@aws-cdk/aws-ses-actions/test/actions.test.ts | 2 +- .../@aws-cdk/aws-ses-actions/test/integ.actions.expected.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/@aws-cdk/aws-ses-actions/lib/s3.ts b/packages/@aws-cdk/aws-ses-actions/lib/s3.ts index 35014d7a381f9..9be2fd8750378 100644 --- a/packages/@aws-cdk/aws-ses-actions/lib/s3.ts +++ b/packages/@aws-cdk/aws-ses-actions/lib/s3.ts @@ -72,7 +72,7 @@ export class S3 implements ses.IReceiptRuleAction { // See https://docs.aws.amazon.com/ses/latest/DeveloperGuide/receiving-email-permissions.html#receiving-email-permissions-kms if (this.props.kmsKey && !/alias\/aws\/ses$/.test(this.props.kmsKey.keyArn)) { const kmsStatement = new iam.PolicyStatement({ - actions: ['km:Encrypt', 'kms:GenerateDataKey'], + actions: ['kms:Encrypt', 'kms:GenerateDataKey'], principals: [new iam.ServicePrincipal('ses.amazonaws.com')], resources: ['*'], conditions: { diff --git a/packages/@aws-cdk/aws-ses-actions/test/actions.test.ts b/packages/@aws-cdk/aws-ses-actions/test/actions.test.ts index fb84ae69a372b..3a963fcf3f24b 100644 --- a/packages/@aws-cdk/aws-ses-actions/test/actions.test.ts +++ b/packages/@aws-cdk/aws-ses-actions/test/actions.test.ts @@ -267,7 +267,7 @@ test('add s3 action', () => { }, { Action: [ - 'km:Encrypt', + 'kms:Encrypt', 'kms:GenerateDataKey', ], Condition: { diff --git a/packages/@aws-cdk/aws-ses-actions/test/integ.actions.expected.json b/packages/@aws-cdk/aws-ses-actions/test/integ.actions.expected.json index db7a2a0f70eaa..2bde038826803 100644 --- a/packages/@aws-cdk/aws-ses-actions/test/integ.actions.expected.json +++ b/packages/@aws-cdk/aws-ses-actions/test/integ.actions.expected.json @@ -161,7 +161,7 @@ }, { "Action": [ - "km:Encrypt", + "kms:Encrypt", "kms:GenerateDataKey" ], "Condition": { @@ -389,4 +389,4 @@ } } } -} \ No newline at end of file +} From 7435db853636628a60c8aa465481fc01136aa4a1 Mon Sep 17 00:00:00 2001 From: Shiv Lakshminarayan Date: Fri, 23 Oct 2020 12:26:49 -0700 Subject: [PATCH 2/2] feat(cognito): Cognito User Pools is now in Generally Available (stable) (#11003) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- packages/@aws-cdk/aws-cognito/README.md | 4 ++-- packages/@aws-cdk/aws-cognito/package.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/@aws-cdk/aws-cognito/README.md b/packages/@aws-cdk/aws-cognito/README.md index 2974610b23b1c..7160d9cf60efc 100644 --- a/packages/@aws-cdk/aws-cognito/README.md +++ b/packages/@aws-cdk/aws-cognito/README.md @@ -5,12 +5,12 @@ | Features | Stability | | --- | --- | | CFN Resources | ![Stable](https://img.shields.io/badge/stable-success.svg?style=for-the-badge) | -| Higher level constructs for User Pools | ![Developer Preview](https://img.shields.io/badge/developer--preview-informational.svg?style=for-the-badge) | +| Higher level constructs for User Pools | ![Stable](https://img.shields.io/badge/stable-success.svg?style=for-the-badge) | | Higher level constructs for Identity Pools | ![Not Implemented](https://img.shields.io/badge/not--implemented-black.svg?style=for-the-badge) | > **CFN Resources:** All classes with the `Cfn` prefix in this module ([CFN Resources](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib)) are always stable and safe to use. -> **Developer Preview:** Higher level constructs in this module that are marked as developer preview have completed their phase of active development and are looking for adoption and feedback. While the same caveats around non-backward compatible as Experimental constructs apply, they will undergo fewer breaking changes. Just as with Experimental constructs, these are not subject to the [Semantic Versioning](https://semver.org/) model and breaking changes will be announced in the release notes. +> **Stable:** Higher level constructs in this module that are marked stable will not undergo any breaking changes. They will strictly follow the [Semantic Versioning](https://semver.org/) model. --- diff --git a/packages/@aws-cdk/aws-cognito/package.json b/packages/@aws-cdk/aws-cognito/package.json index c54873f73863e..423f7cca2eae4 100644 --- a/packages/@aws-cdk/aws-cognito/package.json +++ b/packages/@aws-cdk/aws-cognito/package.json @@ -111,12 +111,12 @@ "props-physical-name:@aws-cdk/aws-cognito.UserPoolIdentityProviderGoogleProps" ] }, - "stability": "experimental", - "maturity": "developer-preview", + "stability": "stable", + "maturity": "stable", "features": [ { "name": "Higher level constructs for User Pools", - "stability": "Developer Preview" + "stability": "Stable" }, { "name": "Higher level constructs for Identity Pools",