Merge branch 'main' into conroy/app-synth

aws · Aug 2, 2023 · c6a2ea1 · c6a2ea1
2 parents eb7b6f9 + 4c57f45
commit c6a2ea1
Show file tree

Hide file tree

Showing 51 changed files with 19,791 additions and 13,166 deletions.
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "build-all": "tsc -b"
   },
   "devDependencies": {
-    "@nx/workspace": "^16.5.5",
+    "@nx/workspace": "^16.6.0",
     "@types/node": "18.11.19",
     "@types/prettier": "2.6.0",
     "@yarnpkg/lockfile": "^1.1.0",
@@ -24,12 +24,12 @@
     "fs-extra": "^9.1.0",
     "graceful-fs": "^4.2.11",
     "jest-junit": "^13.2.0",
-    "jsii-diff": "1.85.0",
-    "jsii-pacmak": "1.85.0",
-    "jsii-reflect": "1.85.0",
-    "jsii-rosetta": "~5.1.8",
-    "lerna": "^7.0.1",
-    "nx": "^16.5.5",
+    "jsii-diff": "1.86.0",
+    "jsii-pacmak": "1.86.0",
+    "jsii-reflect": "1.86.0",
+    "jsii-rosetta": "~5.1.9",
+    "lerna": "^7.1.4",
+    "nx": "^16.6.0",
     "patch-package": "^6.5.1",
     "semver": "^7.5.4",
     "standard-version": "^9.5.0",
@@ -173,4 +173,4 @@
   "dependencies": {
     "string-width": "^4.2.3"
   }
-}
+}
diff --git a/packages/@aws-cdk-testing/cli-integ/package.json b/packages/@aws-cdk-testing/cli-integ/package.json
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@octokit/rest": "^18.12.0",
-    "aws-sdk": "^2.1423.0",
+    "aws-sdk": "^2.1427.0",
     "axios": "^0.27.2",
     "fs-extra": "^9.1.0",
     "glob": "^7.2.3",

diff --git a/packages/@aws-cdk-testing/framework-integ/package.json b/packages/@aws-cdk-testing/framework-integ/package.json
@@ -39,9 +39,9 @@
     "@aws-cdk/integ-tests-alpha": "0.0.0",
     "@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
     "aws-cdk-lib": "0.0.0",
-    "aws-sdk": "^2.1423.0",
+    "aws-sdk": "^2.1427.0",
     "aws-sdk-mock": "5.6.0",
-    "cdk8s": "^2.21.0",
+    "cdk8s": "^2.30.0",
     "cdk8s-plus-24": "2.12.1",
     "constructs": "^10.0.0"
   },

diff --git a/.../asset.ba598c1f1d84f7077ea9c16a6b921e4f8acf18e996100e72a8f17da980e64fdd/__entrypoint__.js b/.../asset.ba598c1f1d84f7077ea9c16a6b921e4f8acf18e996100e72a8f17da980e64fdd/__entrypoint__.js
diff --git a/....snapshot/asset.ba598c1f1d84f7077ea9c16a6b921e4f8acf18e996100e72a8f17da980e64fdd/index.js b/....snapshot/asset.ba598c1f1d84f7077ea9c16a6b921e4f8acf18e996100e72a8f17da980e64fdd/index.js
diff --git a/...finition-placement-constraints.js.snapshot/aws-cdk-ecs-integration-test-stack.assets.json b/...finition-placement-constraints.js.snapshot/aws-cdk-ecs-integration-test-stack.assets.json
@@ -0,0 +1,32 @@
+{
+  "version": "32.0.0",
+  "files": {
+    "ba598c1f1d84f7077ea9c16a6b921e4f8acf18e996100e72a8f17da980e64fdd": {
+      "source": {
+        "path": "asset.ba598c1f1d84f7077ea9c16a6b921e4f8acf18e996100e72a8f17da980e64fdd",
+        "packaging": "zip"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "ba598c1f1d84f7077ea9c16a6b921e4f8acf18e996100e72a8f17da980e64fdd.zip",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    },
+    "0a9ca3828434fca52688d82a6c9438b44fc25f418219dcc41eefa938e401e99b": {
+      "source": {
+        "path": "aws-cdk-ecs-integration-test-stack.template.json",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "0a9ca3828434fca52688d82a6c9438b44fc25f418219dcc41eefa938e401e99b.json",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    }
+  },
+  "dockerImages": {}
+}