Merge branch 'main' into nlb-tcp-idle-timeout-31310

aws · Oct 8, 2024 · 0bb92c5 · 0bb92c5
2 parents bef3d2c + b766a83
commit 0bb92c5
Show file tree

Hide file tree

Showing 147 changed files with 3,725 additions and 5,612 deletions.
diff --git a/lerna.json b/lerna.json
@@ -11,7 +11,6 @@
     "packages/@aws-cdk/*/lambda-packages/*",
     "tools/@aws-cdk/cdk-build-tools",
     "tools/@aws-cdk/cdk-release",
-    "tools/@aws-cdk/eslint-plugin",
     "tools/@aws-cdk/node-bundle",
     "tools/@aws-cdk/pkglint",
     "tools/@aws-cdk/pkgtools",

diff --git a/package.json b/package.json
@@ -79,7 +79,6 @@
       "packages/@aws-cdk/*/lambda-packages/*",
       "tools/@aws-cdk/cdk-build-tools",
       "tools/@aws-cdk/cdk-release",
-      "tools/@aws-cdk/eslint-plugin",
       "tools/@aws-cdk/node-bundle",
       "tools/@aws-cdk/pkglint",
       "tools/@aws-cdk/pkgtools",

diff --git a/packages/@aws-cdk-testing/cli-integ/lib/with-cdk-app.ts b/packages/@aws-cdk-testing/cli-integ/lib/with-cdk-app.ts
@@ -535,15 +535,15 @@ export class TestFixture extends ShellHelper {
     // Bootstrap stacks have buckets that need to be cleaned
     const bucketNames = stacksToDelete.map(stack => outputFromStack('BucketName', stack)).filter(defined);
     // Parallelism will be reasonable
-    // eslint-disable-next-line @aws-cdk/promiseall-no-unbounded-parallelism
+    // eslint-disable-next-line @cdklabs/promiseall-no-unbounded-parallelism
     await Promise.all(bucketNames.map(b => this.aws.emptyBucket(b)));
     // The bootstrap bucket has a removal policy of RETAIN by default, so add it to the buckets to be cleaned up.
     this.bucketsToDelete.push(...bucketNames);
 
     // Bootstrap stacks have ECR repositories with images which should be deleted
     const imageRepositoryNames = stacksToDelete.map(stack => outputFromStack('ImageRepositoryName', stack)).filter(defined);
     // Parallelism will be reasonable
-    // eslint-disable-next-line @aws-cdk/promiseall-no-unbounded-parallelism
+    // eslint-disable-next-line @cdklabs/promiseall-no-unbounded-parallelism
     await Promise.all(imageRepositoryNames.map(r => this.aws.deleteImageRepository(r)));
 
     await this.aws.deleteStacks(

diff --git a/packages/@aws-cdk-testing/cli-integ/test/resource-pool.test.ts b/packages/@aws-cdk-testing/cli-integ/test/resource-pool.test.ts
@@ -51,7 +51,7 @@ test('somewhat balance', async () => {
 
   const keys = Object.keys(counters) as Array<keyof typeof counters> ;
   const pool = ResourcePool.withResources(POOL_NAME, keys);
-  // eslint-disable-next-line @aws-cdk/promiseall-no-unbounded-parallelism
+  // eslint-disable-next-line @cdklabs/promiseall-no-unbounded-parallelism
   await Promise.all(Array.from(range(N)).map(() =>
     pool.using(async (x) => {
       counters[x] += 1;

diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrapping.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrapping.integtest.ts
@@ -1,4 +1,4 @@
-/* eslint-disable @aws-cdk/no-literal-partition */
+/* eslint-disable @cdklabs/no-literal-partition */
 import * as fs from 'fs';
 import * as path from 'path';
 import { DescribeStackResourcesCommand, DescribeStacksCommand } from '@aws-sdk/client-cloudformation';

diff --git a/...sting/framework-integ/test/aws-cloudformation/test/integ.core-custom-resources-node-18.ts b/...sting/framework-integ/test/aws-cloudformation/test/integ.core-custom-resources-node-18.ts
@@ -10,7 +10,7 @@ import { App, CfnOutput, CustomResource, CustomResourceProvider, CustomResourceP
 import { Construct } from 'constructs';
 import { IntegTest } from '@aws-cdk/integ-tests-alpha';
 
-/* eslint-disable @aws-cdk/no-core-construct */
+/* eslint-disable @cdklabs/no-core-construct */
 
 class TestStack extends Stack {
   constructor(scope: Construct, id: string) {

diff --git a/...s-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.core-custom-resources.ts b/...s-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.core-custom-resources.ts
@@ -10,7 +10,7 @@ import { App, CfnOutput, CustomResource, CustomResourceProvider, Stack, Token }
 import { Construct } from 'constructs';
 import { STANDARD_CUSTOM_RESOURCE_PROVIDER_RUNTIME } from '../../config';
 
-/* eslint-disable @aws-cdk/no-core-construct */
+/* eslint-disable @cdklabs/no-core-construct */
 
 class TestStack extends Stack {
   constructor(scope: Construct, id: string) {

diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.nested-stack.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.nested-stack.ts
@@ -6,7 +6,7 @@ import { App, CfnParameter, NestedStack, Stack } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 import { STANDARD_NODEJS_RUNTIME } from '../../config';
 
-/* eslint-disable @aws-cdk/no-core-construct */
+/* eslint-disable @cdklabs/no-core-construct */
 
 interface MyNestedStackProps {
   readonly subscriber?: sqs.Queue;

diff --git a/...ws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.nested-stacks-assets.ts b/...ws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.nested-stacks-assets.ts
@@ -4,7 +4,7 @@ import { App, NestedStack, Stack } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 import { STANDARD_NODEJS_RUNTIME } from '../../config';
 
-/* eslint-disable @aws-cdk/no-core-construct */
+/* eslint-disable @cdklabs/no-core-construct */
 
 class MyNestedStack extends NestedStack {
   constructor(scope: Construct, id: string) {

diff --git a/...aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.nested-stacks-multi.ts b/...aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.nested-stacks-multi.ts
@@ -2,7 +2,7 @@ import * as sns from 'aws-cdk-lib/aws-sns';
 import { App, NestedStack, Stack } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 
-/* eslint-disable @aws-cdk/no-core-construct */
+/* eslint-disable @cdklabs/no-core-construct */
 
 class YourNestedStack extends NestedStack {
   constructor(scope: Construct, id: string) {

diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/test-origin.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/test-origin.ts
@@ -11,7 +11,7 @@ export class TestOrigin extends OriginBase {
 
 export class TestOriginGroup implements IOrigin {
   constructor(private readonly primaryDomainName: string, private readonly secondaryDomainName: string) { }
-  /* eslint-disable @aws-cdk/no-core-construct */
+  /* eslint-disable @cdklabs/no-core-construct */
   public bind(scope: Construct, options: OriginBindOptions): OriginBindConfig {
     const primaryOrigin = new TestOrigin(this.primaryDomainName);
     const secondaryOrigin = new TestOrigin(this.secondaryDomainName);

diff --git a/...429f9754ea6461ae81fc3a7/__entrypoint__.js → ...5e7b4917b12359a44437b9d/__entrypoint__.js b/...429f9754ea6461ae81fc3a7/__entrypoint__.js → ...5e7b4917b12359a44437b9d/__entrypoint__.js
diff --git a/...be973c88a429f9754ea6461ae81fc3a7/index.js → ...49d07fbc05e7b4917b12359a44437b9d/index.js b/...be973c88a429f9754ea6461ae81fc3a7/index.js → ...49d07fbc05e7b4917b12359a44437b9d/index.js
diff --git a/...nteg.bucket-auto-delete-objects.js.snapshot/cdk-s3-bucket-auto-delete-objects.assets.json b/...nteg.bucket-auto-delete-objects.js.snapshot/cdk-s3-bucket-auto-delete-objects.assets.json
diff --git a/...eg.bucket-auto-delete-objects.js.snapshot/cdk-s3-bucket-auto-delete-objects.template.json b/...eg.bucket-auto-delete-objects.js.snapshot/cdk-s3-bucket-auto-delete-objects.template.json
@@ -207,7 +207,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "4d5b294c39db24ed94c9ed774f730bf5be973c88a429f9754ea6461ae81fc3a7.zip"
+     "S3Key": "ea1d80e97fa5c08dbdf4ef5f6705b6bf49d07fbc05e7b4917b12359a44437b9d.zip"
     },
     "Timeout": 900,
     "MemorySize": 128,

diff --git a/...amework-integ/test/aws-s3/test/integ.bucket-auto-delete-objects.js.snapshot/manifest.json b/...amework-integ/test/aws-s3/test/integ.bucket-auto-delete-objects.js.snapshot/manifest.json
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/put-objects-handler/index.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/put-objects-handler/index.ts
@@ -23,7 +23,7 @@ export async function handler(event: AWSLambda.CloudFormationCustomResourceEvent
 async function putObjects(bucketName: string, n = 5) {
   // Put n objects in parallel
   // Bounded by human input
-  // eslint-disable-next-line @aws-cdk/promiseall-no-unbounded-parallelism
+  // eslint-disable-next-line @cdklabs/promiseall-no-unbounded-parallelism
   await Promise.all([...Array(n).keys()]
     .map(key => s3.putObject({
       Bucket: bucketName,

diff --git a/packages/@aws-cdk/aws-pipes-targets-alpha/README.md b/packages/@aws-cdk/aws-pipes-targets-alpha/README.md
@@ -47,7 +47,7 @@ declare const targetQueue: sqs.Queue;
 const pipeTarget = new targets.SqsTarget(targetQueue);
 
 const pipe = new pipes.Pipe(this, 'Pipe', {
-    source: new SomeSource(sourceQueue),
+    source: new SqsSource(sourceQueue),
     target: pipeTarget
 });
 ```
@@ -68,7 +68,7 @@ const pipeTarget = new targets.SqsTarget(targetQueue,
 );
 
 const pipe = new pipes.Pipe(this, 'Pipe', {
-    source: new SomeSource(sourceQueue),
+    source: new SqsSource(sourceQueue),
     target: pipeTarget
 });
 ```
@@ -84,7 +84,7 @@ declare const targetStateMachine: sfn.IStateMachine;
 const pipeTarget = new targets.SfnStateMachine(targetStateMachine,{});
 
 const pipe = new pipes.Pipe(this, 'Pipe', {
-    source: new SomeSource(sourceQueue),
+    source: new SqsSource(sourceQueue),
     target: pipeTarget
 });
 ```
@@ -102,7 +102,7 @@ const pipeTarget = new targets.SfnStateMachine(targetStateMachine,
 );
 
 const pipe = new pipes.Pipe(this, 'Pipe', {
-    source: new SomeSource(sourceQueue),
+    source: new SqsSource(sourceQueue),
     target: pipeTarget
 });
 ```
@@ -121,7 +121,7 @@ const pipeTarget = new targets.SfnStateMachine(targetStateMachine,
 );
 
 const pipe = new pipes.Pipe(this, 'Pipe', {
-    source: new SomeSource(sourceQueue),
+    source: new SqsSource(sourceQueue),
     target: pipeTarget
 });
 ```
@@ -137,7 +137,7 @@ declare const targetFunction: lambda.IFunction;
 const pipeTarget = new targets.LambdaFunction(targetFunction,{});
 
 const pipe = new pipes.Pipe(this, 'Pipe', {
-    source: new SomeSource(sourceQueue),
+    source: new SqsSource(sourceQueue),
     target: pipeTarget
 });
 ```
@@ -153,7 +153,7 @@ const pipeTarget = new targets.LambdaFunction(targetFunction, {
 });
 
 const pipe = new pipes.Pipe(this, 'Pipe', {
-    source: new SomeSource(sourceQueue),
+    source: new SqsSource(sourceQueue),
     target: pipeTarget
 });
 ```
@@ -169,7 +169,7 @@ const pipeTarget = new targets.LambdaFunction(targetFunction, {
 });
 
 const pipe = new pipes.Pipe(this, 'Pipe', {
-    source: new SomeSource(sourceQueue),
+    source: new SqsSource(sourceQueue),
     target: pipeTarget
 });
 ```

diff --git a/packages/@aws-cdk/aws-pipes-targets-alpha/test/integ.api-destination.ts b/packages/@aws-cdk/aws-pipes-targets-alpha/test/integ.api-destination.ts
@@ -1,5 +1,4 @@
 import { Pipe } from '@aws-cdk/aws-pipes-alpha';
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { SqsSource } from '@aws-cdk/aws-pipes-sources-alpha';
 import { ExpectedResult, IntegTest } from '@aws-cdk/integ-tests-alpha';
 import * as cdk from 'aws-cdk-lib';

diff --git a/packages/@aws-cdk/aws-pipes-targets-alpha/test/integ.kinesis.ts b/packages/@aws-cdk/aws-pipes-targets-alpha/test/integ.kinesis.ts
@@ -1,5 +1,4 @@
 import { Pipe } from '@aws-cdk/aws-pipes-alpha';
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { SqsSource } from '@aws-cdk/aws-pipes-sources-alpha';
 import { IntegTest } from '@aws-cdk/integ-tests-alpha';
 import * as cdk from 'aws-cdk-lib';