Merge branch 'main' into huijbers/warn-about-force

aws · Nov 27, 2023 · 6163812 · 6163812
2 parents e15d761 + c54ac33
commit 6163812
Show file tree

Hide file tree

Showing 17 changed files with 53 additions and 75 deletions.
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/package.json b/packages/aws-cdk-lib/package.json
@@ -133,7 +133,7 @@
     "yaml": "1.10.2"
   },
   "devDependencies": {
-    "@aws-cdk/aws-service-spec": "^0.0.30",
+    "@aws-cdk/aws-service-spec": "^0.0.32",
     "@aws-cdk/cdk-build-tools": "0.0.0",
     "@aws-cdk/custom-resource-handlers": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",