Merge branch 'main' into alb

Author: badmintoncryer

allowed-breaking-changes.txt

@@ -4004,4 +4004,8 @@ move:aws-cdk-lib.ResourceEnvironment
 removed:aws-cdk-lib.aws_dynamodb.Table.table
 
 # Making aws-dynamodb partitionKey optional to support schema() function and compound keys
-weakened:aws-cdk-lib.aws_dynamodb.SchemaOptions
+weakened:aws-cdk-lib.aws_dynamodb.SchemaOptions
+
+# property unconfiguredBehavesLike is deprecated and had its type changed
+strengthened:aws-cdk-lib.cloud_assembly_schema.FeatureFlag
+weakened:aws-cdk-lib.cloud_assembly_schema.FeatureFlag

lerna.json

@@ -9,6 +9,7 @@
     "packages/@aws-cdk-containers/*",
     "packages/@aws-cdk-testing/*",
     "packages/@aws-cdk/*/lambda-packages/*",
+    "tools/@aws-cdk/eslint-config",
     "tools/@aws-cdk/cdk-build-tools",
     "tools/@aws-cdk/user-input-gen",
     "tools/@aws-cdk/cdk-release",

package.json

@@ -28,14 +28,14 @@
     "fs-extra": "^9.1.0",
     "graceful-fs": "^4.2.11",
     "jest-junit": "^13.2.0",
-    "jsii-diff": "1.119.0",
-    "jsii-pacmak": "1.119.0",
-    "jsii-reflect": "1.119.0",
+    "jsii-diff": "1.120.0",
+    "jsii-pacmak": "1.120.0",
+    "jsii-reflect": "1.120.0",
     "lerna": "^8.2.4",
     "nx": "^20",
-    "semver": "^7.7.2",
+    "semver": "^7.7.3",
     "standard-version": "^9.5.0",
-    "ts-jest": "^29.4.1",
+    "ts-jest": "^29.4.6",
     "ts-node": "^10.9.2",
     "typescript": "~5.5.4"
   },
@@ -80,6 +80,7 @@
       "packages/awslint",
       "packages/@aws-cdk-testing/*",
       "packages/@aws-cdk/*/lambda-packages/*",
+      "tools/@aws-cdk/eslint-config",
       "tools/@aws-cdk/cdk-build-tools",
       "tools/@aws-cdk/user-input-gen",
       "tools/@aws-cdk/cdk-release",
@@ -95,9 +96,9 @@
       "scripts/@aws-cdk/script-tests"
     ],
     "nohoist": [
+      "**/@types/glob",
       "**/jszip",
       "**/jszip/**",
-      "**/@types/glob",
       "@aws-cdk/assertions-alpha/fs-extra",
       "@aws-cdk/assertions-alpha/fs-extra/**",
       "@aws-cdk/assertions/fs-extra",
@@ -146,6 +147,8 @@
       "@aws-cdk/core/yaml/**",
       "@aws-cdk/cx-api/semver",
       "@aws-cdk/cx-api/semver/**",
+      "@aws-cdk/mixins-preview/minimatch",
+      "@aws-cdk/mixins-preview/minimatch/**",
       "@aws-cdk/pipelines/aws-sdk",
       "@aws-cdk/pipelines/aws-sdk/**",
       "@aws-cdk/yaml-cfn/yaml",

packages/@aws-cdk-testing/framework-integ/.eslintrc.js

@@ -4,7 +4,7 @@
 .LAST_BUILD
 *.snk
 junit.xml
-!.eslintrc.js
+!eslint.config.mjs
 .nyc_output
 coverage
 nyc.config.js

packages/@aws-cdk-testing/framework-integ/.gitignore

@@ -2,6 +2,6 @@
 .LAST_BUILD
 *.snk
 junit.xml
-.eslintrc.js
+eslint.config.mjs
 # exclude cdk artifacts
 **/cdk.out

packages/@aws-cdk-testing/framework-integ/.npmignore

@@ -0,0 +1,11 @@
+import { makeConfig } from '@aws-cdk/eslint-config';
+
+const config = makeConfig('tsconfig.json');
+for (const c of config) {
+    // Disable import/order rule, it's being violated all over the place
+    if (c.rules) {
+        c.rules['import/order'] = ['off'];
+    }
+}
+
+export default config;

packages/@aws-cdk-testing/framework-integ/eslint.config.mjs

@@ -36,7 +36,7 @@
     "@aws-sdk/client-rds": "3.632.0",
     "@aws-sdk/client-s3": "3.632.0",
     "@aws-sdk/client-cognito-identity-provider": "3.632.0",
-    "axios": "^1.12.0",
+    "axios": "^1.13.2",
     "delay": "5.0.0"
   },
   "dependencies": {
@@ -50,7 +50,7 @@
     "@aws-cdk/lambda-layer-kubectl-v34": "^2.0.0",
     "@aws-cdk/region-info": "0.0.0",
     "aws-cdk-lib": "0.0.0",
-    "cdk8s": "2.70.11",
+    "cdk8s": "2.70.30",
     "cdk8s-plus-27": "2.9.5",
     "constructs": "^10.0.0"
   },

packages/@aws-cdk-testing/framework-integ/jest.config.js.bak

@@ -0,0 +1,8 @@
+{
+  "Description": "foo bar",
+  "Resources": {
+    "TopicProductD757E287": {
+      "Type": "AWS::SNS::Topic"
+    }
+  }
+}