Merge branch 'main' into colifran/migrate-nodejs-entrypoint

aws · Nov 27, 2023 · 9d5f642 · 9d5f642
2 parents f214b1f + 7bc61d8
commit 9d5f642
Show file tree

Hide file tree

Showing 43 changed files with 122 additions and 121 deletions.
diff --git a/.github/workflows/request-cli-integ-test.yml b/.github/workflows/request-cli-integ-test.yml
@@ -19,7 +19,7 @@ jobs:
           persist-credentials: false
       - name: Find changed cli files
         id: changed-cli-files
-        uses: tj-actions/changed-files@25ef3926d147cd02fc7e931c1ef50772bbb0d25d
+        uses: tj-actions/changed-files@da093c1609db0edd0a037ce9664e135f74bf30d9
         with:
           base_sha: ${{ github.event.pull_request.base.sha }}
           files_yaml: |

diff --git a/...ce/test/integ.opensearch.min.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.assets.json b/...ce/test/integ.opensearch.min.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.assets.json
diff --git a/...-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.assets.json b/...-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.assets.json
diff --git a/...pensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.template.json b/...pensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.template.json
@@ -22,7 +22,7 @@
     "EncryptionAtRestOptions": {
      "Enabled": false
     },
-    "EngineVersion": "OpenSearch_2.9",
+    "EngineVersion": "OpenSearch_2.11",
     "LogPublishingOptions": {},
     "NodeToNodeEncryptionOptions": {
      "Enabled": false

diff --git a/.../framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk.out b/.../framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk.out
diff --git a/...amework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/integ.json b/...amework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/integ.json
diff --git a/...work-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/manifest.json b/...work-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/manifest.json
diff --git a/...ramework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/tree.json b/...ramework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/tree.json
diff --git a/.../@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.ts b/.../@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.ts
@@ -9,7 +9,7 @@ class TestStack extends Stack {
 
     // deploy the latest opensearch domain with minimal configuration
     const domainProps: opensearch.DomainProps = {
-      version: opensearch.EngineVersion.OPENSEARCH_2_9,
+      version: opensearch.EngineVersion.OPENSEARCH_2_11,
       removalPolicy: RemovalPolicy.DESTROY,
       capacity: {
         multiAzWithStandbyEnabled: false,

diff --git a/packages/@aws-cdk/aws-msk-alpha/lib/cluster.ts b/packages/@aws-cdk/aws-msk-alpha/lib/cluster.ts
@@ -721,6 +721,11 @@ export class Cluster extends ClusterBase {
           physicalResourceId: cr.PhysicalResourceId.of(
             'ZooKeeperConnectionString',
           ),
+          // Limit the output of describeCluster that is otherwise too large
+          outputPaths: [
+            'ClusterInfo.ZookeeperConnectString',
+            'ClusterInfo.ZookeeperConnectStringTls',
+          ],
         },
         policy: cr.AwsCustomResourcePolicy.fromSdkCalls({
           resources: [this.clusterArn],

diff --git a/...-zookeeper.js.snapshot/KafkaZookeeperIntegTestDefaultTestDeployAssert731E1402.assets.json b/...-zookeeper.js.snapshot/KafkaZookeeperIntegTestDefaultTestDeployAssert731E1402.assets.json
diff --git a/...ws-msk-alpha/test/integ.cluster-zookeeper.js.snapshot/KafkaZookeeperTestStack.assets.json b/...ws-msk-alpha/test/integ.cluster-zookeeper.js.snapshot/KafkaZookeeperTestStack.assets.json
diff --git a/...-msk-alpha/test/integ.cluster-zookeeper.js.snapshot/KafkaZookeeperTestStack.template.json b/...-msk-alpha/test/integ.cluster-zookeeper.js.snapshot/KafkaZookeeperTestStack.template.json
@@ -477,7 +477,7 @@
        {
         "Ref": "ClusterZookeeper29ECF2D7"
        },
-       "\"},\"physicalResourceId\":{\"id\":\"ZooKeeperConnectionString\"}}"
+       "\"},\"physicalResourceId\":{\"id\":\"ZooKeeperConnectionString\"},\"outputPaths\":[\"ClusterInfo.ZookeeperConnectString\",\"ClusterInfo.ZookeeperConnectStringTls\"]}"
       ]
      ]
     },
@@ -489,7 +489,7 @@
        {
         "Ref": "ClusterZookeeper29ECF2D7"
        },
-       "\"},\"physicalResourceId\":{\"id\":\"ZooKeeperConnectionString\"}}"
+       "\"},\"physicalResourceId\":{\"id\":\"ZooKeeperConnectionString\"},\"outputPaths\":[\"ClusterInfo.ZookeeperConnectString\",\"ClusterInfo.ZookeeperConnectStringTls\"]}"
       ]
      ]
     },
