Merge branch 'main' into pahud/aws-secretsmanager-secret-28696

ROADMAP.md

@@ -48,8 +48,8 @@ Security and stability of the CDK is a top priority. If you think you’ve found
 * 👂🏽 [CDK CLI Triggers](https://github.com/aws/aws-cdk-rfcs/issues/228) - CLI enhancements are also being considered for post command hooks. 
 
 ### L2 Abstractions
+* 🚀 [Enabling IPv6 on Resources and VPCs](https://github.com/aws/aws-cdk/pull/28366)
 * 🔍 [CloudFront Origin Access Control L2](https://github.com/aws/aws-cdk-rfcs/issues/491)
-* 🛠️ [Enabling IPv6 on Resources and VPCs](https://github.com/aws/aws-cdk/pull/28366)
 * 🔍 [Rewrite EKS L2](https://github.com/aws/aws-cdk-rfcs/issues/605) - drop the custom resource implementation in favor of the native L1.
 
 We are currently investigating other L2s to build out next. Feel free to create an RFC to request.

packages/@aws-cdk/aws-amplify-alpha/.npmignore

@@ -31,3 +31,6 @@ junit.xml
 test/
 !*.lit.ts
 **/*.snapshot
+
+# include custom-resource-handlers
+!custom-resource-handlers/*

packages/@aws-cdk/aws-amplify-alpha/lib/branch.ts

@@ -233,7 +233,7 @@ class AmplifyAssetDeploymentProvider extends NestedStack {
       this,
       'amplify-asset-deployment-on-event',
       {
-        entry: path.join(__dirname, '..', '..', 'custom-resource-handlers', 'dist', 'aws-amplify-alpha', 'asset-deployment-handler', 'index.js'),
+        entry: path.join(__dirname, '..', 'custom-resource-handlers', 'dist', 'aws-amplify-alpha', 'asset-deployment-handler', 'index.js'),
         handler: 'onEvent',
         initialPolicy: [
           new iam.PolicyStatement({

packages/@aws-cdk/aws-amplify-alpha/package.json

@@ -67,7 +67,10 @@
   "cdk-build": {
     "env": {
       "AWSLINT_BASE_CONSTRUCT": true
-    }
+    },
+    "pre": [
+      "./scripts/airlift-custom-resource-handlers.sh"
+    ]
   },
   "keywords": [
     "aws",

packages/@aws-cdk/aws-amplify-alpha/scripts/airlift-custom-resource-handlers.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+scriptdir=$(cd $(dirname $0) && pwd)
+customresourcedir=$(node -p "path.dirname(require.resolve('@aws-cdk/custom-resource-handlers/package.json'))")
+awscdklibdir=${scriptdir}/..
+
+list_custom_resources() {
+  for file in $customresourcedir/dist/aws-amplify-alpha/*/index.js; do
+    echo $file | rev | cut -d "/" -f 2-4 | rev
+  done
+}
+
+customresources=$(list_custom_resources)
+
+echo $customresources
+
+cd $awscdklibdir
+mkdir -p $awscdklibdir/custom-resource-handlers
+
+for cr in $customresources; do
+  mkdir -p $awscdklibdir/custom-resource-handlers/$cr
+  cp $customresourcedir/$cr/index.js $awscdklibdir/custom-resource-handlers/$cr
+done

packages/@aws-cdk/aws-amplify-alpha/test/integ.app-asset-deployment.js.snapshot/cdk-amplify-app-asset-deployment.template.json

@@ -90,7 +90,7 @@
        {
         "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
        },
-       "/d1af98ce124bb93199d3d45ff8930b99badcdd089777b7976a0ad9af56d220f6.json"
+       "/2f9d2632b48a4f92f6691c3e3cfcbeb47798c945a2d03b93514de1a3d3ec72ed.json"
       ]
      ]
     }

packages/@aws-cdk/aws-amplify-alpha/test/integ.app-asset-deployment.js.snapshot/cdkamplifyappassetdeploymentcomamazonawscdkcustomresourcesamplifyassetdeploymentprovider02396C99.nested.template.json

@@ -64,7 +64,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "9307ab790c544d7c4d94504a1c950222bbfc119c2c12b44440ad46939e0b6364.zip"
+     "S3Key": "85f7bb0ac0b4da3571afd49c891d631f4f07c0ef710a02046d3a9abd8d9d4604.zip"
     },
     "Environment": {
      "Variables": {

packages/@aws-cdk/aws-amplify-alpha/test/integ.app-codecommit.js.snapshot/cdk-amplify-codecommit-app.template.json

@@ -52,7 +52,6 @@
   "AppF1B96344": {
    "Type": "AWS::Amplify::App",
    "Properties": {
-    "Name": "App",
     "BasicAuthConfig": {
      "EnableBasicAuth": false
     },
@@ -62,13 +61,14 @@
       "Arn"
      ]
     },
+    "Name": "App",
+    "Platform": "WEB",
     "Repository": {
      "Fn::GetAtt": [
       "Repo02AC86CF",
       "CloneUrlHttp"
      ]
-    },
-    "Platform": "WEB"
+    }
    }
   },
   "AppmainF505BAED": {
@@ -120,4 +120,4 @@
    ]
   }
  }
-}
+}