Merge branch 'main' into ecs-enable-fis

aws · Dec 19, 2024 · 50478e4 · 50478e4
2 parents 35008e6 + cbacf4d
commit 50478e4
Show file tree

Hide file tree

Showing 309 changed files with 11,616 additions and 2,285 deletions.
diff --git a/aws-cdk.code-workspace b/aws-cdk.code-workspace
@@ -31,7 +31,7 @@
         "name": "aws-custom-resource-sdk-adapter",
         "rootPath": "packages/@aws-cdk/aws-custom-resource-sdk-adapter"
       },
-      { "name": "yargs-gen", "rootPath": "tools/@aws-cdk/yargs-gen" }
+      { "name": "cli-args-gen", "rootPath": "tools/@aws-cdk/cli-args-gen" }
     ]
   },
   "extensions": {

diff --git a/codecov.yml b/codecov.yml
@@ -30,3 +30,7 @@ component_management:
       name: packages/aws-cdk # display name that can change freely
       paths:
         - packages/aws-cdk/**
+
+# https://docs.codecov.com/docs/ignoring-paths
+ignore:
+  - packages/aws-cdk/lib/parse-command-line-arguments.ts # this file is generated and some lines cannot be tested
diff --git a/lerna.json b/lerna.json
@@ -10,7 +10,7 @@
     "packages/@aws-cdk-testing/*",
     "packages/@aws-cdk/*/lambda-packages/*",
     "tools/@aws-cdk/cdk-build-tools",
-    "tools/@aws-cdk/yargs-gen",
+    "tools/@aws-cdk/cli-args-gen",
     "tools/@aws-cdk/cdk-release",
     "tools/@aws-cdk/node-bundle",
     "tools/@aws-cdk/pkglint",

diff --git a/package.json b/package.json
@@ -77,7 +77,7 @@
       "packages/@aws-cdk-testing/*",
       "packages/@aws-cdk/*/lambda-packages/*",
       "tools/@aws-cdk/cdk-build-tools",
-      "tools/@aws-cdk/yargs-gen",
+      "tools/@aws-cdk/cli-args-gen",
       "tools/@aws-cdk/cdk-release",
       "tools/@aws-cdk/node-bundle",
       "tools/@aws-cdk/pkglint",

diff --git a/packages/@aws-cdk-testing/cli-integ/bin/query-github.ts b/packages/@aws-cdk-testing/cli-integ/bin/query-github.ts
@@ -1,4 +1,3 @@
-// eslint-disable-next-line jest/no-jest-import
 import * as yargs from 'yargs';
 import { fetchPreviousVersion } from '../lib/github';
 

diff --git a/packages/@aws-cdk-testing/cli-integ/bin/run-suite.ts b/packages/@aws-cdk-testing/cli-integ/bin/run-suite.ts
@@ -1,6 +1,5 @@
 /* eslint-disable no-console */
 import * as path from 'path';
-// eslint-disable-next-line jest/no-jest-import
 import * as jest from 'jest';
 import * as yargs from 'yargs';
 import { ReleasePackageSourceSetup } from '../lib/package-sources/release-source';

diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts
@@ -1114,7 +1114,7 @@ integTest(
     await diffShouldSucceedWith({ fail: undefined, enableDiffNoFail: true });
 
     async function diffShouldSucceedWith(props: DiffParameters) {
-      await expect(diff(props)).resolves.not.toThrowError();
+      await expect(diff(props)).resolves.not.toThrow();
     }
 
     async function diffShouldFailWith(props: DiffParameters) {

diff --git a/...8c9c783676b3fa53a494d04b5/cfn-response.js → ...f28cf423c3afd3cbaf0662e6b/cfn-response.js b/...8c9c783676b3fa53a494d04b5/cfn-response.js → ...f28cf423c3afd3cbaf0662e6b/cfn-response.js
diff --git a/...de79288c9c783676b3fa53a494d04b5/consts.js → ...d31520f28cf423c3afd3cbaf0662e6b/consts.js b/...de79288c9c783676b3fa53a494d04b5/consts.js → ...d31520f28cf423c3afd3cbaf0662e6b/consts.js
diff --git a/...9288c9c783676b3fa53a494d04b5/framework.js → ...520f28cf423c3afd3cbaf0662e6b/framework.js b/...9288c9c783676b3fa53a494d04b5/framework.js → ...520f28cf423c3afd3cbaf0662e6b/framework.js
diff --git a/...79288c9c783676b3fa53a494d04b5/outbound.js → ...1520f28cf423c3afd3cbaf0662e6b/outbound.js b/...79288c9c783676b3fa53a494d04b5/outbound.js → ...1520f28cf423c3afd3cbaf0662e6b/outbound.js
diff --git a/...f5de79288c9c783676b3fa53a494d04b5/util.js → ...7dd31520f28cf423c3afd3cbaf0662e6b/util.js b/...f5de79288c9c783676b3fa53a494d04b5/util.js → ...7dd31520f28cf423c3afd3cbaf0662e6b/util.js
diff --git a/...replicas-provisioned.js.snapshot/aws-cdk-dynamodb-global-replicas-provisioned.assets.json b/...replicas-provisioned.js.snapshot/aws-cdk-dynamodb-global-replicas-provisioned.assets.json
diff --git a/...plicas-provisioned.js.snapshot/aws-cdk-dynamodb-global-replicas-provisioned.template.json b/...plicas-provisioned.js.snapshot/aws-cdk-dynamodb-global-replicas-provisioned.template.json
@@ -291,7 +291,7 @@
        {
         "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
        },
-       "/5c0f7be02b4e69e39de079b2942aa05f6c48601e5bdca08cf1a5bf5cd237965a.json"
+       "/d0e51246341d2567827b1fdd35281e7e5d6bcd79ba28cf4873b65a573acb4f14.json"
       ]
      ]
     }