@@ -562,7 +562,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "e5178afc49b7c6a85127a67856ce958e4f0879ce6aad5e974cac2a088bf939db.zip"
+     "S3Key": "b0de6372e1c756b7afa1a8a1d0a21ee4cd330150290abffc9bc163f285150514.zip"
     },
     "Handler": "index.handler",
     "Role": {

diff --git a/....snapshot/asset.b0de6372e1c756b7afa1a8a1d0a21ee4cd330150290abffc9bc163f285150514/index.js b/....snapshot/asset.b0de6372e1c756b7afa1a8a1d0a21ee4cd330150290abffc9bc163f285150514/index.js
diff --git a/....snapshot/asset.e5178afc49b7c6a85127a67856ce958e4f0879ce6aad5e974cac2a088bf939db/index.js b/....snapshot/asset.e5178afc49b7c6a85127a67856ce958e4f0879ce6aad5e974cac2a088bf939db/index.js
diff --git a/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-zookeeper.js.snapshot/cdk.out b/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-zookeeper.js.snapshot/cdk.out
diff --git a/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-zookeeper.js.snapshot/integ.json b/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-zookeeper.js.snapshot/integ.json
diff --git a/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-zookeeper.js.snapshot/manifest.json b/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-zookeeper.js.snapshot/manifest.json
diff --git a/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-zookeeper.js.snapshot/tree.json b/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-zookeeper.js.snapshot/tree.json
diff --git a/packages/@aws-cdk/cloudformation-diff/package.json b/packages/@aws-cdk/cloudformation-diff/package.json
@@ -23,8 +23,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-cdk/aws-service-spec": "^0.0.30",
-    "@aws-cdk/service-spec-types": "^0.0.30",
+    "@aws-cdk/aws-service-spec": "^0.0.32",
+    "@aws-cdk/service-spec-types": "^0.0.32",
     "chalk": "^4",
     "diff": "^5.1.0",
     "fast-deep-equal": "^3.1.3",

diff --git a/packages/@aws-cdk/integ-runner/package.json b/packages/@aws-cdk/integ-runner/package.json
@@ -74,7 +74,7 @@
     "@aws-cdk/cloud-assembly-schema": "0.0.0",
     "@aws-cdk/cloudformation-diff": "0.0.0",
     "@aws-cdk/cx-api": "0.0.0",
-    "@aws-cdk/aws-service-spec": "^0.0.30",
+    "@aws-cdk/aws-service-spec": "^0.0.32",
     "cdk-assets": "0.0.0",
     "@aws-cdk/cdk-cli-wrapper": "0.0.0",
     "aws-cdk": "0.0.0",

diff --git a/packages/aws-cdk-lib/aws-backupgateway/.jsiirc.json b/packages/aws-cdk-lib/aws-backupgateway/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.backupgateway"
+      "package": "software.amazon.awscdk.services.backupgateway"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.BackupGateway"

diff --git a/packages/aws-cdk-lib/aws-cleanrooms/.jsiirc.json b/packages/aws-cdk-lib/aws-cleanrooms/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.cleanrooms"
+      "package": "software.amazon.awscdk.services.cleanrooms"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.CleanRooms"

diff --git a/packages/aws-cdk-lib/aws-ec2/README.md b/packages/aws-cdk-lib/aws-ec2/README.md
@@ -1945,6 +1945,8 @@ const launchTemplate = new ec2.LaunchTemplate(this, 'LaunchTemplate', {
 });
 ```
 
+Please note this feature does not support Launch Configurations.
+
 ## Detailed Monitoring
 
 The following demonstrates how to enable [Detailed Monitoring](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-cloudwatch-new.html) for an EC2 instance. Keep in mind that Detailed Monitoring results in [additional charges](http://aws.amazon.com/cloudwatch/pricing/).

diff --git a/packages/aws-cdk-lib/aws-entityresolution/.jsiirc.json b/packages/aws-cdk-lib/aws-entityresolution/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.entityresolution"
+      "package": "software.amazon.awscdk.services.entityresolution"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.EntityResolution"