Merge branch 'master' into integ-tests/fix-disable-update-workflow

.github/workflows/issue-reprioritization.yml

@@ -9,14 +9,14 @@ jobs:
       issues: write
     runs-on: ubuntu-latest
     steps:
-      - uses: kaizen3031593/issue-reprioritization-manager@main
+      - uses: kaizencc/issue-reprioritization-manager@main
         id: reprioritization-manager
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           original-label: p2
           new-label: p1
           reprioritization-threshold: 20
-      - uses: kaizen3031593/pr-triage-manager@main
+      - uses: kaizencc/pr-triage-manager@main
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           on-pulls: ${{ steps.reprioritization-manager.outputs.linked-pulls }}

.github/workflows/pr-labeler.yml

@@ -24,7 +24,7 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: kaizen3031593/pr-triage-manager@main
+      - uses: kaizencc/pr-triage-manager@main
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 

.mergify.yml

@@ -10,7 +10,7 @@ pull_request_rules:
       label:
         add: [ contribution/core ]
     conditions:
-      - author~=^(eladb|RomainMuller|garnaat|nija-at|skinny85|rix0rrr|NGL321|Jerry-AWS|MrArnoldPalmer|NetaNir|iliapolo|njlynch|ericzbeard|ccfife|fulghum|pkandasamy91|SoManyHs|uttarasridhar|otaviomacedo|BenChaimberg|madeline-k|BryanPan342|kaizen3031593|comcalvi|Chriscbr|corymhall|peterwoodworth|ryparker|TheRealAmazonKendra|yuth)$
+      - author~=^(RomainMuller|garnaat|skinny85|rix0rrr|NGL321|Jerry-AWS|MrArnoldPalmer|iliapolo|pkandasamy91|SoManyHs|uttarasridhar|otaviomacedo|madeline-k|kaizencc|comcalvi|Chriscbr|corymhall|peterwoodworth|ryparker|TheRealAmazonKendra|yuth)$
       - -label~="contribution/core"
   - name: automatic merge
     actions:

packages/@aws-cdk/aws-rds/lib/cluster.ts

@@ -259,12 +259,19 @@ interface DatabaseClusterBaseProps {
   readonly storageEncrypted?: boolean
 
   /**
-  * The KMS key for storage encryption.
-  * If specified, {@link storageEncrypted} will be set to `true`.
-  *
-  * @default - if storageEncrypted is true then the default master key, no key otherwise
-  */
+   * The KMS key for storage encryption.
+   * If specified, {@link storageEncrypted} will be set to `true`.
+   *
+   * @default - if storageEncrypted is true then the default master key, no key otherwise
+   */
   readonly storageEncryptionKey?: kms.IKey;
+
+  /**
+   * Whether to copy tags to the snapshot when a snapshot is created.
+   *
+   * @default - true
+   */
+  readonly copyTagsToSnapshot?: boolean;
 }
 
 /**
@@ -425,6 +432,8 @@ abstract class DatabaseClusterNew extends DatabaseClusterBase {
       // Encryption
       kmsKeyId: props.storageEncryptionKey?.keyArn,
       storageEncrypted: props.storageEncryptionKey ? true : props.storageEncrypted,
+      // Tags
+      copyTagsToSnapshot: props.copyTagsToSnapshot ?? true,
     };
   }
 }
@@ -501,13 +510,6 @@ export interface DatabaseClusterProps extends DatabaseClusterBaseProps {
    * @default - A username of 'admin' (or 'postgres' for PostgreSQL) and SecretsManager-generated password
    */
   readonly credentials?: Credentials;
-
-  /**
-   * Whether to copy tags to the snapshot when a snapshot is created.
-   *
-   * @default: true
-   */
-  readonly copyTagsToSnapshot?: boolean;
 }
 
 /**
@@ -558,8 +560,6 @@ export class DatabaseCluster extends DatabaseClusterNew {
       // Admin
       masterUsername: credentials.username,
       masterUserPassword: credentials.password?.unsafeUnwrap(),
-      // Tags
-      copyTagsToSnapshot: props.copyTagsToSnapshot ?? true,
     });
 
     this.clusterIdentifier = cluster.ref;

packages/@aws-cdk/aws-rds/test/cluster.test.ts

@@ -1997,6 +1997,7 @@ describe('cluster', () => {
         VpcSecurityGroupIds: [{ 'Fn::GetAtt': ['DatabaseSecurityGroup5C91FDCB', 'GroupId'] }],
         SnapshotIdentifier: 'mySnapshot',
         EnableIAMDatabaseAuthentication: true,
+        CopyTagsToSnapshot: true,
       },
       DeletionPolicy: 'Snapshot',
       UpdateReplacePolicy: 'Snapshot',

packages/@aws-cdk/aws-s3-deployment/README.md

@@ -344,11 +344,11 @@ substituting it when its deployed to the destination with the actual value.
 
 ## Development
 
-The custom resource is implemented in Python 3.6 in order to be able to leverage
+The custom resource is implemented in Python 3.7 in order to be able to leverage
 the AWS CLI for "aws s3 sync". The code is under [`lib/lambda`](https://github.com/aws/aws-cdk/tree/master/packages/%40aws-cdk/aws-s3-deployment/lib/lambda) and
 unit tests are under [`test/lambda`](https://github.com/aws/aws-cdk/tree/master/packages/%40aws-cdk/aws-s3-deployment/test/lambda).
 
-This package requires Python 3.6 during build time in order to create the custom
+This package requires Python 3.7 during build time in order to create the custom
 resource Lambda bundle and test it. It also relies on a few bash scripts, so
 might be tricky to build on Windows.
 

packages/@aws-cdk/aws-stepfunctions/lib/state-machine.ts

@@ -65,7 +65,7 @@ export interface LogOptions {
   /**
    * Determines whether execution data is included in your log.
    *
-   * @default true
+   * @default false
    */
   readonly includeExecutionData?: boolean;