diff --git a/...odbglobalreplicasprovisionedawscdkawsdynamodbReplicaProviderEA32CB30.nested.template.json b/...odbglobalreplicasprovisionedawscdkawsdynamodbReplicaProviderEA32CB30.nested.template.json
@@ -444,7 +444,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "fe4094cd52f099e46f858f05efdde02f5de79288c9c783676b3fa53a494d04b5.zip"
+     "S3Key": "9ebfbf95d93057cd65617a9d6f72a0e7dd31520f28cf423c3afd3cbaf0662e6b.zip"
     },
     "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-dynamodb-global-replicas-provisioned/@aws-cdk--aws-dynamodb.ReplicaProvider/Provider)",
     "Environment": {
@@ -589,7 +589,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "fe4094cd52f099e46f858f05efdde02f5de79288c9c783676b3fa53a494d04b5.zip"
+     "S3Key": "9ebfbf95d93057cd65617a9d6f72a0e7dd31520f28cf423c3afd3cbaf0662e6b.zip"
     },
     "Description": "AWS CDK resource provider framework - isComplete (aws-cdk-dynamodb-global-replicas-provisioned/@aws-cdk--aws-dynamodb.ReplicaProvider/Provider)",
     "Environment": {
@@ -731,7 +731,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "fe4094cd52f099e46f858f05efdde02f5de79288c9c783676b3fa53a494d04b5.zip"
+     "S3Key": "9ebfbf95d93057cd65617a9d6f72a0e7dd31520f28cf423c3afd3cbaf0662e6b.zip"
     },
     "Description": "AWS CDK resource provider framework - onTimeout (aws-cdk-dynamodb-global-replicas-provisioned/@aws-cdk--aws-dynamodb.ReplicaProvider/Provider)",
     "Environment": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -291,7 +291,7 @@ @@
            {
             "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
            },
-           "/5c0f7be02b4e69e39de079b2942aa05f6c48601e5bdca08cf1a5bf5cd237965a.json"
+           "/d0e51246341d2567827b1fdd35281e7e5d6bcd79ba28cf4873b65a573acb4f14.json"
           ]
          ]
         }
@@ Expand Down @@