diff --git a/.github/workflows/github-merit-badger.yml b/.github/workflows/github-merit-badger.yml index 6b15330b03b84..a095694eebfcc 100644 --- a/.github/workflows/github-merit-badger.yml +++ b/.github/workflows/github-merit-badger.yml @@ -17,4 +17,4 @@ jobs: badges: '[beginning-contributor,repeat-contributor,valued-contributor,admired-contributor,star-contributor,distinguished-contributor]' thresholds: '[0,3,6,13,25,50]' badge-type: 'achievement' - ignore-usernames: '[RomainMuller,rix0rrr,MrArnoldPalmer,iliapolo,otaviomacedo,madeline-k,kaizencc,comcalvi,corymhall,peterwoodworth,ryparker,TheRealAmazonKendra,vinayak-kukreja,Naumel,mrgrain,pahud,cgarvis,kellertk,HBobertz,sumupitchayan,pattasai,SankyRed,udaypant,colifran,aws-cdk-automation,dependabot[bot],mergify[bot]]' + ignore-usernames: '[RomainMuller,rix0rrr,MrArnoldPalmer,iliapolo,otaviomacedo,madeline-k,kaizencc,comcalvi,corymhall,peterwoodworth,ryparker,TheRealAmazonKendra,vinayak-kukreja,Naumel,mrgrain,pahud,cgarvis,kellertk,HBobertz,sumupitchayan,pattasai,SankyRed,udaypant,colifran,khushail,aws-cdk-automation,dependabot[bot],mergify[bot]]' diff --git a/CHANGELOG.v2.alpha.md b/CHANGELOG.v2.alpha.md index 39a62f6d040ef..f27e4d70dd031 100644 --- a/CHANGELOG.v2.alpha.md +++ b/CHANGELOG.v2.alpha.md @@ -2,6 +2,14 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [2.79.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.78.0-alpha.0...v2.79.0-alpha.0) (2023-05-10) + + +### Bug Fixes + +* **servicecatalogappregistry:** Revert deprecated method to keep deprecated method in alpha version ([b20b123](https://github.com/aws/aws-cdk/commit/b20b1f231e12007e7d064cdc4f0c9dc7354827a3)) +* **batch:** JobDefinition's ContainerDefinition's Image is synthesized with `[Object object]` ([#25250](https://github.com/aws/aws-cdk/issues/25250)) ([b3d0d57](https://github.com/aws/aws-cdk/commit/b3d0d570fe02e124f4497e35eb87c96c0eb8a1d5)) + ## [2.78.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.77.0-alpha.0...v2.78.0-alpha.0) (2023-05-03) ## [2.77.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.76.0-alpha.0...v2.77.0-alpha.0) (2023-04-26) diff --git a/CHANGELOG.v2.md b/CHANGELOG.v2.md index 8c93a672d6d92..4748fb23ddb77 100644 --- a/CHANGELOG.v2.md +++ b/CHANGELOG.v2.md @@ -2,6 +2,25 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [2.79.0](https://github.com/aws/aws-cdk/compare/v2.78.0...v2.79.0) (2023-05-10) + + +### Features + +* **cfnspec:** cloudformation spec v121.0 ([#25499](https://github.com/aws/aws-cdk/issues/25499)) ([c2ef657](https://github.com/aws/aws-cdk/commit/c2ef6571b7971384a60866b14371f204d30756cd)) +* **ecr:** grantRead on repositories ([#25445](https://github.com/aws/aws-cdk/issues/25445)) ([ce7bdea](https://github.com/aws/aws-cdk/commit/ce7bdea1d1b79de517b2b7ff6d4d73212f8a84c3)) +* **logs:** support DataProtectionPolicy in LogGroup construct ([#23402](https://github.com/aws/aws-cdk/issues/23402)) ([ed3962a](https://github.com/aws/aws-cdk/commit/ed3962af3a7e532d9a4d16fadb5f472dd065b43f)), closes [#23399](https://github.com/aws/aws-cdk/issues/23399) + + +### Bug Fixes + +* **batch:** JobDefinition's ContainerDefinition's Image is synthesized with `[Object object]` ([#25466](https://github.com/aws/aws-cdk/issues/25466)) ([b3d0d57](https://github.com/aws/aws-cdk/commit/b3d0d570fe02e124f4497e35eb87c96c0eb8a1d5)), closes [#25250](https://github.com/aws/aws-cdk/issues/25250) +* **cfn2ts:** doesn't handle property types with the same type as a primitive type ([#25460](https://github.com/aws/aws-cdk/issues/25460)) ([b76c182](https://github.com/aws/aws-cdk/commit/b76c18287ce452f5b5d27af68028e9f6b47d67b5)), closes [aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoT.json#L1437-L1442](https://github.com/aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoT.json/issues/L1437-L1442) [aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoT.json#L1727-L1742](https://github.com/aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoT.json/issues/L1727-L1742) [#22732](https://github.com/aws/aws-cdk/issues/22732) +* **core:** crossRegionReferences don't work across multiple regions ([#25384](https://github.com/aws/aws-cdk/issues/25384)) ([65265e1](https://github.com/aws/aws-cdk/commit/65265e1297f47a5e8e85ade620095c5af1082290)), closes [#25190](https://github.com/aws/aws-cdk/issues/25190) [#25377](https://github.com/aws/aws-cdk/issues/25377) +* **dynamodb:** fix hardcoded partition in replica-provider IAM policy ([#25428](https://github.com/aws/aws-cdk/issues/25428)) ([b5b4f66](https://github.com/aws/aws-cdk/commit/b5b4f66396cdc1fae3887f82509d30c4c4c6f6d4)), closes [#25407](https://github.com/aws/aws-cdk/issues/25407) +* **elasticloadbalancingv2:** ALB auth return internal server error ([#24510](https://github.com/aws/aws-cdk/issues/24510)) ([75212eb](https://github.com/aws/aws-cdk/commit/75212ebc7a30d822097223ea39a0d58da6fe8d43)), closes [#21939](https://github.com/aws/aws-cdk/issues/21939) [#19035](https://github.com/aws/aws-cdk/issues/19035) [#18944](https://github.com/aws/aws-cdk/issues/18944) +* **servicecatalogappregistry:** Revert deprecated method removing PR to keep deprecated method in alpha version ([#25454](https://github.com/aws/aws-cdk/issues/25454)) ([b20b1f2](https://github.com/aws/aws-cdk/commit/b20b1f231e12007e7d064cdc4f0c9dc7354827a3)) + ## [2.78.0](https://github.com/aws/aws-cdk/compare/v2.77.0...v2.78.0) (2023-05-03) diff --git a/package.json b/package.json index 4ef682dcbbd8d..530610e6954e8 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "@types/node": "18.11.19", "@types/prettier": "2.6.0", "@yarnpkg/lockfile": "^1.1.0", - "cdk-generate-synthetic-examples": "^0.1.235", + "cdk-generate-synthetic-examples": "^0.1.237", "conventional-changelog-cli": "^2.2.2", "fs-extra": "^9.1.0", "graceful-fs": "^4.2.11", diff --git a/packages/@aws-cdk-testing/cli-integ/package.json b/packages/@aws-cdk-testing/cli-integ/package.json index 479cbfd66cb4f..a510ba2014434 100644 --- a/packages/@aws-cdk-testing/cli-integ/package.json +++ b/packages/@aws-cdk-testing/cli-integ/package.json @@ -30,7 +30,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@types/semver": "^7.3.13", + "@types/semver": "^7.5.0", "@types/yargs": "^15.0.15", "@types/fs-extra": "^9.0.13", "@types/glob": "^7.2.0", @@ -39,7 +39,7 @@ }, "dependencies": { "@octokit/rest": "^18.12.0", - "aws-sdk": "^2.1373.0", + "aws-sdk": "^2.1375.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 index dae7371cfa09a..567ce1ce34cb0 100644 --- a/packages/@aws-cdk-testing/framework-integ/package.json +++ b/packages/@aws-cdk-testing/framework-integ/package.json @@ -37,12 +37,12 @@ }, "dependencies": { "@aws-cdk/integ-tests-alpha": "0.0.0", - "@aws-cdk/lambda-layer-kubectl-v24": "^2.0.186", + "@aws-cdk/lambda-layer-kubectl-v24": "^2.0.188", "aws-cdk-lib": "0.0.0", - "aws-sdk": "^2.1373.0", + "aws-sdk": "^2.1375.0", "aws-sdk-mock": "5.6.0", "cdk8s": "^2.7.56", - "cdk8s-plus-24": "2.7.22", + "cdk8s-plus-24": "2.7.24", "constructs": "^10.0.0" }, "repository": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.assets.json index 55d3142f09251..9b3073d337d44 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.assets.json @@ -14,15 +14,15 @@ } } }, - "68b22621fff135f9e3f225bad7ff80fdf2f45c3d9910af601206a0d9b279933a": { + "6a28458f7bc3d04e4d2b17f9c3da0709bf456e34b06ea7c96111eecb2fddd054": { "source": { - "path": "asset.68b22621fff135f9e3f225bad7ff80fdf2f45c3d9910af601206a0d9b279933a.zip", + "path": "asset.6a28458f7bc3d04e4d2b17f9c3da0709bf456e34b06ea7c96111eecb2fddd054.zip", "packaging": "file" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "68b22621fff135f9e3f225bad7ff80fdf2f45c3d9910af601206a0d9b279933a.zip", + "objectKey": "6a28458f7bc3d04e4d2b17f9c3da0709bf456e34b06ea7c96111eecb2fddd054.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } @@ -53,7 +53,7 @@ } } }, - "700b33b613fbd899489f08c591ff8e002d433573bc48eca4a106e66109f3087f": { + "533487c9e5a2cc1009e664662485074855ae58bca4728d59bdebc81acf8e7e3b": { "source": { "path": "aws-cdk-codepipeline-elastic-beanstalk-deploy.template.json", "packaging": "file" @@ -61,7 +61,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "700b33b613fbd899489f08c591ff8e002d433573bc48eca4a106e66109f3087f.json", + "objectKey": "533487c9e5a2cc1009e664662485074855ae58bca4728d59bdebc81acf8e7e3b.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.template.json index 2b9443286e016..f0e4042dca241 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.template.json @@ -155,7 +155,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "68b22621fff135f9e3f225bad7ff80fdf2f45c3d9910af601206a0d9b279933a.zip" + "S3Key": "6a28458f7bc3d04e4d2b17f9c3da0709bf456e34b06ea7c96111eecb2fddd054.zip" }, "Description": "/opt/awscli/aws" } @@ -440,7 +440,7 @@ "Value": "AWSServiceRoleForElasticBeanstalkManagedUpdates" } ], - "SolutionStackName": "64bit Amazon Linux 2 v5.5.6 running Node.js 16" + "SolutionStackName": "64bit Amazon Linux 2 v5.8.1 running Node.js 16" }, "DependsOn": [ "beastalkapp", @@ -784,7 +784,18 @@ "Version": "2012-10-17" }, "ManagedPolicyArns": [ - "arn:aws:iam::aws:policy/AdministratorAccess-AWSElasticBeanstalk" + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/AdministratorAccess-AWSElasticBeanstalk" + ] + ] + } ] } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/manifest.json index 7c65e0f4af872..89b5ebc2a79e6 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/manifest.json @@ -17,7 +17,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/700b33b613fbd899489f08c591ff8e002d433573bc48eca4a106e66109f3087f.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/533487c9e5a2cc1009e664662485074855ae58bca4728d59bdebc81acf8e7e3b.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -126,7 +126,10 @@ "/aws-cdk-codepipeline-elastic-beanstalk-deploy/beanstlk-env": [ { "type": "aws:cdk:logicalId", - "data": "beanstlkenv" + "data": "beanstlkenv", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_REPLACE" + ] } ], "/aws-cdk-codepipeline-elastic-beanstalk-deploy/Pipeline/Role/Resource": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/tree.json index 81510767614fa..154f906c61154 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/tree.json @@ -217,7 +217,7 @@ "s3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "s3Key": "68b22621fff135f9e3f225bad7ff80fdf2f45c3d9910af601206a0d9b279933a.zip" + "s3Key": "6a28458f7bc3d04e4d2b17f9c3da0709bf456e34b06ea7c96111eecb2fddd054.zip" }, "description": "/opt/awscli/aws" } @@ -700,7 +700,7 @@ "value": "AWSServiceRoleForElasticBeanstalkManagedUpdates" } ], - "solutionStackName": "64bit Amazon Linux 2 v5.5.6 running Node.js 16" + "solutionStackName": "64bit Amazon Linux 2 v5.8.1 running Node.js 16" } }, "constructInfo": { @@ -1121,13 +1121,13 @@ }, "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.270" + "version": "10.2.17" } } }, "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.270" + "version": "10.2.17" } }, "Deploy": { @@ -1184,7 +1184,18 @@ "Version": "2012-10-17" }, "managedPolicyArns": [ - "arn:aws:iam::aws:policy/AdministratorAccess-AWSElasticBeanstalk" + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/AdministratorAccess-AWSElasticBeanstalk" + ] + ] + } ] } }, @@ -1266,13 +1277,13 @@ }, "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.270" + "version": "10.2.17" } } }, "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.270" + "version": "10.2.17" } } }, @@ -1316,7 +1327,7 @@ "path": "codepipeline-elastic-beanstalk-deploy/DefaultTest/Default", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.270" + "version": "10.2.17" } }, "DeployAssert": { @@ -1362,7 +1373,7 @@ "path": "Tree", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.270" + "version": "10.2.17" } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.ts index 892976b254851..c7883d775f071 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.ts +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.ts @@ -78,7 +78,7 @@ const beanstalkApp = new elasticbeanstalk.CfnApplication(stack, 'beastalk-app', const beanstalkEnv = new elasticbeanstalk.CfnEnvironment(stack, 'beanstlk-env', { applicationName: beanstalkApp.applicationName!, environmentName: 'codepipeline-test-env', - solutionStackName: '64bit Amazon Linux 2 v5.5.6 running Node.js 16', + solutionStackName: '64bit Amazon Linux 2 v5.8.1 running Node.js 16', optionSettings: [ { namespace: 'aws:autoscaling:launchconfiguration', diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/sdk-call-integ-test-docker-app/app/package-lock.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/sdk-call-integ-test-docker-app/app/package-lock.json index 20b1107dec633..6f73c11fab615 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/sdk-call-integ-test-docker-app/app/package-lock.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/sdk-call-integ-test-docker-app/app/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "eks-service-account-sdk-call-integ-test", "dependencies": { - "aws-sdk": "^2.1226.0" + "aws-sdk": "^2.1375.0" } }, "node_modules/available-typed-arrays": { @@ -21,9 +21,9 @@ } }, "node_modules/aws-sdk": { - "version": "2.1241.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1241.0.tgz", - "integrity": "sha512-62Zhl5pVD5GN1ZdzEEyNxdH20zMlJBUaiQ7epCHnt+Zp12nd9y0uOHHiWWGDOrECQX/KAUIcDBiE4B04MeqP4g==", + "version": "2.1376.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1376.0.tgz", + "integrity": "sha512-ja/Xnft8BDcDEz786VJFPrWpuWpOgsA+QzBAwzsjYeIolQ/vEs/bbXkoS085fOoeAPEhYWQh9wog7cVvrQPJFQ==", "dependencies": { "buffer": "4.9.2", "events": "1.1.1", @@ -34,7 +34,7 @@ "url": "0.10.3", "util": "^0.12.4", "uuid": "8.0.0", - "xml2js": "0.4.19" + "xml2js": "0.5.0" }, "engines": { "node": ">= 10.0.0" @@ -700,18 +700,21 @@ } }, "node_modules/xml2js": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", - "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz", + "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==", "dependencies": { "sax": ">=0.6.0", - "xmlbuilder": "~9.0.1" + "xmlbuilder": "~11.0.0" + }, + "engines": { + "node": ">=4.0.0" } }, "node_modules/xmlbuilder": { - "version": "9.0.7", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", - "integrity": "sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ==", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", + "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==", "engines": { "node": ">=4.0" } @@ -724,9 +727,9 @@ "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==" }, "aws-sdk": { - "version": "2.1241.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1241.0.tgz", - "integrity": "sha512-62Zhl5pVD5GN1ZdzEEyNxdH20zMlJBUaiQ7epCHnt+Zp12nd9y0uOHHiWWGDOrECQX/KAUIcDBiE4B04MeqP4g==", + "version": "2.1376.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1376.0.tgz", + "integrity": "sha512-ja/Xnft8BDcDEz786VJFPrWpuWpOgsA+QzBAwzsjYeIolQ/vEs/bbXkoS085fOoeAPEhYWQh9wog7cVvrQPJFQ==", "requires": { "buffer": "4.9.2", "events": "1.1.1", @@ -737,7 +740,7 @@ "url": "0.10.3", "util": "^0.12.4", "uuid": "8.0.0", - "xml2js": "0.4.19" + "xml2js": "0.5.0" } }, "base64-js": { @@ -1193,18 +1196,18 @@ } }, "xml2js": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", - "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz", + "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==", "requires": { "sax": ">=0.6.0", - "xmlbuilder": "~9.0.1" + "xmlbuilder": "~11.0.0" } }, "xmlbuilder": { - "version": "9.0.7", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", - "integrity": "sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ==" + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", + "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==" } } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/sdk-call-integ-test-docker-app/app/package.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/sdk-call-integ-test-docker-app/app/package.json index 0cdaaacf4490f..337779322c50a 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/sdk-call-integ-test-docker-app/app/package.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/sdk-call-integ-test-docker-app/app/package.json @@ -2,6 +2,6 @@ "name": "eks-service-account-sdk-call-integ-test", "private": "true", "dependencies": { - "aws-sdk": "^2.1329.0" + "aws-sdk": "^2.1375.0" } } \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/.cache/0f8a80f5f2310ea7e3295258fdbb79c43a1e8c0a11e863e63dc82832599412ed.zip b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/.cache/0f8a80f5f2310ea7e3295258fdbb79c43a1e8c0a11e863e63dc82832599412ed.zip new file mode 100644 index 0000000000000..a8fab6884f47a Binary files /dev/null and b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/.cache/0f8a80f5f2310ea7e3295258fdbb79c43a1e8c0a11e863e63dc82832599412ed.zip differ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/cdk-ses-configuration-set-integ.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/cdk-ses-configuration-set-integ.assets.json index e5a7361222232..0d6eb0203c7d3 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/cdk-ses-configuration-set-integ.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/cdk-ses-configuration-set-integ.assets.json @@ -1,7 +1,7 @@ { "version": "31.0.0", "files": { - "cd65988992d4e34f7f8904d852fb1dd37bab88445e48e7880cbbf26d934cc065": { + "bd889c61b6018acea6fdd262c97b73b9af12855427e235914757eaeea73396ba": { "source": { "path": "cdk-ses-configuration-set-integ.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "cd65988992d4e34f7f8904d852fb1dd37bab88445e48e7880cbbf26d934cc065.json", + "objectKey": "bd889c61b6018acea6fdd262c97b73b9af12855427e235914757eaeea73396ba.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/cdk-ses-configuration-set-integ.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/cdk-ses-configuration-set-integ.template.json index 2e0c8ad0b289e..cf164e9fede59 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/cdk-ses-configuration-set-integ.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/cdk-ses-configuration-set-integ.template.json @@ -85,7 +85,11 @@ "Fn::Join": [ "", [ - "arn:aws:ses:", + "arn:", + { + "Ref": "AWS::Partition" + }, + ":ses:", { "Ref": "AWS::Region" }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/cdk.out index 588d7b269d34f..7925065efbcc4 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/cdk.out +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"20.0.0"} \ No newline at end of file +{"version":"31.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/manifest.json index b80a3f8bd9b10..ca2489ecf8928 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/manifest.json @@ -17,7 +17,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/cd65988992d4e34f7f8904d852fb1dd37bab88445e48e7880cbbf26d934cc065.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/bd889c61b6018acea6fdd262c97b73b9af12855427e235914757eaeea73396ba.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/tree.json index 5071e6385f520..5b689c4832049 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/tree.json @@ -20,7 +20,7 @@ "aws:cdk:cloudformation:props": {} }, "constructInfo": { - "fqn": "@aws-cdk/aws-ses.CfnConfigurationSet", + "fqn": "aws-cdk-lib.aws_ses.CfnConfigurationSet", "version": "0.0.0" } }, @@ -60,13 +60,13 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ses.CfnConfigurationSetEventDestination", + "fqn": "aws-cdk-lib.aws_ses.CfnConfigurationSetEventDestination", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ses.ConfigurationSetEventDestination", + "fqn": "aws-cdk-lib.aws_ses.ConfigurationSetEventDestination", "version": "0.0.0" } }, @@ -110,19 +110,19 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ses.CfnConfigurationSetEventDestination", + "fqn": "aws-cdk-lib.aws_ses.CfnConfigurationSetEventDestination", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ses.ConfigurationSetEventDestination", + "fqn": "aws-cdk-lib.aws_ses.ConfigurationSetEventDestination", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ses.ConfigurationSet", + "fqn": "aws-cdk-lib.aws_ses.ConfigurationSet", "version": "0.0.0" } }, @@ -138,7 +138,7 @@ "aws:cdk:cloudformation:props": {} }, "constructInfo": { - "fqn": "@aws-cdk/aws-sns.CfnTopic", + "fqn": "aws-cdk-lib.aws_sns.CfnTopic", "version": "0.0.0" } }, @@ -165,7 +165,11 @@ "Fn::Join": [ "", [ - "arn:aws:ses:", + "arn:", + { + "Ref": "AWS::Partition" + }, + ":ses:", { "Ref": "AWS::Region" }, @@ -202,19 +206,19 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-sns.CfnTopicPolicy", + "fqn": "aws-cdk-lib.aws_sns.CfnTopicPolicy", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-sns.TopicPolicy", + "fqn": "aws-cdk-lib.aws_sns.TopicPolicy", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-sns.Topic", + "fqn": "aws-cdk-lib.aws_sns.Topic", "version": "0.0.0" } }, @@ -222,7 +226,7 @@ "id": "BootstrapVersion", "path": "cdk-ses-configuration-set-integ/BootstrapVersion", "constructInfo": { - "fqn": "@aws-cdk/core.CfnParameter", + "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" } }, @@ -230,13 +234,13 @@ "id": "CheckBootstrapVersion", "path": "cdk-ses-configuration-set-integ/CheckBootstrapVersion", "constructInfo": { - "fqn": "@aws-cdk/core.CfnRule", + "fqn": "aws-cdk-lib.CfnRule", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/core.Stack", + "fqn": "aws-cdk-lib.Stack", "version": "0.0.0" } }, @@ -253,7 +257,7 @@ "path": "ConfigurationSetInteg/DefaultTest/Default", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.270" + "version": "10.2.17" } }, "DeployAssert": { @@ -264,7 +268,7 @@ "id": "BootstrapVersion", "path": "ConfigurationSetInteg/DefaultTest/DeployAssert/BootstrapVersion", "constructInfo": { - "fqn": "@aws-cdk/core.CfnParameter", + "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" } }, @@ -272,25 +276,25 @@ "id": "CheckBootstrapVersion", "path": "ConfigurationSetInteg/DefaultTest/DeployAssert/CheckBootstrapVersion", "constructInfo": { - "fqn": "@aws-cdk/core.CfnRule", + "fqn": "aws-cdk-lib.CfnRule", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/core.Stack", + "fqn": "aws-cdk-lib.Stack", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/integ-tests.IntegTestCase", + "fqn": "@aws-cdk/integ-tests-alpha.IntegTestCase", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/integ-tests.IntegTest", + "fqn": "@aws-cdk/integ-tests-alpha.IntegTest", "version": "0.0.0" } }, @@ -299,12 +303,12 @@ "path": "Tree", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.270" + "version": "10.2.17" } } }, "constructInfo": { - "fqn": "@aws-cdk/core.App", + "fqn": "aws-cdk-lib.App", "version": "0.0.0" } } diff --git a/packages/@aws-cdk/aws-amplify-alpha/package.json b/packages/@aws-cdk/aws-amplify-alpha/package.json index d19d38d3df5a4..c69f07ff72746 100644 --- a/packages/@aws-cdk/aws-amplify-alpha/package.json +++ b/packages/@aws-cdk/aws-amplify-alpha/package.json @@ -88,7 +88,7 @@ "@aws-cdk/cfn2ts": "0.0.0", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.1", - "aws-sdk": "^2.1373.0", + "aws-sdk": "^2.1375.0", "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0" }, diff --git a/packages/@aws-cdk/aws-redshift-alpha/package.json b/packages/@aws-cdk/aws-redshift-alpha/package.json index 4d050436a7c39..e5a4408dbe5d5 100644 --- a/packages/@aws-cdk/aws-redshift-alpha/package.json +++ b/packages/@aws-cdk/aws-redshift-alpha/package.json @@ -86,7 +86,7 @@ "@aws-cdk/cfn2ts": "0.0.0", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.1", - "aws-sdk": "^2.1373.0", + "aws-sdk": "^2.1375.0", "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", "@aws-cdk/integ-tests-alpha": "0.0.0" diff --git a/packages/@aws-cdk/aws-sagemaker-alpha/package.json b/packages/@aws-cdk/aws-sagemaker-alpha/package.json index 40b2210346b72..f67b90e6ad04a 100644 --- a/packages/@aws-cdk/aws-sagemaker-alpha/package.json +++ b/packages/@aws-cdk/aws-sagemaker-alpha/package.json @@ -87,7 +87,7 @@ "@aws-cdk/integ-runner": "0.0.0", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.1", - "aws-sdk": "^2.1373.0", + "aws-sdk": "^2.1375.0", "jest": "^29.5.0", "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", diff --git a/packages/@aws-cdk/cloud-assembly-schema/package.json b/packages/@aws-cdk/cloud-assembly-schema/package.json index 29903b3320e14..0c2dc574d5db2 100644 --- a/packages/@aws-cdk/cloud-assembly-schema/package.json +++ b/packages/@aws-cdk/cloud-assembly-schema/package.json @@ -81,7 +81,7 @@ "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.1", "@types/mock-fs": "^4.13.1", - "@types/semver": "^7.3.13", + "@types/semver": "^7.5.0", "aws-cdk-lib": "0.0.0", "jest": "^29.5.0", "mock-fs": "^4.14.0", diff --git a/packages/@aws-cdk/cx-api/package.json b/packages/@aws-cdk/cx-api/package.json index 88a612fa1176b..01ba45515b49b 100644 --- a/packages/@aws-cdk/cx-api/package.json +++ b/packages/@aws-cdk/cx-api/package.json @@ -89,7 +89,7 @@ "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.1", "@types/mock-fs": "^4.13.1", - "@types/semver": "^7.3.13", + "@types/semver": "^7.5.0", "jest": "^29.5.0", "madge": "^5.0.2", "mock-fs": "^4.14.0" diff --git a/packages/@aws-cdk/integ-runner/THIRD_PARTY_LICENSES b/packages/@aws-cdk/integ-runner/THIRD_PARTY_LICENSES index cd2576ec1016c..7b33e95fc7613 100644 --- a/packages/@aws-cdk/integ-runner/THIRD_PARTY_LICENSES +++ b/packages/@aws-cdk/integ-runner/THIRD_PARTY_LICENSES @@ -156,7 +156,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE ---------------- -** aws-sdk@2.1373.0 - https://www.npmjs.com/package/aws-sdk/v/2.1373.0 | Apache-2.0 +** aws-sdk@2.1375.0 - https://www.npmjs.com/package/aws-sdk/v/2.1375.0 | Apache-2.0 AWS SDK for JavaScript Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/integ-tests-alpha/package.json b/packages/@aws-cdk/integ-tests-alpha/package.json index 82c0f03082da5..416ff217cd87e 100644 --- a/packages/@aws-cdk/integ-tests-alpha/package.json +++ b/packages/@aws-cdk/integ-tests-alpha/package.json @@ -71,7 +71,7 @@ "@aws-cdk/pkglint": "0.0.0", "@types/fs-extra": "^9.0.13", "@types/jest": "^29.5.1", - "aws-sdk": "^2.1373.0", + "aws-sdk": "^2.1375.0", "aws-sdk-mock": "5.6.0", "jest": "^29.5.0", "nock": "^13.3.1", diff --git a/packages/aws-cdk-lib/.eslintrc.js b/packages/aws-cdk-lib/.eslintrc.js index 2658ee8727166..6c873338494e3 100644 --- a/packages/aws-cdk-lib/.eslintrc.js +++ b/packages/aws-cdk-lib/.eslintrc.js @@ -1,3 +1,16 @@ const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc'); -baseConfig.parserOptions.project = __dirname + '/tsconfig.json'; +baseConfig.parserOptions.project = __dirname + '/tsconfig.dev.json'; +baseConfig.rules['import/no-extraneous-dependencies'] = [ + 'error', + { + devDependencies: [ + '**/build-tools/**', + '**/scripts/**', + '**/test/**', + ], + optionalDependencies: false, + peerDependencies: true, + } +]; + module.exports = baseConfig; diff --git a/packages/aws-cdk-lib/assertions/lib/annotations.ts b/packages/aws-cdk-lib/assertions/lib/annotations.ts index 58010948d9245..08f9b75f95f47 100644 --- a/packages/aws-cdk-lib/assertions/lib/annotations.ts +++ b/packages/aws-cdk-lib/assertions/lib/annotations.ts @@ -1,7 +1,7 @@ -import { Stack, Stage } from '../../core'; -import { SynthesisMessage } from '../../cx-api'; import { Messages } from './private/message'; import { findMessage, hasMessage, hasNoMessage } from './private/messages'; +import { Stack, Stage } from '../../core'; +import { SynthesisMessage } from '../../cx-api'; /** * Suite of assertions that can be run on a CDK Stack. diff --git a/packages/aws-cdk-lib/assertions/lib/private/messages.ts b/packages/aws-cdk-lib/assertions/lib/private/messages.ts index 0db71f1cccb3d..e90d3aa835f5b 100644 --- a/packages/aws-cdk-lib/assertions/lib/private/messages.ts +++ b/packages/aws-cdk-lib/assertions/lib/private/messages.ts @@ -1,6 +1,6 @@ -import { SynthesisMessage } from '../../../cx-api'; import { Messages } from './message'; import { formatAllMatches, matchSection, formatSectionMatchFailure } from './section'; +import { SynthesisMessage } from '../../../cx-api'; export function findMessage(messages: Messages, constructPath: string, props: any = {}): { [key: string]: { [key: string]: any } } { const section: { [key: string]: SynthesisMessage } = messages; diff --git a/packages/aws-cdk-lib/assertions/lib/template.ts b/packages/aws-cdk-lib/assertions/lib/template.ts index 6dc609301291c..7395aa469e212 100644 --- a/packages/aws-cdk-lib/assertions/lib/template.ts +++ b/packages/aws-cdk-lib/assertions/lib/template.ts @@ -1,5 +1,4 @@ import * as path from 'path'; -import { Stack, Stage } from '../../core'; import * as fs from 'fs-extra'; import { Match } from './match'; import { Matcher } from './matcher'; @@ -10,6 +9,7 @@ import { findOutputs, hasOutput } from './private/outputs'; import { findParameters, hasParameter } from './private/parameters'; import { allResources, allResourcesProperties, countResources, countResourcesProperties, findResources, hasResource, hasResourceProperties } from './private/resources'; import { Template as TemplateType } from './private/template'; +import { Stack, Stage } from '../../core'; /** * Suite of assertions that can be run on a CDK stack. diff --git a/packages/aws-cdk-lib/assertions/test/annotations.test.ts b/packages/aws-cdk-lib/assertions/test/annotations.test.ts index beaee3b172c0b..7d497cd73973a 100644 --- a/packages/aws-cdk-lib/assertions/test/annotations.test.ts +++ b/packages/aws-cdk-lib/assertions/test/annotations.test.ts @@ -1,5 +1,5 @@ -import { Annotations, Aspects, CfnResource, IAspect, Stack } from '../../core'; import { IConstruct } from 'constructs'; +import { Annotations, Aspects, CfnResource, IAspect, Stack } from '../../core'; import { Annotations as _Annotations, Match } from '../lib'; describe('Messages', () => { diff --git a/packages/aws-cdk-lib/assertions/test/template.test.ts b/packages/aws-cdk-lib/assertions/test/template.test.ts index eaced11409952..5ad22f6cb9164 100644 --- a/packages/aws-cdk-lib/assertions/test/template.test.ts +++ b/packages/aws-cdk-lib/assertions/test/template.test.ts @@ -1,17 +1,17 @@ +import { Construct } from 'constructs'; import { - App, - CfnCondition, - CfnMapping, - CfnOutput, - CfnParameter, - CfnResource, - Fn, - LegacyStackSynthesizer, - NestedStack, - Stack, - Stage + App, + CfnCondition, + CfnMapping, + CfnOutput, + CfnParameter, + CfnResource, + Fn, + LegacyStackSynthesizer, + NestedStack, + Stack, + Stage, } from '../../core'; -import { Construct } from 'constructs'; import { Capture, Match, Template } from '../lib'; describe('Template', () => { @@ -1366,28 +1366,28 @@ describe('Template', () => { }).not.toThrow(/dependency cycle/); }); - test('nested stack inside a Stage in an App', () => { - const app = new App(); - const stage = new Stage(app, 'Stage'); - const stack = new Stack(stage); - const nested = new NestedStack(stack, 'MyNestedStack'); - new CfnResource(nested, 'Bar', { - type: 'Bar::Baz', - properties: { - Qux: 'Foo', - }, - }); - const template = Template.fromStack(nested); - - expect(template.toJSON()).toEqual({ - Resources: { - Bar: { - Type: 'Bar::Baz', - Properties: { Qux: 'Foo' }, - }, - }, - }); + test('nested stack inside a Stage in an App', () => { + const app = new App(); + const stage = new Stage(app, 'Stage'); + const stack = new Stack(stage); + const nested = new NestedStack(stack, 'MyNestedStack'); + new CfnResource(nested, 'Bar', { + type: 'Bar::Baz', + properties: { + Qux: 'Foo', + }, }); + const template = Template.fromStack(nested); + + expect(template.toJSON()).toEqual({ + Resources: { + Bar: { + Type: 'Bar::Baz', + Properties: { Qux: 'Foo' }, + }, + }, + }); + }); }); function expectToThrow(fn: () => void, msgs: (RegExp | string)[]): void { diff --git a/packages/aws-cdk-lib/assets/lib/compat.ts b/packages/aws-cdk-lib/assets/lib/compat.ts index 130f8d7eca0e6..7d638aa57f0bf 100644 --- a/packages/aws-cdk-lib/assets/lib/compat.ts +++ b/packages/aws-cdk-lib/assets/lib/compat.ts @@ -1,5 +1,5 @@ -import { SymlinkFollowMode } from '../../core'; import { FollowMode } from './fs/follow-mode'; +import { SymlinkFollowMode } from '../../core'; export function toSymlinkFollow(follow?: FollowMode): SymlinkFollowMode | undefined { if (!follow) { diff --git a/packages/aws-cdk-lib/assets/lib/fs/options.ts b/packages/aws-cdk-lib/assets/lib/fs/options.ts index f6845f0ea7cdb..4a49e83a714d2 100644 --- a/packages/aws-cdk-lib/assets/lib/fs/options.ts +++ b/packages/aws-cdk-lib/assets/lib/fs/options.ts @@ -1,5 +1,5 @@ -import { IgnoreMode } from '../../../core'; import { FollowMode } from './follow-mode'; +import { IgnoreMode } from '../../../core'; /** * Obtains applied when copying directories into the staging location. diff --git a/packages/aws-cdk-lib/assets/lib/staging.ts b/packages/aws-cdk-lib/assets/lib/staging.ts index 6797867f996dc..1e247c980c7f3 100644 --- a/packages/aws-cdk-lib/assets/lib/staging.ts +++ b/packages/aws-cdk-lib/assets/lib/staging.ts @@ -1,7 +1,7 @@ -import { AssetStaging } from '../../core'; import { Construct } from 'constructs'; import { toSymlinkFollow } from './compat'; import { FingerprintOptions } from './fs/options'; +import { AssetStaging } from '../../core'; /** * Deprecated diff --git a/packages/aws-cdk-lib/aws-acmpca/lib/certificate-authority.ts b/packages/aws-cdk-lib/aws-acmpca/lib/certificate-authority.ts index 38e48c8bbcdd8..fa51bc65a1cc7 100644 --- a/packages/aws-cdk-lib/aws-acmpca/lib/certificate-authority.ts +++ b/packages/aws-cdk-lib/aws-acmpca/lib/certificate-authority.ts @@ -1,5 +1,5 @@ -import * as cdk from '../../core'; import { Construct } from 'constructs'; +import * as cdk from '../../core'; /** * Interface which all CertificateAuthority based class must implement diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/access-log.ts b/packages/aws-cdk-lib/aws-apigateway/lib/access-log.ts index dc9e7f9394c35..ea40681f7b60c 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/access-log.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/access-log.ts @@ -1,5 +1,5 @@ -import { ILogGroup } from '../../aws-logs'; import { IStage } from './stage'; +import { ILogGroup } from '../../aws-logs'; /** * Access log destination for a RestApi Stage. diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/api-definition.ts b/packages/aws-cdk-lib/aws-apigateway/lib/api-definition.ts index 6a546843d30be..d9072aba941ae 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/api-definition.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/api-definition.ts @@ -1,9 +1,9 @@ -import * as s3 from '../../aws-s3'; -import * as s3_assets from '../../aws-s3-assets'; -import * as cxapi from '../../cx-api'; import { Construct, Node } from 'constructs'; import { CfnRestApi } from './apigateway.generated'; import { IRestApi } from './restapi'; +import * as s3 from '../../aws-s3'; +import * as s3_assets from '../../aws-s3-assets'; +import * as cxapi from '../../cx-api'; /** * Represents an OpenAPI definition asset. diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/api-key.ts b/packages/aws-cdk-lib/aws-apigateway/lib/api-key.ts index 5313c07e00a0b..d4b42fc6d3b0e 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/api-key.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/api-key.ts @@ -1,11 +1,11 @@ -import * as iam from '../../aws-iam'; -import { ArnFormat, IResource as IResourceBase, Resource, Stack } from '../../core'; import { Construct } from 'constructs'; import { CfnApiKey } from './apigateway.generated'; import { ResourceOptions } from './resource'; import { IRestApi } from './restapi'; import { IStage } from './stage'; import { QuotaSettings, ThrottleSettings, UsagePlan, UsagePlanPerApiStage } from './usage-plan'; +import * as iam from '../../aws-iam'; +import { ArnFormat, IResource as IResourceBase, Resource, Stack } from '../../core'; /** * API keys are alphanumeric string values that you distribute to diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/apigatewayv2.ts b/packages/aws-cdk-lib/aws-apigateway/lib/apigatewayv2.ts index 5ab7d336d2bcc..ed9a7b2fb113e 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/apigatewayv2.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/apigatewayv2.ts @@ -3,8 +3,8 @@ /* eslint-disable max-len */ -import * as cdk from '../../core'; import { Construct } from 'constructs'; +import * as cdk from '../../core'; /** * Properties for defining a `AWS::ApiGatewayV2::Api` diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/authorizer.ts b/packages/aws-cdk-lib/aws-apigateway/lib/authorizer.ts index ab21c7803ba3d..afc516f6d0289 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/authorizer.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/authorizer.ts @@ -1,7 +1,7 @@ -import { Resource, ResourceProps } from '../../core'; import { Construct } from 'constructs'; import { AuthorizationType } from './method'; import { IRestApi } from './restapi'; +import { Resource, ResourceProps } from '../../core'; const AUTHORIZER_SYMBOL = Symbol.for('@aws-cdk/aws-apigateway.Authorizer'); diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/authorizers/cognito.ts b/packages/aws-cdk-lib/aws-apigateway/lib/authorizers/cognito.ts index 07f99b22f50a8..f2c1282ee140c 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/authorizers/cognito.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/authorizers/cognito.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as cognito from '../../../aws-cognito'; import { Duration, FeatureFlags, Lazy, Names, Stack } from '../../../core'; import { APIGATEWAY_AUTHORIZER_CHANGE_DEPLOYMENT_LOGICAL_ID } from '../../../cx-api'; -import { Construct } from 'constructs'; import { CfnAuthorizer, CfnAuthorizerProps } from '../apigateway.generated'; import { Authorizer, IAuthorizer } from '../authorizer'; import { AuthorizationType } from '../method'; diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/authorizers/lambda.ts b/packages/aws-cdk-lib/aws-apigateway/lib/authorizers/lambda.ts index cc11c6881cc09..c6e998d45a864 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/authorizers/lambda.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/authorizers/lambda.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as lambda from '../../../aws-lambda'; import { Arn, ArnFormat, Duration, FeatureFlags, Lazy, Names, Stack } from '../../../core'; import { APIGATEWAY_AUTHORIZER_CHANGE_DEPLOYMENT_LOGICAL_ID } from '../../../cx-api'; -import { Construct } from 'constructs'; import { CfnAuthorizer, CfnAuthorizerProps } from '../apigateway.generated'; import { Authorizer, IAuthorizer } from '../authorizer'; import { IRestApi } from '../restapi'; diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/base-path-mapping.ts b/packages/aws-cdk-lib/aws-apigateway/lib/base-path-mapping.ts index 3f0520623fb8c..005acd07c24a8 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/base-path-mapping.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/base-path-mapping.ts @@ -1,9 +1,9 @@ -import { Resource, Token } from '../../core'; import { Construct } from 'constructs'; import { CfnBasePathMapping } from './apigateway.generated'; import { IDomainName } from './domain-name'; import { IRestApi, RestApiBase } from './restapi'; import { Stage } from './stage'; +import { Resource, Token } from '../../core'; export interface BasePathMappingOptions { /** diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/cors.ts b/packages/aws-cdk-lib/aws-apigateway/lib/cors.ts index a9b6a8339d05c..f25e039ab38a3 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/cors.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/cors.ts @@ -1,5 +1,5 @@ -import { Duration } from '../../core'; import { ALL_METHODS } from './util'; +import { Duration } from '../../core'; export interface CorsOptions { /** diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/deployment.ts b/packages/aws-cdk-lib/aws-apigateway/lib/deployment.ts index 1f4d93b0bf097..3b70432798446 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/deployment.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/deployment.ts @@ -1,9 +1,9 @@ -import { Lazy, RemovalPolicy, Resource, CfnResource } from '../../core'; -import { md5hash } from '../../core/lib/helpers-internal'; import { Construct } from 'constructs'; import { CfnDeployment } from './apigateway.generated'; import { Method } from './method'; import { IRestApi, RestApi, SpecRestApi, RestApiBase } from './restapi'; +import { Lazy, RemovalPolicy, Resource, CfnResource } from '../../core'; +import { md5hash } from '../../core/lib/helpers-internal'; export interface DeploymentProps { /** diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/domain-name.ts b/packages/aws-cdk-lib/aws-apigateway/lib/domain-name.ts index 9b7ba3d1a42f1..9ebf2976f4cbb 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/domain-name.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/domain-name.ts @@ -1,12 +1,12 @@ -import * as apigwv2 from '../../aws-apigatewayv2'; -import * as acm from '../../aws-certificatemanager'; -import { IBucket } from '../../aws-s3'; -import { IResource, Names, Resource, Token } from '../../core'; import { Construct } from 'constructs'; import { CfnDomainName } from './apigateway.generated'; import { BasePathMapping, BasePathMappingOptions } from './base-path-mapping'; import { EndpointType, IRestApi } from './restapi'; import { IStage } from './stage'; +import * as apigwv2 from '../../aws-apigatewayv2'; +import * as acm from '../../aws-certificatemanager'; +import { IBucket } from '../../aws-s3'; +import { IResource, Names, Resource, Token } from '../../core'; /** * Options for creating an api mapping diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/gateway-response.ts b/packages/aws-cdk-lib/aws-apigateway/lib/gateway-response.ts index 958e1b9d70640..60d5604b08f73 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/gateway-response.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/gateway-response.ts @@ -1,7 +1,7 @@ -import { IResource, Resource } from '../../core'; import { Construct } from 'constructs'; import { CfnGatewayResponse, CfnGatewayResponseProps } from './apigateway.generated'; import { IRestApi } from './restapi'; +import { IResource, Resource } from '../../core'; /** * Represents gateway response resource. diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/integration.ts b/packages/aws-cdk-lib/aws-apigateway/lib/integration.ts index 663a862e9f727..d9a371b12bc7c 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/integration.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/integration.ts @@ -1,7 +1,7 @@ -import * as iam from '../../aws-iam'; -import { Lazy, Duration } from '../../core'; import { Method } from './method'; import { IVpcLink, VpcLink } from './vpc-link'; +import * as iam from '../../aws-iam'; +import { Lazy, Duration } from '../../core'; export interface IntegrationOptions { /** diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/integrations/aws.ts b/packages/aws-cdk-lib/aws-apigateway/lib/integrations/aws.ts index 68fc2bc6a551f..d98a5c2018a17 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/integrations/aws.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/integrations/aws.ts @@ -1,6 +1,6 @@ +import { IConstruct } from 'constructs'; import * as cdk from '../../../core'; import { ArnFormat } from '../../../core'; -import { IConstruct } from 'constructs'; import { Integration, IntegrationConfig, IntegrationOptions, IntegrationType } from '../integration'; import { Method } from '../method'; import { parseAwsApiCall } from '../util'; diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/integrations/lambda.ts b/packages/aws-cdk-lib/aws-apigateway/lib/integrations/lambda.ts index 8dce8d845e046..8758b5054d8b5 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/integrations/lambda.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/integrations/lambda.ts @@ -1,7 +1,7 @@ +import { AwsIntegration } from './aws'; import * as iam from '../../../aws-iam'; import * as lambda from '../../../aws-lambda'; import { Lazy, Names, Token } from '../../../core'; -import { AwsIntegration } from './aws'; import { IntegrationConfig, IntegrationOptions } from '../integration'; import { Method } from '../method'; diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/integrations/stepfunctions.ts b/packages/aws-cdk-lib/aws-apigateway/lib/integrations/stepfunctions.ts index 9b91bde47abfd..4e75eb967afab 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/integrations/stepfunctions.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/integrations/stepfunctions.ts @@ -1,10 +1,10 @@ import * as fs from 'fs'; import * as path from 'path'; +import { RequestContext } from '.'; +import { AwsIntegration } from './aws'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import { Token } from '../../../core'; -import { RequestContext } from '.'; -import { AwsIntegration } from './aws'; import { IntegrationConfig, IntegrationOptions, PassthroughBehavior } from '../integration'; import { Method } from '../method'; import { Model } from '../model'; diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/model.ts b/packages/aws-cdk-lib/aws-apigateway/lib/model.ts index 562ade8fa2b01..23da756a5bafd 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/model.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/model.ts @@ -1,9 +1,9 @@ -import { Resource } from '../../core'; import { Construct } from 'constructs'; import { CfnModel, CfnModelProps } from './apigateway.generated'; import * as jsonSchema from './json-schema'; import { IRestApi, RestApi } from './restapi'; import * as util from './util'; +import { Resource } from '../../core'; export interface IModel { /** diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/requestvalidator.ts b/packages/aws-cdk-lib/aws-apigateway/lib/requestvalidator.ts index 27e73691e109c..961e678d8cb94 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/requestvalidator.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/requestvalidator.ts @@ -1,7 +1,7 @@ -import { IResource, Resource } from '../../core'; import { Construct } from 'constructs'; import { CfnRequestValidator, CfnRequestValidatorProps } from './apigateway.generated'; import { IRestApi, RestApi } from './restapi'; +import { IResource, Resource } from '../../core'; export interface IRequestValidator extends IResource { /** diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/resource.ts b/packages/aws-cdk-lib/aws-apigateway/lib/resource.ts index 414e9ba6e4382..0d10abdf104be 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/resource.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/resource.ts @@ -1,4 +1,3 @@ -import { IResource as IResourceBase, Resource as ResourceConstruct } from '../../core'; import { Construct } from 'constructs'; import { CfnResource, CfnResourceProps } from './apigateway.generated'; import { Cors, CorsOptions } from './cors'; @@ -6,6 +5,7 @@ import { Integration } from './integration'; import { MockIntegration } from './integrations'; import { Method, MethodOptions, AuthorizationType } from './method'; import { IRestApi, RestApi } from './restapi'; +import { IResource as IResourceBase, Resource as ResourceConstruct } from '../../core'; export interface IResource extends IResourceBase { /** diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/restapi.ts b/packages/aws-cdk-lib/aws-apigateway/lib/restapi.ts index 962ef81d84516..203dd85ce5cd5 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/restapi.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/restapi.ts @@ -1,8 +1,3 @@ -import * as cloudwatch from '../../aws-cloudwatch'; -import { IVpcEndpoint } from '../../aws-ec2'; -import * as iam from '../../aws-iam'; -import { ArnFormat, CfnOutput, IResource as IResourceBase, Resource, Stack, Token, FeatureFlags, RemovalPolicy, Size } from '../../core'; -import { APIGATEWAY_DISABLE_CLOUDWATCH_ROLE } from '../../cx-api'; import { Construct } from 'constructs'; import { ApiDefinition } from './api-definition'; import { ApiKey, ApiKeyOptions, IApiKey } from './api-key'; @@ -19,6 +14,11 @@ import { RequestValidator, RequestValidatorOptions } from './requestvalidator'; import { IResource, ResourceBase, ResourceOptions } from './resource'; import { Stage, StageOptions } from './stage'; import { UsagePlan, UsagePlanProps } from './usage-plan'; +import * as cloudwatch from '../../aws-cloudwatch'; +import { IVpcEndpoint } from '../../aws-ec2'; +import * as iam from '../../aws-iam'; +import { ArnFormat, CfnOutput, IResource as IResourceBase, Resource, Stack, Token, FeatureFlags, RemovalPolicy, Size } from '../../core'; +import { APIGATEWAY_DISABLE_CLOUDWATCH_ROLE } from '../../cx-api'; const RESTAPI_SYMBOL = Symbol.for('@aws-cdk/aws-apigateway.RestApiBase'); diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/stage.ts b/packages/aws-cdk-lib/aws-apigateway/lib/stage.ts index 0a8561c8ab951..80ae9f4c1cbf1 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/stage.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/stage.ts @@ -1,5 +1,3 @@ -import * as cloudwatch from '../../aws-cloudwatch'; -import { ArnFormat, Duration, IResource, Resource, Stack, Token } from '../../core'; import { Construct } from 'constructs'; import { AccessLogFormat, IAccessLogDestination } from './access-log'; import { IApiKey, ApiKeyOptions, ApiKey } from './api-key'; @@ -8,6 +6,8 @@ import { CfnStage } from './apigateway.generated'; import { Deployment } from './deployment'; import { IRestApi, RestApiBase } from './restapi'; import { parseMethodOptionsPath } from './util'; +import * as cloudwatch from '../../aws-cloudwatch'; +import { ArnFormat, Duration, IResource, Resource, Stack, Token } from '../../core'; /** * Represents an APIGateway Stage. diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/stepfunctions-api.ts b/packages/aws-cdk-lib/aws-apigateway/lib/stepfunctions-api.ts index 1e2c3fcfe520c..6adfa8674b15f 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/stepfunctions-api.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/stepfunctions-api.ts @@ -1,9 +1,9 @@ -import * as iam from '../../aws-iam'; -import * as sfn from '../../aws-stepfunctions'; import { Construct } from 'constructs'; import { RestApi, RestApiProps } from '.'; import { RequestContext } from './integrations'; import { StepFunctionsIntegration } from './integrations/stepfunctions'; +import * as iam from '../../aws-iam'; +import * as sfn from '../../aws-stepfunctions'; /** * Properties for StepFunctionsRestApi diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/usage-plan.ts b/packages/aws-cdk-lib/aws-apigateway/lib/usage-plan.ts index 71bb8246669fb..7cc2957da8a7a 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/usage-plan.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/usage-plan.ts @@ -1,5 +1,3 @@ -import { FeatureFlags, IResource, Lazy, Names, Resource, Token } from '../../core'; -import { APIGATEWAY_USAGEPLANKEY_ORDERINSENSITIVE_ID } from '../../cx-api'; import { Construct } from 'constructs'; import { IApiKey } from './api-key'; import { CfnUsagePlan, CfnUsagePlanKey } from './apigateway.generated'; @@ -7,6 +5,8 @@ import { Method } from './method'; import { IRestApi } from './restapi'; import { Stage } from './stage'; import { validateDouble, validateInteger } from './util'; +import { FeatureFlags, IResource, Lazy, Names, Resource, Token } from '../../core'; +import { APIGATEWAY_USAGEPLANKEY_ORDERINSENSITIVE_ID } from '../../cx-api'; /** * Container for defining throttling parameters to API stages or methods. diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/vpc-link.ts b/packages/aws-cdk-lib/aws-apigateway/lib/vpc-link.ts index d76864e6e493b..f9af63078f011 100644 --- a/packages/aws-cdk-lib/aws-apigateway/lib/vpc-link.ts +++ b/packages/aws-cdk-lib/aws-apigateway/lib/vpc-link.ts @@ -1,7 +1,7 @@ -import * as elbv2 from '../../aws-elasticloadbalancingv2'; -import { IResource, Lazy, Names, Resource } from '../../core'; import { Construct } from 'constructs'; import { CfnVpcLink } from './apigateway.generated'; +import * as elbv2 from '../../aws-elasticloadbalancingv2'; +import { IResource, Lazy, Names, Resource } from '../../core'; /** * Represents an API Gateway VpcLink diff --git a/packages/aws-cdk-lib/aws-apigateway/test/api-key.test.ts b/packages/aws-cdk-lib/aws-apigateway/test/api-key.test.ts index e414d0b1a068a..bda72146c18c3 100644 --- a/packages/aws-cdk-lib/aws-apigateway/test/api-key.test.ts +++ b/packages/aws-cdk-lib/aws-apigateway/test/api-key.test.ts @@ -1,6 +1,6 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Match, Template } from '../../assertions'; import * as iam from '../../aws-iam'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../core'; import * as apigateway from '../lib'; diff --git a/packages/aws-cdk-lib/aws-apigateway/test/integ.restapi-import.lit.ts b/packages/aws-cdk-lib/aws-apigateway/test/integ.restapi-import.lit.ts index c914f9a33be0c..d231c2d962998 100644 --- a/packages/aws-cdk-lib/aws-apigateway/test/integ.restapi-import.lit.ts +++ b/packages/aws-cdk-lib/aws-apigateway/test/integ.restapi-import.lit.ts @@ -1,5 +1,5 @@ -import { App, CfnOutput, NestedStack, NestedStackProps, Stack } from '../../core'; import { Construct } from 'constructs'; +import { App, CfnOutput, NestedStack, NestedStackProps, Stack } from '../../core'; import { Deployment, Method, MockIntegration, PassthroughBehavior, RestApi, Stage } from '../lib'; /** diff --git a/packages/aws-cdk-lib/aws-apigateway/test/method.test.ts b/packages/aws-cdk-lib/aws-apigateway/test/method.test.ts index 21ad5b91d6581..81cd18ef8b0bb 100644 --- a/packages/aws-cdk-lib/aws-apigateway/test/method.test.ts +++ b/packages/aws-cdk-lib/aws-apigateway/test/method.test.ts @@ -1,7 +1,7 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Match, Template } from '../../assertions'; import * as iam from '../../aws-iam'; import * as lambda from '../../aws-lambda'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../core'; import * as apigw from '../lib'; diff --git a/packages/aws-cdk-lib/aws-apigateway/test/restapi.test.ts b/packages/aws-cdk-lib/aws-apigateway/test/restapi.test.ts index 51b1b5b85c537..36b7f73573a09 100644 --- a/packages/aws-cdk-lib/aws-apigateway/test/restapi.test.ts +++ b/packages/aws-cdk-lib/aws-apigateway/test/restapi.test.ts @@ -1,6 +1,6 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from '../../assertions'; import { GatewayVpcEndpoint } from '../../aws-ec2'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { App, CfnElement, CfnResource, Lazy, Size, Stack } from '../../core'; import * as apigw from '../lib'; diff --git a/packages/aws-cdk-lib/aws-applicationautoscaling/lib/base-scalable-attribute.ts b/packages/aws-cdk-lib/aws-applicationautoscaling/lib/base-scalable-attribute.ts index 4202c6b2dd261..8299dd16300cf 100644 --- a/packages/aws-cdk-lib/aws-applicationautoscaling/lib/base-scalable-attribute.ts +++ b/packages/aws-cdk-lib/aws-applicationautoscaling/lib/base-scalable-attribute.ts @@ -1,8 +1,8 @@ -import * as iam from '../../aws-iam'; import { Construct } from 'constructs'; import { ScalableTarget, ScalingSchedule, ServiceNamespace } from './scalable-target'; import { BasicStepScalingPolicyProps } from './step-scaling-policy'; import { BasicTargetTrackingScalingPolicyProps } from './target-tracking-scaling-policy'; +import * as iam from '../../aws-iam'; /** * Properties for a ScalableTableAttribute diff --git a/packages/aws-cdk-lib/aws-applicationautoscaling/lib/scalable-target.ts b/packages/aws-cdk-lib/aws-applicationautoscaling/lib/scalable-target.ts index 16bf5209140a6..0e825bce03d19 100644 --- a/packages/aws-cdk-lib/aws-applicationautoscaling/lib/scalable-target.ts +++ b/packages/aws-cdk-lib/aws-applicationautoscaling/lib/scalable-target.ts @@ -1,10 +1,10 @@ -import * as iam from '../../aws-iam'; -import { IResource, Lazy, Resource, withResolved } from '../../core'; import { Construct } from 'constructs'; import { CfnScalableTarget } from './applicationautoscaling.generated'; import { Schedule } from './schedule'; import { BasicStepScalingPolicyProps, StepScalingPolicy } from './step-scaling-policy'; import { BasicTargetTrackingScalingPolicyProps, TargetTrackingScalingPolicy } from './target-tracking-scaling-policy'; +import * as iam from '../../aws-iam'; +import { IResource, Lazy, Resource, withResolved } from '../../core'; export interface IScalableTarget extends IResource { /** diff --git a/packages/aws-cdk-lib/aws-applicationautoscaling/lib/schedule.ts b/packages/aws-cdk-lib/aws-applicationautoscaling/lib/schedule.ts index b40fb52ec02c4..fb448d42bc732 100644 --- a/packages/aws-cdk-lib/aws-applicationautoscaling/lib/schedule.ts +++ b/packages/aws-cdk-lib/aws-applicationautoscaling/lib/schedule.ts @@ -1,5 +1,5 @@ -import { Annotations, Duration } from '../../core'; import { Construct } from 'constructs'; +import { Annotations, Duration } from '../../core'; /** * Schedule for scheduled scaling actions diff --git a/packages/aws-cdk-lib/aws-applicationautoscaling/lib/step-scaling-action.ts b/packages/aws-cdk-lib/aws-applicationautoscaling/lib/step-scaling-action.ts index a5cc8410b265c..4652637c25d39 100644 --- a/packages/aws-cdk-lib/aws-applicationautoscaling/lib/step-scaling-action.ts +++ b/packages/aws-cdk-lib/aws-applicationautoscaling/lib/step-scaling-action.ts @@ -1,7 +1,7 @@ -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { CfnScalingPolicy } from './applicationautoscaling.generated'; import { IScalableTarget } from './scalable-target'; +import * as cdk from '../../core'; /** * Properties for a scaling policy diff --git a/packages/aws-cdk-lib/aws-applicationautoscaling/lib/step-scaling-policy.ts b/packages/aws-cdk-lib/aws-applicationautoscaling/lib/step-scaling-policy.ts index fb9073217541d..1ce505c57c6ba 100644 --- a/packages/aws-cdk-lib/aws-applicationautoscaling/lib/step-scaling-policy.ts +++ b/packages/aws-cdk-lib/aws-applicationautoscaling/lib/step-scaling-policy.ts @@ -1,9 +1,9 @@ -import { findAlarmThresholds, normalizeIntervals } from '../../aws-autoscaling-common'; -import * as cloudwatch from '../../aws-cloudwatch'; -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { IScalableTarget } from './scalable-target'; import { AdjustmentType, MetricAggregationType, StepScalingAction } from './step-scaling-action'; +import { findAlarmThresholds, normalizeIntervals } from '../../aws-autoscaling-common'; +import * as cloudwatch from '../../aws-cloudwatch'; +import * as cdk from '../../core'; export interface BasicStepScalingPolicyProps { /** diff --git a/packages/aws-cdk-lib/aws-applicationautoscaling/lib/target-tracking-scaling-policy.ts b/packages/aws-cdk-lib/aws-applicationautoscaling/lib/target-tracking-scaling-policy.ts index da774f10a864e..097a0d5df6bff 100644 --- a/packages/aws-cdk-lib/aws-applicationautoscaling/lib/target-tracking-scaling-policy.ts +++ b/packages/aws-cdk-lib/aws-applicationautoscaling/lib/target-tracking-scaling-policy.ts @@ -1,8 +1,8 @@ -import * as cloudwatch from '../../aws-cloudwatch'; -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { CfnScalingPolicy } from './applicationautoscaling.generated'; import { IScalableTarget } from './scalable-target'; +import * as cloudwatch from '../../aws-cloudwatch'; +import * as cdk from '../../core'; /** * Base interface for target tracking props diff --git a/packages/aws-cdk-lib/aws-applicationautoscaling/test/scalable-target.test.ts b/packages/aws-cdk-lib/aws-applicationautoscaling/test/scalable-target.test.ts index ab6ead3fa4d34..e6837fe329938 100644 --- a/packages/aws-cdk-lib/aws-applicationautoscaling/test/scalable-target.test.ts +++ b/packages/aws-cdk-lib/aws-applicationautoscaling/test/scalable-target.test.ts @@ -1,8 +1,8 @@ +import { createScalableTarget } from './util'; import { Annotations, Match, Template } from '../../assertions'; import * as cloudwatch from '../../aws-cloudwatch'; import * as iam from '../../aws-iam'; import * as cdk from '../../core'; -import { createScalableTarget } from './util'; import * as appscaling from '../lib'; describe('scalable target', () => { diff --git a/packages/aws-cdk-lib/aws-applicationautoscaling/test/step-scaling-policy.test.ts b/packages/aws-cdk-lib/aws-applicationautoscaling/test/step-scaling-policy.test.ts index f1e501913eefd..358e4ef1e00c9 100644 --- a/packages/aws-cdk-lib/aws-applicationautoscaling/test/step-scaling-policy.test.ts +++ b/packages/aws-cdk-lib/aws-applicationautoscaling/test/step-scaling-policy.test.ts @@ -1,8 +1,8 @@ +import * as fc from 'fast-check'; +import { arbitrary_input_intervals, createScalableTarget } from './util'; import { Template } from '../../assertions'; import * as cloudwatch from '../../aws-cloudwatch'; import * as cdk from '../../core'; -import * as fc from 'fast-check'; -import { arbitrary_input_intervals, createScalableTarget } from './util'; import * as appscaling from '../lib'; describe('step scaling policy', () => { diff --git a/packages/aws-cdk-lib/aws-applicationautoscaling/test/target-tracking.test.ts b/packages/aws-cdk-lib/aws-applicationautoscaling/test/target-tracking.test.ts index 929eec809aa68..d3d5409ac469a 100644 --- a/packages/aws-cdk-lib/aws-applicationautoscaling/test/target-tracking.test.ts +++ b/packages/aws-cdk-lib/aws-applicationautoscaling/test/target-tracking.test.ts @@ -1,7 +1,7 @@ +import { createScalableTarget } from './util'; import { Template } from '../../assertions'; import * as cloudwatch from '../../aws-cloudwatch'; import * as cdk from '../../core'; -import { createScalableTarget } from './util'; import * as appscaling from '../lib'; describe('target tracking', () => { diff --git a/packages/aws-cdk-lib/aws-applicationautoscaling/test/util.ts b/packages/aws-cdk-lib/aws-applicationautoscaling/test/util.ts index 6a758e18c2021..11e67ac50fd57 100644 --- a/packages/aws-cdk-lib/aws-applicationautoscaling/test/util.ts +++ b/packages/aws-cdk-lib/aws-applicationautoscaling/test/util.ts @@ -1,6 +1,6 @@ -import * as scalingcommon from '../../aws-autoscaling-common'; import * as constructs from 'constructs'; import * as fc from 'fast-check'; +import * as scalingcommon from '../../aws-autoscaling-common'; import * as appscaling from '../lib'; export function createScalableTarget(scope: constructs.Construct) { diff --git a/packages/aws-cdk-lib/aws-appmesh/lib/gateway-route.ts b/packages/aws-cdk-lib/aws-appmesh/lib/gateway-route.ts index cbc826cb981d9..059ad6dd0ce74 100644 --- a/packages/aws-cdk-lib/aws-appmesh/lib/gateway-route.ts +++ b/packages/aws-cdk-lib/aws-appmesh/lib/gateway-route.ts @@ -1,9 +1,9 @@ -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { CfnGatewayRoute, CfnVirtualGateway } from './appmesh.generated'; import { GatewayRouteSpec } from './gateway-route-spec'; import { renderMeshOwner } from './private/utils'; import { IVirtualGateway, VirtualGateway } from './virtual-gateway'; +import * as cdk from '../../core'; /** * Interface for which all GatewayRoute based classes MUST implement diff --git a/packages/aws-cdk-lib/aws-appmesh/lib/health-checks.ts b/packages/aws-cdk-lib/aws-appmesh/lib/health-checks.ts index 65b8d7333166c..60692abbb705b 100644 --- a/packages/aws-cdk-lib/aws-appmesh/lib/health-checks.ts +++ b/packages/aws-cdk-lib/aws-appmesh/lib/health-checks.ts @@ -1,7 +1,7 @@ -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { CfnVirtualGateway, CfnVirtualNode } from './appmesh.generated'; import { Protocol } from './shared-interfaces'; +import * as cdk from '../../core'; /** * Properties used to define healthchecks. diff --git a/packages/aws-cdk-lib/aws-appmesh/lib/mesh.ts b/packages/aws-cdk-lib/aws-appmesh/lib/mesh.ts index a53e19b93e580..04a3f699bc98e 100644 --- a/packages/aws-cdk-lib/aws-appmesh/lib/mesh.ts +++ b/packages/aws-cdk-lib/aws-appmesh/lib/mesh.ts @@ -1,10 +1,10 @@ -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { CfnMesh } from './appmesh.generated'; import { MeshServiceDiscovery } from './service-discovery'; import { VirtualGateway, VirtualGatewayBaseProps } from './virtual-gateway'; import { VirtualNode, VirtualNodeBaseProps } from './virtual-node'; import { VirtualRouter, VirtualRouterBaseProps } from './virtual-router'; +import * as cdk from '../../core'; /** * A utility enum defined for the egressFilter type property, the default of DROP_ALL, diff --git a/packages/aws-cdk-lib/aws-appmesh/lib/private/utils.ts b/packages/aws-cdk-lib/aws-appmesh/lib/private/utils.ts index efae7a5f2ca06..48dc490e29a9c 100644 --- a/packages/aws-cdk-lib/aws-appmesh/lib/private/utils.ts +++ b/packages/aws-cdk-lib/aws-appmesh/lib/private/utils.ts @@ -1,5 +1,5 @@ -import { Token, TokenComparison } from '../../../core'; import { Construct } from 'constructs'; +import { Token, TokenComparison } from '../../../core'; import { CfnVirtualNode } from '../appmesh.generated'; import { GrpcGatewayRouteMatch } from '../gateway-route-spec'; import { HeaderMatch } from '../header-match'; diff --git a/packages/aws-cdk-lib/aws-appmesh/lib/route-spec.ts b/packages/aws-cdk-lib/aws-appmesh/lib/route-spec.ts index 82c685ed3d59f..da3c9c204912e 100644 --- a/packages/aws-cdk-lib/aws-appmesh/lib/route-spec.ts +++ b/packages/aws-cdk-lib/aws-appmesh/lib/route-spec.ts @@ -1,4 +1,3 @@ -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { CfnRoute } from './appmesh.generated'; import { HeaderMatch } from './header-match'; @@ -8,6 +7,7 @@ import { validateGrpcRouteMatch, validateGrpcMatchArrayLength, validateHttpMatch import { QueryParameterMatch } from './query-parameter-match'; import { GrpcTimeout, HttpTimeout, Protocol, TcpTimeout } from './shared-interfaces'; import { IVirtualNode } from './virtual-node'; +import * as cdk from '../../core'; /** * Properties for the Weighted Targets in the route diff --git a/packages/aws-cdk-lib/aws-appmesh/lib/route.ts b/packages/aws-cdk-lib/aws-appmesh/lib/route.ts index 87ce596394658..0b42cb9715fd7 100644 --- a/packages/aws-cdk-lib/aws-appmesh/lib/route.ts +++ b/packages/aws-cdk-lib/aws-appmesh/lib/route.ts @@ -1,10 +1,10 @@ -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { CfnRoute } from './appmesh.generated'; import { IMesh } from './mesh'; import { renderMeshOwner } from './private/utils'; import { RouteSpec } from './route-spec'; import { IVirtualRouter, VirtualRouter } from './virtual-router'; +import * as cdk from '../../core'; /** * Interface for which all Route based classes MUST implement diff --git a/packages/aws-cdk-lib/aws-appmesh/lib/service-discovery.ts b/packages/aws-cdk-lib/aws-appmesh/lib/service-discovery.ts index 60a1443a2ea52..8d2a240075b09 100644 --- a/packages/aws-cdk-lib/aws-appmesh/lib/service-discovery.ts +++ b/packages/aws-cdk-lib/aws-appmesh/lib/service-discovery.ts @@ -1,6 +1,6 @@ -import * as cloudmap from '../../aws-servicediscovery'; import { Construct } from 'constructs'; import { CfnVirtualNode } from './appmesh.generated'; +import * as cloudmap from '../../aws-servicediscovery'; /** * Enum of supported IP preferences. diff --git a/packages/aws-cdk-lib/aws-appmesh/lib/shared-interfaces.ts b/packages/aws-cdk-lib/aws-appmesh/lib/shared-interfaces.ts index 02d6a5a3beb0a..9edc7438139e5 100644 --- a/packages/aws-cdk-lib/aws-appmesh/lib/shared-interfaces.ts +++ b/packages/aws-cdk-lib/aws-appmesh/lib/shared-interfaces.ts @@ -1,9 +1,9 @@ -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { CfnVirtualGateway, CfnVirtualNode } from './appmesh.generated'; import { renderTlsClientPolicy } from './private/utils'; import { TlsClientPolicy } from './tls-client-policy'; import { IVirtualService } from './virtual-service'; +import * as cdk from '../../core'; /** * Represents timeouts for HTTP protocols. diff --git a/packages/aws-cdk-lib/aws-appmesh/lib/tls-certificate.ts b/packages/aws-cdk-lib/aws-appmesh/lib/tls-certificate.ts index 8fa908deb6b36..80298da0f722d 100644 --- a/packages/aws-cdk-lib/aws-appmesh/lib/tls-certificate.ts +++ b/packages/aws-cdk-lib/aws-appmesh/lib/tls-certificate.ts @@ -1,6 +1,6 @@ -import * as acm from '../../aws-certificatemanager'; import { Construct } from 'constructs'; import { CfnVirtualNode } from './appmesh.generated'; +import * as acm from '../../aws-certificatemanager'; /** * A wrapper for the tls config returned by `TlsCertificate.bind` diff --git a/packages/aws-cdk-lib/aws-appmesh/lib/tls-validation.ts b/packages/aws-cdk-lib/aws-appmesh/lib/tls-validation.ts index 4660254ba25ba..b2baf9b99ca07 100644 --- a/packages/aws-cdk-lib/aws-appmesh/lib/tls-validation.ts +++ b/packages/aws-cdk-lib/aws-appmesh/lib/tls-validation.ts @@ -1,6 +1,6 @@ -import * as acmpca from '../../aws-acmpca'; import { Construct } from 'constructs'; import { CfnVirtualNode } from './appmesh.generated'; +import * as acmpca from '../../aws-acmpca'; /** * Represents the properties needed to define TLS Validation context diff --git a/packages/aws-cdk-lib/aws-appmesh/lib/virtual-gateway.ts b/packages/aws-cdk-lib/aws-appmesh/lib/virtual-gateway.ts index 471327514b404..cc81da8e73dfa 100644 --- a/packages/aws-cdk-lib/aws-appmesh/lib/virtual-gateway.ts +++ b/packages/aws-cdk-lib/aws-appmesh/lib/virtual-gateway.ts @@ -1,5 +1,3 @@ -import * as iam from '../../aws-iam'; -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { CfnVirtualGateway } from './appmesh.generated'; import { GatewayRoute, GatewayRouteBaseProps } from './gateway-route'; @@ -7,6 +5,8 @@ import { IMesh, Mesh } from './mesh'; import { renderTlsClientPolicy, renderMeshOwner } from './private/utils'; import { AccessLog, BackendDefaults } from './shared-interfaces'; import { VirtualGatewayListener, VirtualGatewayListenerConfig } from './virtual-gateway-listener'; +import * as iam from '../../aws-iam'; +import * as cdk from '../../core'; /** * Interface which all Virtual Gateway based classes must implement diff --git a/packages/aws-cdk-lib/aws-appmesh/lib/virtual-node.ts b/packages/aws-cdk-lib/aws-appmesh/lib/virtual-node.ts index afef440db094a..214b77ab91c2b 100644 --- a/packages/aws-cdk-lib/aws-appmesh/lib/virtual-node.ts +++ b/packages/aws-cdk-lib/aws-appmesh/lib/virtual-node.ts @@ -1,5 +1,3 @@ -import * as iam from '../../aws-iam'; -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { CfnVirtualNode } from './appmesh.generated'; import { IMesh, Mesh } from './mesh'; @@ -7,6 +5,8 @@ import { renderMeshOwner, renderTlsClientPolicy } from './private/utils'; import { ServiceDiscovery, ServiceDiscoveryConfig } from './service-discovery'; import { AccessLog, BackendDefaults, Backend } from './shared-interfaces'; import { VirtualNodeListener, VirtualNodeListenerConfig } from './virtual-node-listener'; +import * as iam from '../../aws-iam'; +import * as cdk from '../../core'; /** * Interface which all VirtualNode based classes must implement diff --git a/packages/aws-cdk-lib/aws-appmesh/lib/virtual-router.ts b/packages/aws-cdk-lib/aws-appmesh/lib/virtual-router.ts index 00373de19f99d..1888276184b41 100644 --- a/packages/aws-cdk-lib/aws-appmesh/lib/virtual-router.ts +++ b/packages/aws-cdk-lib/aws-appmesh/lib/virtual-router.ts @@ -1,10 +1,10 @@ -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { CfnVirtualRouter } from './appmesh.generated'; import { IMesh, Mesh } from './mesh'; import { renderMeshOwner } from './private/utils'; import { Route, RouteBaseProps } from './route'; import { VirtualRouterListener } from './virtual-router-listener'; +import * as cdk from '../../core'; /** * Interface which all VirtualRouter based classes MUST implement diff --git a/packages/aws-cdk-lib/aws-appmesh/lib/virtual-service.ts b/packages/aws-cdk-lib/aws-appmesh/lib/virtual-service.ts index 4cddf68108057..1c5d3138f96cc 100644 --- a/packages/aws-cdk-lib/aws-appmesh/lib/virtual-service.ts +++ b/packages/aws-cdk-lib/aws-appmesh/lib/virtual-service.ts @@ -1,10 +1,10 @@ -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { CfnVirtualService } from './appmesh.generated'; import { IMesh, Mesh } from './mesh'; import { renderMeshOwner } from './private/utils'; import { IVirtualNode } from './virtual-node'; import { IVirtualRouter } from './virtual-router'; +import * as cdk from '../../core'; /** * Represents the interface which all VirtualService based classes MUST implement diff --git a/packages/aws-cdk-lib/aws-appsync/lib/appsync-function.ts b/packages/aws-cdk-lib/aws-appsync/lib/appsync-function.ts index cd4bd16c0ce82..19c1a959a90b5 100644 --- a/packages/aws-cdk-lib/aws-appsync/lib/appsync-function.ts +++ b/packages/aws-cdk-lib/aws-appsync/lib/appsync-function.ts @@ -1,4 +1,3 @@ -import { Resource, IResource, Lazy, Fn } from '../../core'; import { Construct } from 'constructs'; import { CfnFunctionConfiguration } from './appsync.generated'; import { Code } from './code'; @@ -6,6 +5,7 @@ import { BaseDataSource } from './data-source'; import { IGraphqlApi } from './graphqlapi-base'; import { MappingTemplate } from './mapping-template'; import { FunctionRuntime } from './runtime'; +import { Resource, IResource, Lazy, Fn } from '../../core'; /** * the base properties for AppSync Functions diff --git a/packages/aws-cdk-lib/aws-appsync/lib/code.ts b/packages/aws-cdk-lib/aws-appsync/lib/code.ts index a0775c40b93be..d38a2ee672f1f 100644 --- a/packages/aws-cdk-lib/aws-appsync/lib/code.ts +++ b/packages/aws-cdk-lib/aws-appsync/lib/code.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as s3_assets from '../../aws-s3-assets'; import * as cdk from '../../core'; -import { Construct } from 'constructs'; /** * Result of binding `Code` into a `Function`. diff --git a/packages/aws-cdk-lib/aws-appsync/lib/data-source.ts b/packages/aws-cdk-lib/aws-appsync/lib/data-source.ts index 9c2cffb75d9a5..0b10c3726d4c1 100644 --- a/packages/aws-cdk-lib/aws-appsync/lib/data-source.ts +++ b/packages/aws-cdk-lib/aws-appsync/lib/data-source.ts @@ -1,17 +1,17 @@ +import { Construct } from 'constructs'; +import { BaseAppsyncFunctionProps, AppsyncFunction } from './appsync-function'; +import { CfnDataSource } from './appsync.generated'; +import { IGraphqlApi } from './graphqlapi-base'; +import { BaseResolverProps, Resolver } from './resolver'; import { ITable } from '../../aws-dynamodb'; import { IDomain as IElasticsearchDomain } from '../../aws-elasticsearch'; +import { IEventBus } from '../../aws-events'; import { Grant, IGrantable, IPrincipal, IRole, Role, ServicePrincipal } from '../../aws-iam'; import { IFunction } from '../../aws-lambda'; import { IDomain as IOpenSearchDomain } from '../../aws-opensearchservice'; import { IServerlessCluster } from '../../aws-rds'; import { ISecret } from '../../aws-secretsmanager'; import { IResolvable, Lazy, Stack, Token } from '../../core'; -import { Construct } from 'constructs'; -import { BaseAppsyncFunctionProps, AppsyncFunction } from './appsync-function'; -import { CfnDataSource } from './appsync.generated'; -import { IGraphqlApi } from './graphqlapi-base'; -import { BaseResolverProps, Resolver } from './resolver'; -import { IEventBus } from "../../aws-events"; /** * Base properties for an AppSync datasource diff --git a/packages/aws-cdk-lib/aws-appsync/lib/graphqlapi-base.ts b/packages/aws-cdk-lib/aws-appsync/lib/graphqlapi-base.ts index 483ffe91f9e94..5455e8e69444a 100644 --- a/packages/aws-cdk-lib/aws-appsync/lib/graphqlapi-base.ts +++ b/packages/aws-cdk-lib/aws-appsync/lib/graphqlapi-base.ts @@ -1,10 +1,3 @@ -import { ITable } from '../../aws-dynamodb'; -import { IDomain as IElasticsearchDomain } from '../../aws-elasticsearch'; -import { IFunction } from '../../aws-lambda'; -import { IDomain as IOpenSearchDomain } from '../../aws-opensearchservice'; -import { IServerlessCluster } from '../../aws-rds'; -import { ISecret } from '../../aws-secretsmanager'; -import { CfnResource, IResource, Resource } from '../../core'; import { DynamoDbDataSource, HttpDataSource, @@ -14,10 +7,17 @@ import { AwsIamConfig, ElasticsearchDataSource, OpenSearchDataSource, - EventBridgeDataSource + EventBridgeDataSource, } from './data-source'; import { Resolver, ExtendedResolverProps } from './resolver'; -import { IEventBus } from "../../aws-events"; +import { ITable } from '../../aws-dynamodb'; +import { IDomain as IElasticsearchDomain } from '../../aws-elasticsearch'; +import { IEventBus } from '../../aws-events'; +import { IFunction } from '../../aws-lambda'; +import { IDomain as IOpenSearchDomain } from '../../aws-opensearchservice'; +import { IServerlessCluster } from '../../aws-rds'; +import { ISecret } from '../../aws-secretsmanager'; +import { CfnResource, IResource, Resource } from '../../core'; /** * Optional configuration for data sources @@ -297,7 +297,7 @@ export abstract class GraphqlApiBase extends Resource implements IGraphqlApi { api: this, eventBus, name: options?.name, - description: options?.description + description: options?.description, }); } diff --git a/packages/aws-cdk-lib/aws-appsync/lib/graphqlapi.ts b/packages/aws-cdk-lib/aws-appsync/lib/graphqlapi.ts index dc227286f99b9..a08153b92db81 100644 --- a/packages/aws-cdk-lib/aws-appsync/lib/graphqlapi.ts +++ b/packages/aws-cdk-lib/aws-appsync/lib/graphqlapi.ts @@ -1,13 +1,13 @@ +import { Construct } from 'constructs'; +import { CfnApiKey, CfnGraphQLApi, CfnGraphQLSchema, CfnDomainName, CfnDomainNameApiAssociation } from './appsync.generated'; +import { IGraphqlApi, GraphqlApiBase } from './graphqlapi-base'; +import { ISchema } from './schema'; import { ICertificate } from '../../aws-certificatemanager'; import { IUserPool } from '../../aws-cognito'; import { ManagedPolicy, Role, IRole, ServicePrincipal, Grant, IGrantable } from '../../aws-iam'; import { IFunction } from '../../aws-lambda'; import { ILogGroup, LogGroup, LogRetention, RetentionDays } from '../../aws-logs'; import { ArnFormat, CfnResource, Duration, Expiration, IResolvable, Stack } from '../../core'; -import { Construct } from 'constructs'; -import { CfnApiKey, CfnGraphQLApi, CfnGraphQLSchema, CfnDomainName, CfnDomainNameApiAssociation } from './appsync.generated'; -import { IGraphqlApi, GraphqlApiBase } from './graphqlapi-base'; -import { ISchema } from './schema'; /** * enum with all possible values for AppSync authorization type diff --git a/packages/aws-cdk-lib/aws-appsync/lib/resolver.ts b/packages/aws-cdk-lib/aws-appsync/lib/resolver.ts index 700c4eae810cb..6fc311aef634a 100644 --- a/packages/aws-cdk-lib/aws-appsync/lib/resolver.ts +++ b/packages/aws-cdk-lib/aws-appsync/lib/resolver.ts @@ -1,4 +1,3 @@ -import { Token } from '../../core'; import { Construct } from 'constructs'; import { IAppsyncFunction } from './appsync-function'; import { CfnResolver } from './appsync.generated'; @@ -9,6 +8,7 @@ import { BaseDataSource } from './data-source'; import { IGraphqlApi } from './graphqlapi-base'; import { MappingTemplate } from './mapping-template'; import { FunctionRuntime } from './runtime'; +import { Token } from '../../core'; /** * Basic properties for an AppSync resolver diff --git a/packages/aws-cdk-lib/aws-appsync/test/appsync-elasticsearch.test.ts b/packages/aws-cdk-lib/aws-appsync/test/appsync-elasticsearch.test.ts index 6d0fda9e67fa0..af624325fea3d 100644 --- a/packages/aws-cdk-lib/aws-appsync/test/appsync-elasticsearch.test.ts +++ b/packages/aws-cdk-lib/aws-appsync/test/appsync-elasticsearch.test.ts @@ -1,7 +1,7 @@ import * as path from 'path'; +import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from '../../assertions'; import * as es from '../../aws-elasticsearch'; -import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../core'; import * as appsync from '../lib'; diff --git a/packages/aws-cdk-lib/aws-autoscaling-hooktargets/lib/common.ts b/packages/aws-cdk-lib/aws-autoscaling-hooktargets/lib/common.ts index 77ab0af64e804..558bc29ad608c 100644 --- a/packages/aws-cdk-lib/aws-autoscaling-hooktargets/lib/common.ts +++ b/packages/aws-cdk-lib/aws-autoscaling-hooktargets/lib/common.ts @@ -1,6 +1,6 @@ // eslint-disable-next-line import/order -import * as iam from '../../aws-iam'; import * as constructs from 'constructs'; +import * as iam from '../../aws-iam'; export function createRole(scope: constructs.Construct, _role?: iam.IRole) { let role = _role; diff --git a/packages/aws-cdk-lib/aws-autoscaling-hooktargets/lib/lambda-hook.ts b/packages/aws-cdk-lib/aws-autoscaling-hooktargets/lib/lambda-hook.ts index dbf561d74e969..b280eee97971d 100644 --- a/packages/aws-cdk-lib/aws-autoscaling-hooktargets/lib/lambda-hook.ts +++ b/packages/aws-cdk-lib/aws-autoscaling-hooktargets/lib/lambda-hook.ts @@ -1,11 +1,11 @@ +import { Construct } from 'constructs'; +import { createRole } from './common'; +import { TopicHook } from './topic-hook'; import * as autoscaling from '../../aws-autoscaling'; import * as kms from '../../aws-kms'; import * as lambda from '../../aws-lambda'; import * as sns from '../../aws-sns'; import * as subs from '../../aws-sns-subscriptions'; -import { Construct } from 'constructs'; -import { createRole } from './common'; -import { TopicHook } from './topic-hook'; /** * Use a Lambda Function as a hook target diff --git a/packages/aws-cdk-lib/aws-autoscaling-hooktargets/lib/queue-hook.ts b/packages/aws-cdk-lib/aws-autoscaling-hooktargets/lib/queue-hook.ts index 06395feac7dc0..2b034604362f6 100644 --- a/packages/aws-cdk-lib/aws-autoscaling-hooktargets/lib/queue-hook.ts +++ b/packages/aws-cdk-lib/aws-autoscaling-hooktargets/lib/queue-hook.ts @@ -1,7 +1,7 @@ -import * as autoscaling from '../../aws-autoscaling'; -import * as sqs from '../../aws-sqs'; import { Construct } from 'constructs'; import { createRole } from './common'; +import * as autoscaling from '../../aws-autoscaling'; +import * as sqs from '../../aws-sqs'; /** * Use an SQS queue as a hook target diff --git a/packages/aws-cdk-lib/aws-autoscaling-hooktargets/lib/topic-hook.ts b/packages/aws-cdk-lib/aws-autoscaling-hooktargets/lib/topic-hook.ts index 31c381abce62f..bb3fc5bf32417 100644 --- a/packages/aws-cdk-lib/aws-autoscaling-hooktargets/lib/topic-hook.ts +++ b/packages/aws-cdk-lib/aws-autoscaling-hooktargets/lib/topic-hook.ts @@ -1,7 +1,7 @@ -import * as autoscaling from '../../aws-autoscaling'; -import * as sns from '../../aws-sns'; import { Construct } from 'constructs'; import { createRole } from './common'; +import * as autoscaling from '../../aws-autoscaling'; +import * as sns from '../../aws-sns'; /** * Use an SNS topic as a hook target diff --git a/packages/aws-cdk-lib/aws-autoscaling/lib/aspects/require-imdsv2-aspect.ts b/packages/aws-cdk-lib/aws-autoscaling/lib/aspects/require-imdsv2-aspect.ts index af4d53b70e689..158ccf9b5b094 100644 --- a/packages/aws-cdk-lib/aws-autoscaling/lib/aspects/require-imdsv2-aspect.ts +++ b/packages/aws-cdk-lib/aws-autoscaling/lib/aspects/require-imdsv2-aspect.ts @@ -1,5 +1,5 @@ -import * as cdk from '../../../core'; import { IConstruct } from 'constructs'; +import * as cdk from '../../../core'; import { AutoScalingGroup } from '../auto-scaling-group'; import { CfnLaunchConfiguration } from '../autoscaling.generated'; diff --git a/packages/aws-cdk-lib/aws-autoscaling/lib/auto-scaling-group.ts b/packages/aws-cdk-lib/aws-autoscaling/lib/auto-scaling-group.ts index 48f28faa1f32a..602273347de5a 100644 --- a/packages/aws-cdk-lib/aws-autoscaling/lib/auto-scaling-group.ts +++ b/packages/aws-cdk-lib/aws-autoscaling/lib/auto-scaling-group.ts @@ -1,10 +1,20 @@ + +import { Construct } from 'constructs'; +import { AutoScalingGroupRequireImdsv2Aspect } from './aspects'; +import { CfnAutoScalingGroup, CfnAutoScalingGroupProps, CfnLaunchConfiguration } from './autoscaling.generated'; +import { BasicLifecycleHookProps, LifecycleHook } from './lifecycle-hook'; +import { BasicScheduledActionProps, ScheduledAction } from './scheduled-action'; +import { BasicStepScalingPolicyProps, StepScalingPolicy } from './step-scaling-policy'; +import { BaseTargetTrackingProps, PredefinedMetric, TargetTrackingScalingPolicy } from './target-tracking-scaling-policy'; +import { TerminationPolicy } from './termination-policy'; +import { BlockDevice, BlockDeviceVolume, EbsDeviceVolumeType } from './volume'; +import { WarmPool, WarmPoolOptions } from './warm-pool'; import * as cloudwatch from '../../aws-cloudwatch'; import * as ec2 from '../../aws-ec2'; import * as elb from '../../aws-elasticloadbalancing'; import * as elbv2 from '../../aws-elasticloadbalancingv2'; import * as iam from '../../aws-iam'; import * as sns from '../../aws-sns'; - import { Annotations, Aspects, @@ -14,16 +24,6 @@ import { Token, Tokenization, withResolved, } from '../../core'; -import { Construct } from 'constructs'; -import { AutoScalingGroupRequireImdsv2Aspect } from './aspects'; -import { CfnAutoScalingGroup, CfnAutoScalingGroupProps, CfnLaunchConfiguration } from './autoscaling.generated'; -import { BasicLifecycleHookProps, LifecycleHook } from './lifecycle-hook'; -import { BasicScheduledActionProps, ScheduledAction } from './scheduled-action'; -import { BasicStepScalingPolicyProps, StepScalingPolicy } from './step-scaling-policy'; -import { BaseTargetTrackingProps, PredefinedMetric, TargetTrackingScalingPolicy } from './target-tracking-scaling-policy'; -import { TerminationPolicy } from './termination-policy'; -import { BlockDevice, BlockDeviceVolume, EbsDeviceVolumeType } from './volume'; -import { WarmPool, WarmPoolOptions } from './warm-pool'; /** * Name tag constant diff --git a/packages/aws-cdk-lib/aws-autoscaling/lib/lifecycle-hook-target.ts b/packages/aws-cdk-lib/aws-autoscaling/lib/lifecycle-hook-target.ts index 829f67dff1d76..3c255a2b61638 100644 --- a/packages/aws-cdk-lib/aws-autoscaling/lib/lifecycle-hook-target.ts +++ b/packages/aws-cdk-lib/aws-autoscaling/lib/lifecycle-hook-target.ts @@ -1,7 +1,7 @@ // eslint-disable-next-line import/order +import * as constructs from 'constructs'; import { LifecycleHook } from './lifecycle-hook'; import * as iam from '../../aws-iam'; -import * as constructs from 'constructs'; /** * Options needed to bind a target to a lifecycle hook. diff --git a/packages/aws-cdk-lib/aws-autoscaling/lib/lifecycle-hook.ts b/packages/aws-cdk-lib/aws-autoscaling/lib/lifecycle-hook.ts index bc8cbe166a8d3..d2ecb1316fcfd 100644 --- a/packages/aws-cdk-lib/aws-autoscaling/lib/lifecycle-hook.ts +++ b/packages/aws-cdk-lib/aws-autoscaling/lib/lifecycle-hook.ts @@ -1,9 +1,9 @@ -import * as iam from '../../aws-iam'; -import { Duration, IResource, Resource } from '../../core'; import { Construct } from 'constructs'; import { IAutoScalingGroup } from './auto-scaling-group'; import { CfnLifecycleHook } from './autoscaling.generated'; import { ILifecycleHookTarget } from './lifecycle-hook-target'; +import * as iam from '../../aws-iam'; +import { Duration, IResource, Resource } from '../../core'; /** * Basic properties for a lifecycle hook diff --git a/packages/aws-cdk-lib/aws-autoscaling/lib/schedule.ts b/packages/aws-cdk-lib/aws-autoscaling/lib/schedule.ts index 009b7fda02cc1..e0eb783f43519 100644 --- a/packages/aws-cdk-lib/aws-autoscaling/lib/schedule.ts +++ b/packages/aws-cdk-lib/aws-autoscaling/lib/schedule.ts @@ -1,5 +1,5 @@ -import { Annotations } from '../../core'; import { Construct } from 'constructs'; +import { Annotations } from '../../core'; /** * Schedule for scheduled scaling actions diff --git a/packages/aws-cdk-lib/aws-autoscaling/lib/scheduled-action.ts b/packages/aws-cdk-lib/aws-autoscaling/lib/scheduled-action.ts index 2bfb30921372d..84b2d55f63b1d 100644 --- a/packages/aws-cdk-lib/aws-autoscaling/lib/scheduled-action.ts +++ b/packages/aws-cdk-lib/aws-autoscaling/lib/scheduled-action.ts @@ -1,8 +1,8 @@ -import { Resource } from '../../core'; import { Construct } from 'constructs'; import { IAutoScalingGroup } from './auto-scaling-group'; import { CfnScheduledAction } from './autoscaling.generated'; import { Schedule } from './schedule'; +import { Resource } from '../../core'; /** * Properties for a scheduled scaling action diff --git a/packages/aws-cdk-lib/aws-autoscaling/lib/step-scaling-action.ts b/packages/aws-cdk-lib/aws-autoscaling/lib/step-scaling-action.ts index 7f10199e753a4..d912fb0121e21 100644 --- a/packages/aws-cdk-lib/aws-autoscaling/lib/step-scaling-action.ts +++ b/packages/aws-cdk-lib/aws-autoscaling/lib/step-scaling-action.ts @@ -1,7 +1,7 @@ -import { Duration, Lazy } from '../../core'; import { Construct } from 'constructs'; import { IAutoScalingGroup } from './auto-scaling-group'; import { CfnScalingPolicy } from './autoscaling.generated'; +import { Duration, Lazy } from '../../core'; /** * Properties for a scaling policy diff --git a/packages/aws-cdk-lib/aws-autoscaling/lib/step-scaling-policy.ts b/packages/aws-cdk-lib/aws-autoscaling/lib/step-scaling-policy.ts index 2bffe9aa808c6..1da657f8aae5e 100644 --- a/packages/aws-cdk-lib/aws-autoscaling/lib/step-scaling-policy.ts +++ b/packages/aws-cdk-lib/aws-autoscaling/lib/step-scaling-policy.ts @@ -1,9 +1,9 @@ -import { findAlarmThresholds, normalizeIntervals } from '../../aws-autoscaling-common'; -import * as cloudwatch from '../../aws-cloudwatch'; -import { Duration } from '../../core'; import { Construct } from 'constructs'; import { IAutoScalingGroup } from './auto-scaling-group'; import { AdjustmentType, MetricAggregationType, StepScalingAction } from './step-scaling-action'; +import { findAlarmThresholds, normalizeIntervals } from '../../aws-autoscaling-common'; +import * as cloudwatch from '../../aws-cloudwatch'; +import { Duration } from '../../core'; export interface BasicStepScalingPolicyProps { /** diff --git a/packages/aws-cdk-lib/aws-autoscaling/lib/target-tracking-scaling-policy.ts b/packages/aws-cdk-lib/aws-autoscaling/lib/target-tracking-scaling-policy.ts index bb0a752309fcd..9073a16afd610 100644 --- a/packages/aws-cdk-lib/aws-autoscaling/lib/target-tracking-scaling-policy.ts +++ b/packages/aws-cdk-lib/aws-autoscaling/lib/target-tracking-scaling-policy.ts @@ -1,8 +1,8 @@ -import * as cloudwatch from '../../aws-cloudwatch'; -import { Duration } from '../../core'; import { Construct } from 'constructs'; import { IAutoScalingGroup } from './auto-scaling-group'; import { CfnScalingPolicy } from './autoscaling.generated'; +import * as cloudwatch from '../../aws-cloudwatch'; +import { Duration } from '../../core'; /** * Base interface for target tracking props diff --git a/packages/aws-cdk-lib/aws-autoscaling/lib/warm-pool.ts b/packages/aws-cdk-lib/aws-autoscaling/lib/warm-pool.ts index e30537ae9fc4a..6803f2fc5bf8c 100644 --- a/packages/aws-cdk-lib/aws-autoscaling/lib/warm-pool.ts +++ b/packages/aws-cdk-lib/aws-autoscaling/lib/warm-pool.ts @@ -1,7 +1,7 @@ -import { Lazy, Names, Resource } from '../../core'; import { Construct } from 'constructs'; import { IAutoScalingGroup } from './auto-scaling-group'; import { CfnWarmPool } from './autoscaling.generated'; +import { Lazy, Names, Resource } from '../../core'; /** * Options for a warm pool diff --git a/packages/aws-cdk-lib/aws-autoscaling/test/auto-scaling-group.test.ts b/packages/aws-cdk-lib/aws-autoscaling/test/auto-scaling-group.test.ts index a052a51d8a877..3e5b8a9fc030c 100644 --- a/packages/aws-cdk-lib/aws-autoscaling/test/auto-scaling-group.test.ts +++ b/packages/aws-cdk-lib/aws-autoscaling/test/auto-scaling-group.test.ts @@ -1,3 +1,4 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Annotations, Match, Template } from '../../assertions'; import * as cloudwatch from '../../aws-cloudwatch'; import * as ec2 from '../../aws-ec2'; @@ -5,7 +6,6 @@ import { AmazonLinuxCpuType, AmazonLinuxGeneration, AmazonLinuxImage, InstanceTy import { ApplicationListener, ApplicationLoadBalancer, ApplicationTargetGroup } from '../../aws-elasticloadbalancingv2'; import * as iam from '../../aws-iam'; import * as sns from '../../aws-sns'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../core'; import * as autoscaling from '../lib'; import { OnDemandAllocationStrategy, SpotAllocationStrategy } from '../lib'; diff --git a/packages/aws-cdk-lib/aws-autoscaling/test/lifecyclehooks.test.ts b/packages/aws-cdk-lib/aws-autoscaling/test/lifecyclehooks.test.ts index 2b49c8a7368cc..56dff342cc6a8 100644 --- a/packages/aws-cdk-lib/aws-autoscaling/test/lifecyclehooks.test.ts +++ b/packages/aws-cdk-lib/aws-autoscaling/test/lifecyclehooks.test.ts @@ -1,8 +1,8 @@ +import * as constructs from 'constructs'; import { Match, Template } from '../../assertions'; import * as ec2 from '../../aws-ec2'; import * as iam from '../../aws-iam'; import * as cdk from '../../core'; -import * as constructs from 'constructs'; import * as autoscaling from '../lib'; describe('lifecycle hooks', () => { diff --git a/packages/aws-cdk-lib/aws-autoscaling/test/scaling.test.ts b/packages/aws-cdk-lib/aws-autoscaling/test/scaling.test.ts index 812370f9b002e..cc748c580abf7 100644 --- a/packages/aws-cdk-lib/aws-autoscaling/test/scaling.test.ts +++ b/packages/aws-cdk-lib/aws-autoscaling/test/scaling.test.ts @@ -1,9 +1,9 @@ +import { Construct } from 'constructs'; import { Template } from '../../assertions'; import * as cloudwatch from '../../aws-cloudwatch'; import * as ec2 from '../../aws-ec2'; import * as elbv2 from '../../aws-elasticloadbalancingv2'; import * as cdk from '../../core'; -import { Construct } from 'constructs'; import * as autoscaling from '../lib'; describe('scaling', () => { diff --git a/packages/aws-cdk-lib/aws-autoscaling/test/scheduled-action.test.ts b/packages/aws-cdk-lib/aws-autoscaling/test/scheduled-action.test.ts index 9b57c026052ff..10fbdfe7066b6 100644 --- a/packages/aws-cdk-lib/aws-autoscaling/test/scheduled-action.test.ts +++ b/packages/aws-cdk-lib/aws-autoscaling/test/scheduled-action.test.ts @@ -1,8 +1,8 @@ +import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; +import * as constructs from 'constructs'; import { Annotations, Match, Template } from '../../assertions'; import * as ec2 from '../../aws-ec2'; -import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../core'; -import * as constructs from 'constructs'; import * as autoscaling from '../lib'; describeDeprecated('scheduled action', () => { diff --git a/packages/aws-cdk-lib/aws-backup/lib/backupable-resources-collector.ts b/packages/aws-cdk-lib/aws-backup/lib/backupable-resources-collector.ts index a05beedcba59f..5f8be4f848902 100644 --- a/packages/aws-cdk-lib/aws-backup/lib/backupable-resources-collector.ts +++ b/packages/aws-cdk-lib/aws-backup/lib/backupable-resources-collector.ts @@ -1,9 +1,9 @@ +import { IConstruct } from 'constructs'; import * as dynamodb from '../../aws-dynamodb'; import * as ec2 from '../../aws-ec2'; import * as efs from '../../aws-efs'; import * as rds from '../../aws-rds'; import { ArnFormat, IAspect, Stack } from '../../core'; -import { IConstruct } from 'constructs'; export class BackupableResourcesCollector implements IAspect { public readonly resources: string[] = []; diff --git a/packages/aws-cdk-lib/aws-backup/lib/plan.ts b/packages/aws-cdk-lib/aws-backup/lib/plan.ts index d01e9754ee1f7..bc87b9d4b6c44 100644 --- a/packages/aws-cdk-lib/aws-backup/lib/plan.ts +++ b/packages/aws-cdk-lib/aws-backup/lib/plan.ts @@ -1,9 +1,9 @@ -import { IResource, Lazy, Resource } from '../../core'; import { Construct } from 'constructs'; import { CfnBackupPlan } from './backup.generated'; import { BackupPlanCopyActionProps, BackupPlanRule } from './rule'; import { BackupSelection, BackupSelectionOptions } from './selection'; import { BackupVault, IBackupVault } from './vault'; +import { IResource, Lazy, Resource } from '../../core'; /** * A backup plan diff --git a/packages/aws-cdk-lib/aws-backup/lib/resource.ts b/packages/aws-cdk-lib/aws-backup/lib/resource.ts index 0378b091b72a2..737976cf193e2 100644 --- a/packages/aws-cdk-lib/aws-backup/lib/resource.ts +++ b/packages/aws-cdk-lib/aws-backup/lib/resource.ts @@ -1,9 +1,9 @@ +import { Construct } from 'constructs'; import * as dynamodb from '../../aws-dynamodb'; import * as ec2 from '../../aws-ec2'; import * as efs from '../../aws-efs'; import * as rds from '../../aws-rds'; import { Stack } from '../../core'; -import { Construct } from 'constructs'; /** * An operation that is applied to a key-value pair diff --git a/packages/aws-cdk-lib/aws-backup/lib/rule.ts b/packages/aws-cdk-lib/aws-backup/lib/rule.ts index e386a8d52bcfa..131e09585e57c 100644 --- a/packages/aws-cdk-lib/aws-backup/lib/rule.ts +++ b/packages/aws-cdk-lib/aws-backup/lib/rule.ts @@ -1,6 +1,6 @@ +import { IBackupVault } from './vault'; import * as events from '../../aws-events'; import { Duration, Token } from '../../core'; -import { IBackupVault } from './vault'; /** * Properties for a BackupPlanRule diff --git a/packages/aws-cdk-lib/aws-backup/lib/selection.ts b/packages/aws-cdk-lib/aws-backup/lib/selection.ts index 6517c2dabec96..3f051c2c447e5 100644 --- a/packages/aws-cdk-lib/aws-backup/lib/selection.ts +++ b/packages/aws-cdk-lib/aws-backup/lib/selection.ts @@ -1,10 +1,10 @@ -import * as iam from '../../aws-iam'; -import { Lazy, Resource, Aspects } from '../../core'; import { Construct } from 'constructs'; import { CfnBackupSelection } from './backup.generated'; import { BackupableResourcesCollector } from './backupable-resources-collector'; import { IBackupPlan } from './plan'; import { BackupResource, TagOperation } from './resource'; +import * as iam from '../../aws-iam'; +import { Lazy, Resource, Aspects } from '../../core'; /** * Options for a BackupSelection diff --git a/packages/aws-cdk-lib/aws-backup/lib/vault.ts b/packages/aws-cdk-lib/aws-backup/lib/vault.ts index 2bdebb758b5ff..4f52ba937a2b4 100644 --- a/packages/aws-cdk-lib/aws-backup/lib/vault.ts +++ b/packages/aws-cdk-lib/aws-backup/lib/vault.ts @@ -1,9 +1,9 @@ +import { Construct } from 'constructs'; +import { CfnBackupVault } from './backup.generated'; import * as iam from '../../aws-iam'; import * as kms from '../../aws-kms'; import * as sns from '../../aws-sns'; import { ArnFormat, Duration, IResource, Lazy, Names, RemovalPolicy, Resource, Stack } from '../../core'; -import { Construct } from 'constructs'; -import { CfnBackupVault } from './backup.generated'; /** * A backup vault diff --git a/packages/aws-cdk-lib/aws-backup/test/selection.test.ts b/packages/aws-cdk-lib/aws-backup/test/selection.test.ts index 63b0257d9dfec..fd97c4b8ca482 100644 --- a/packages/aws-cdk-lib/aws-backup/test/selection.test.ts +++ b/packages/aws-cdk-lib/aws-backup/test/selection.test.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; import { Template } from '../../assertions'; import * as dynamodb from '../../aws-dynamodb'; import * as ec2 from '../../aws-ec2'; import * as efs from '../../aws-efs'; import * as rds from '../../aws-rds'; import { RemovalPolicy, Stack } from '../../core'; -import { Construct } from 'constructs'; import { BackupPlan, BackupResource, BackupSelection } from '../lib'; let stack: Stack; diff --git a/packages/aws-cdk-lib/aws-backupgateway/.jsiirc.json b/packages/aws-cdk-lib/aws-backupgateway/.jsiirc.json new file mode 100644 index 0000000000000..da087046f85d3 --- /dev/null +++ b/packages/aws-cdk-lib/aws-backupgateway/.jsiirc.json @@ -0,0 +1,13 @@ +{ + "targets": { + "java": { + "package": "services.backupgateway" + }, + "dotnet": { + "package": "Amazon.CDK.AWS.BackupGateway" + }, + "python": { + "module": "aws_cdk.aws_backupgateway" + } + } +} diff --git a/packages/aws-cdk-lib/aws-backupgateway/index.ts b/packages/aws-cdk-lib/aws-backupgateway/index.ts new file mode 100644 index 0000000000000..f41a696fd204d --- /dev/null +++ b/packages/aws-cdk-lib/aws-backupgateway/index.ts @@ -0,0 +1 @@ +export * from './lib'; diff --git a/packages/aws-cdk-lib/aws-backupgateway/lib/index.ts b/packages/aws-cdk-lib/aws-backupgateway/lib/index.ts new file mode 100644 index 0000000000000..d8b3a8a181a99 --- /dev/null +++ b/packages/aws-cdk-lib/aws-backupgateway/lib/index.ts @@ -0,0 +1,2 @@ +// AWS::BackupGateway Cloudformation Resources +export * from './backupgateway.generated'; diff --git a/packages/aws-cdk-lib/aws-certificatemanager/lib/certificate-base.ts b/packages/aws-cdk-lib/aws-certificatemanager/lib/certificate-base.ts index b819a467cc4c4..6cd1e913fd439 100644 --- a/packages/aws-cdk-lib/aws-certificatemanager/lib/certificate-base.ts +++ b/packages/aws-cdk-lib/aws-certificatemanager/lib/certificate-base.ts @@ -1,7 +1,7 @@ +import { ICertificate } from './certificate'; import * as cloudwatch from '../../aws-cloudwatch'; import { Stats } from '../../aws-cloudwatch'; import { Duration, Resource } from '../../core'; -import { ICertificate } from './certificate'; /** * Shared implementation details of ICertificate implementations. diff --git a/packages/aws-cdk-lib/aws-certificatemanager/lib/certificate.ts b/packages/aws-cdk-lib/aws-certificatemanager/lib/certificate.ts index 58b3d467fb030..4590db59879cf 100644 --- a/packages/aws-cdk-lib/aws-certificatemanager/lib/certificate.ts +++ b/packages/aws-cdk-lib/aws-certificatemanager/lib/certificate.ts @@ -1,10 +1,10 @@ -import * as cloudwatch from '../../aws-cloudwatch'; -import * as route53 from '../../aws-route53'; -import { IResource, Token, Tags } from '../../core'; import { Construct } from 'constructs'; import { CertificateBase } from './certificate-base'; import { CfnCertificate } from './certificatemanager.generated'; import { apexDomain } from './util'; +import * as cloudwatch from '../../aws-cloudwatch'; +import * as route53 from '../../aws-route53'; +import { IResource, Token, Tags } from '../../core'; /** * Name tag constant diff --git a/packages/aws-cdk-lib/aws-certificatemanager/lib/dns-validated-certificate.ts b/packages/aws-cdk-lib/aws-certificatemanager/lib/dns-validated-certificate.ts index 45462a2bee443..311df4f00447c 100644 --- a/packages/aws-cdk-lib/aws-certificatemanager/lib/dns-validated-certificate.ts +++ b/packages/aws-cdk-lib/aws-certificatemanager/lib/dns-validated-certificate.ts @@ -1,12 +1,12 @@ import * as path from 'path'; +import { Construct } from 'constructs'; +import { CertificateProps, ICertificate } from './certificate'; +import { CertificateBase } from './certificate-base'; import * as iam from '../../aws-iam'; import * as lambda from '../../aws-lambda'; import * as route53 from '../../aws-route53'; import * as cdk from '../../core'; import { Token } from '../../core'; -import { Construct } from 'constructs'; -import { CertificateProps, ICertificate } from './certificate'; -import { CertificateBase } from './certificate-base'; import { builtInCustomResourceNodeRuntime } from '../../custom-resources'; /** diff --git a/packages/aws-cdk-lib/aws-certificatemanager/lib/private-certificate.ts b/packages/aws-cdk-lib/aws-certificatemanager/lib/private-certificate.ts index feb347d52c22b..78ddbf849f3fe 100644 --- a/packages/aws-cdk-lib/aws-certificatemanager/lib/private-certificate.ts +++ b/packages/aws-cdk-lib/aws-certificatemanager/lib/private-certificate.ts @@ -1,8 +1,8 @@ -import * as acmpca from '../../aws-acmpca'; import { Construct } from 'constructs'; import { ICertificate } from './certificate'; import { CertificateBase } from './certificate-base'; import { CfnCertificate } from './certificatemanager.generated'; +import * as acmpca from '../../aws-acmpca'; /** * Properties for your private certificate diff --git a/packages/aws-cdk-lib/aws-certificatemanager/lib/util.ts b/packages/aws-cdk-lib/aws-certificatemanager/lib/util.ts index d14cff94da639..c6ec5c292c488 100644 --- a/packages/aws-cdk-lib/aws-certificatemanager/lib/util.ts +++ b/packages/aws-cdk-lib/aws-certificatemanager/lib/util.ts @@ -1,7 +1,7 @@ -import { Arn, ArnFormat, Stack, Token } from '../../core'; import { ICertificate } from './certificate'; import { DnsValidatedCertificate } from './dns-validated-certificate'; import { publicSuffixes } from './public-suffixes'; +import { Arn, ArnFormat, Stack, Token } from '../../core'; /** * Returns the apex domain (domain.com) from a subdomain (www.sub.domain.com) diff --git a/packages/aws-cdk-lib/aws-certificatemanager/test/dns-validated-certificate.test.ts b/packages/aws-cdk-lib/aws-certificatemanager/test/dns-validated-certificate.test.ts index 5ce7240d11d9b..830e3399e200a 100644 --- a/packages/aws-cdk-lib/aws-certificatemanager/test/dns-validated-certificate.test.ts +++ b/packages/aws-cdk-lib/aws-certificatemanager/test/dns-validated-certificate.test.ts @@ -1,7 +1,7 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from '../../assertions'; import * as iam from '../../aws-iam'; import { HostedZone, PublicHostedZone } from '../../aws-route53'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { App, Stack, Token, Tags, RemovalPolicy, Aws } from '../../core'; import { DnsValidatedCertificate } from '../lib/dns-validated-certificate'; @@ -36,10 +36,10 @@ testDeprecated('creates CloudFormation Custom Resource', () => { Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', { Handler: 'index.certificateRequestHandler', Runtime: { - "Fn::FindInMap": [ - "DefaultCrNodeVersionMap", - { Ref: "AWS::Region" }, - "value", + 'Fn::FindInMap': [ + 'DefaultCrNodeVersionMap', + { Ref: 'AWS::Region' }, + 'value', ], }, Timeout: 900, diff --git a/packages/aws-cdk-lib/aws-certificatemanager/test/example.dns-validated-request.lit.ts b/packages/aws-cdk-lib/aws-certificatemanager/test/example.dns-validated-request.lit.ts index f19d92d5aabfc..9e6175e88d030 100644 --- a/packages/aws-cdk-lib/aws-certificatemanager/test/example.dns-validated-request.lit.ts +++ b/packages/aws-cdk-lib/aws-certificatemanager/test/example.dns-validated-request.lit.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as route53 from '../../aws-route53'; import { App, Stack } from '../../core'; -import { Construct } from 'constructs'; import * as certmgr from '../lib'; class CertStack extends Stack { diff --git a/packages/aws-cdk-lib/aws-certificatemanager/test/util.test.ts b/packages/aws-cdk-lib/aws-certificatemanager/test/util.test.ts index d7c4aa5a5e2e5..817fedc06ae76 100644 --- a/packages/aws-cdk-lib/aws-certificatemanager/test/util.test.ts +++ b/packages/aws-cdk-lib/aws-certificatemanager/test/util.test.ts @@ -1,5 +1,5 @@ -import { PublicHostedZone } from '../../aws-route53'; import { testDeprecated } from '@aws-cdk/cdk-build-tools'; +import { PublicHostedZone } from '../../aws-route53'; import { App, Aws, Stack } from '../../core'; import { Certificate, DnsValidatedCertificate } from '../lib'; import { apexDomain, getCertificateRegion, isDnsValidatedCertificate } from '../lib/util'; diff --git a/packages/aws-cdk-lib/aws-chatbot/lib/slack-channel-configuration.ts b/packages/aws-cdk-lib/aws-chatbot/lib/slack-channel-configuration.ts index 25367157f2cb3..530975ab3a1d2 100644 --- a/packages/aws-cdk-lib/aws-chatbot/lib/slack-channel-configuration.ts +++ b/packages/aws-cdk-lib/aws-chatbot/lib/slack-channel-configuration.ts @@ -1,11 +1,11 @@ +import { Construct } from 'constructs'; +import { CfnSlackChannelConfiguration } from './chatbot.generated'; import * as cloudwatch from '../../aws-cloudwatch'; import * as notifications from '../../aws-codestarnotifications'; import * as iam from '../../aws-iam'; import * as logs from '../../aws-logs'; import * as sns from '../../aws-sns'; import * as cdk from '../../core'; -import { Construct } from 'constructs'; -import { CfnSlackChannelConfiguration } from './chatbot.generated'; /** * Properties for a new Slack channel configuration @@ -213,7 +213,7 @@ export class SlackChannelConfiguration extends SlackChannelConfigurationBase { const resourceName = cdk.Arn.extractResourceName(slackChannelConfigurationArn, 'chat-configuration'); if (!cdk.Token.isUnresolved(slackChannelConfigurationArn) && !re.test(resourceName)) { - throw new Error('The ARN of a Slack integration must be in the form: arn:aws:chatbot:{region}:{account}:chat-configuration/slack-channel/{slackChannelName}'); + throw new Error('The ARN of a Slack integration must be in the form: arn::chatbot:::chat-configuration/slack-channel/'); } class Import extends SlackChannelConfigurationBase { diff --git a/packages/aws-cdk-lib/aws-chatbot/test/slack-channel-configuration.test.ts b/packages/aws-cdk-lib/aws-chatbot/test/slack-channel-configuration.test.ts index 8233886bf6596..5d1ff3e94ccb2 100644 --- a/packages/aws-cdk-lib/aws-chatbot/test/slack-channel-configuration.test.ts +++ b/packages/aws-cdk-lib/aws-chatbot/test/slack-channel-configuration.test.ts @@ -254,7 +254,7 @@ describe('SlackChannelConfiguration', () => { test('should throw error if ARN invalid', () => { expect(() => chatbot.SlackChannelConfiguration.fromSlackChannelConfigurationArn(stack, 'MySlackChannel', 'arn:aws:chatbot::1234567890:chat-configuration/my-slack')).toThrow( - /The ARN of a Slack integration must be in the form: arn:aws:chatbot:{region}:{account}:chat-configuration\/slack-channel\/{slackChannelName}/, + /The ARN of a Slack integration must be in the form: arn::chatbot:::chat-configuration\/slack-channel\//, ); }); diff --git a/packages/aws-cdk-lib/aws-cloudformation/lib/custom-resource.ts b/packages/aws-cdk-lib/aws-cloudformation/lib/custom-resource.ts index c3bcb3d4da5f7..c9397c4b8af65 100644 --- a/packages/aws-cdk-lib/aws-cloudformation/lib/custom-resource.ts +++ b/packages/aws-cdk-lib/aws-cloudformation/lib/custom-resource.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as lambda from '../../aws-lambda'; import * as sns from '../../aws-sns'; import * as core from '../../core'; -import { Construct } from 'constructs'; /** * Collection of arbitrary properties diff --git a/packages/aws-cdk-lib/aws-cloudformation/lib/nested-stack.ts b/packages/aws-cdk-lib/aws-cloudformation/lib/nested-stack.ts index e1a66fc5790d6..13034a9e9a8d0 100644 --- a/packages/aws-cdk-lib/aws-cloudformation/lib/nested-stack.ts +++ b/packages/aws-cdk-lib/aws-cloudformation/lib/nested-stack.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as sns from '../../aws-sns'; import * as core from '../../core'; -import { Construct } from 'constructs'; /** * Initialization props for the `NestedStack` construct. diff --git a/packages/aws-cdk-lib/aws-cloudformation/test/deps.test.ts b/packages/aws-cdk-lib/aws-cloudformation/test/deps.test.ts index 43c9bc77f2f2e..19260efdd0eb0 100644 --- a/packages/aws-cdk-lib/aws-cloudformation/test/deps.test.ts +++ b/packages/aws-cdk-lib/aws-cloudformation/test/deps.test.ts @@ -1,7 +1,7 @@ import * as fs from 'fs'; import * as path from 'path'; -import { Template } from '../../assertions'; import { testDeprecated, describeDeprecated } from '@aws-cdk/cdk-build-tools'; +import { Template } from '../../assertions'; import { App, CfnResource, Stack } from '../../core'; import * as cxapi from '../../cx-api'; import { NestedStack } from '../lib'; diff --git a/packages/aws-cdk-lib/aws-cloudformation/test/nested-stack.test.ts b/packages/aws-cdk-lib/aws-cloudformation/test/nested-stack.test.ts index a976680c54e73..13ff15dd7883c 100644 --- a/packages/aws-cdk-lib/aws-cloudformation/test/nested-stack.test.ts +++ b/packages/aws-cdk-lib/aws-cloudformation/test/nested-stack.test.ts @@ -1,12 +1,12 @@ import * as fs from 'fs'; import * as path from 'path'; +import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; +import { Construct } from 'constructs'; import { Template } from '../../assertions'; import * as s3_assets from '../../aws-s3-assets'; import * as sns from '../../aws-sns'; -import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import { App, CfnParameter, CfnResource, ContextProvider, LegacyStackSynthesizer, Names, Stack } from '../../core'; import * as cxapi from '../../cx-api'; -import { Construct } from 'constructs'; import { NestedStack } from '../lib/nested-stack'; /* eslint-disable @aws-cdk/no-core-construct */ diff --git a/packages/aws-cdk-lib/aws-cloudformation/test/resource.test.ts b/packages/aws-cdk-lib/aws-cloudformation/test/resource.test.ts index bfbf573be1d12..390c600bce3ba 100644 --- a/packages/aws-cdk-lib/aws-cloudformation/test/resource.test.ts +++ b/packages/aws-cdk-lib/aws-cloudformation/test/resource.test.ts @@ -1,9 +1,9 @@ +import { describeDeprecated, testDeprecated } from '@aws-cdk/cdk-build-tools'; +import { Construct } from 'constructs'; import { Template } from '../../assertions'; import * as lambda from '../../aws-lambda'; import * as sns from '../../aws-sns'; -import { describeDeprecated, testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../core'; -import { Construct } from 'constructs'; import { CustomResource, CustomResourceProvider } from '../lib'; /* eslint-disable @aws-cdk/no-core-construct */ diff --git a/packages/aws-cdk-lib/aws-cloudfront-origins/lib/http-origin.ts b/packages/aws-cdk-lib/aws-cloudfront-origins/lib/http-origin.ts index e89ff222afe70..f6842b51145b1 100644 --- a/packages/aws-cdk-lib/aws-cloudfront-origins/lib/http-origin.ts +++ b/packages/aws-cdk-lib/aws-cloudfront-origins/lib/http-origin.ts @@ -1,6 +1,6 @@ +import { validateSecondsInRangeOrUndefined } from './private/utils'; import * as cloudfront from '../../aws-cloudfront'; import * as cdk from '../../core'; -import { validateSecondsInRangeOrUndefined } from './private/utils'; /** * Properties for an Origin backed by an S3 website-configured bucket, load balancer, or custom HTTP server. diff --git a/packages/aws-cdk-lib/aws-cloudfront-origins/lib/load-balancer-origin.ts b/packages/aws-cdk-lib/aws-cloudfront-origins/lib/load-balancer-origin.ts index 3611b96c9498a..67c7a3370e540 100644 --- a/packages/aws-cdk-lib/aws-cloudfront-origins/lib/load-balancer-origin.ts +++ b/packages/aws-cdk-lib/aws-cloudfront-origins/lib/load-balancer-origin.ts @@ -1,5 +1,5 @@ -import * as elbv2 from '../../aws-elasticloadbalancingv2'; import { HttpOrigin, HttpOriginProps } from './http-origin'; +import * as elbv2 from '../../aws-elasticloadbalancingv2'; /** * Properties for an Origin backed by a v2 load balancer. diff --git a/packages/aws-cdk-lib/aws-cloudfront-origins/lib/origin-group.ts b/packages/aws-cdk-lib/aws-cloudfront-origins/lib/origin-group.ts index a723dd4628432..cf057e2ab3412 100644 --- a/packages/aws-cdk-lib/aws-cloudfront-origins/lib/origin-group.ts +++ b/packages/aws-cdk-lib/aws-cloudfront-origins/lib/origin-group.ts @@ -1,5 +1,5 @@ -import * as cloudfront from '../../aws-cloudfront'; import { Construct } from 'constructs'; +import * as cloudfront from '../../aws-cloudfront'; /** Construction properties for `OriginGroup`. */ export interface OriginGroupProps { diff --git a/packages/aws-cdk-lib/aws-cloudfront-origins/lib/rest-api-origin.ts b/packages/aws-cdk-lib/aws-cloudfront-origins/lib/rest-api-origin.ts index fab837646db73..b737d0dd9d79a 100644 --- a/packages/aws-cdk-lib/aws-cloudfront-origins/lib/rest-api-origin.ts +++ b/packages/aws-cdk-lib/aws-cloudfront-origins/lib/rest-api-origin.ts @@ -1,7 +1,7 @@ +import { validateSecondsInRangeOrUndefined } from './private/utils'; import * as apigateway from '../../aws-apigateway'; import * as cloudfront from '../../aws-cloudfront'; import * as cdk from '../../core'; -import { validateSecondsInRangeOrUndefined } from './private/utils'; /** * Properties for an Origin for an API Gateway REST API. diff --git a/packages/aws-cdk-lib/aws-cloudfront-origins/lib/s3-origin.ts b/packages/aws-cdk-lib/aws-cloudfront-origins/lib/s3-origin.ts index caf85eb49df3d..e57a91b110c27 100644 --- a/packages/aws-cdk-lib/aws-cloudfront-origins/lib/s3-origin.ts +++ b/packages/aws-cdk-lib/aws-cloudfront-origins/lib/s3-origin.ts @@ -1,9 +1,9 @@ +import { Construct } from 'constructs'; +import { HttpOrigin } from './http-origin'; import * as cloudfront from '../../aws-cloudfront'; import * as iam from '../../aws-iam'; import * as s3 from '../../aws-s3'; import * as cdk from '../../core'; -import { Construct } from 'constructs'; -import { HttpOrigin } from './http-origin'; /** * Properties to use to customize an S3 Origin. diff --git a/packages/aws-cdk-lib/aws-cloudfront/lib/cache-policy.ts b/packages/aws-cdk-lib/aws-cloudfront/lib/cache-policy.ts index f811c9342baf7..ffe335531ea7e 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/lib/cache-policy.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/lib/cache-policy.ts @@ -1,6 +1,6 @@ -import { Duration, Names, Resource, Stack, Token } from '../../core'; import { Construct } from 'constructs'; import { CfnCachePolicy } from './cloudfront.generated'; +import { Duration, Names, Resource, Stack, Token } from '../../core'; /** * Represents a Cache Policy diff --git a/packages/aws-cdk-lib/aws-cloudfront/lib/distribution.ts b/packages/aws-cdk-lib/aws-cloudfront/lib/distribution.ts index 2828708e889f8..7918a5e996cbd 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/lib/distribution.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/lib/distribution.ts @@ -1,9 +1,3 @@ -import * as acm from '../../aws-certificatemanager'; -import * as iam from '../../aws-iam'; -import * as lambda from '../../aws-lambda'; -import * as s3 from '../../aws-s3'; -import { ArnFormat, IResource, Lazy, Resource, Stack, Token, Duration, Names, FeatureFlags } from '../../core'; -import { CLOUDFRONT_DEFAULT_SECURITY_POLICY_TLS_V1_2_2021 } from '../../cx-api'; import { Construct } from 'constructs'; import { ICachePolicy } from './cache-policy'; import { CfnDistribution } from './cloudfront.generated'; @@ -15,6 +9,12 @@ import { IOriginRequestPolicy } from './origin-request-policy'; import { CacheBehavior } from './private/cache-behavior'; import { formatDistributionArn } from './private/utils'; import { IResponseHeadersPolicy } from './response-headers-policy'; +import * as acm from '../../aws-certificatemanager'; +import * as iam from '../../aws-iam'; +import * as lambda from '../../aws-lambda'; +import * as s3 from '../../aws-s3'; +import { ArnFormat, IResource, Lazy, Resource, Stack, Token, Duration, Names, FeatureFlags } from '../../core'; +import { CLOUDFRONT_DEFAULT_SECURITY_POLICY_TLS_V1_2_2021 } from '../../cx-api'; /** * Interface for CloudFront distributions diff --git a/packages/aws-cdk-lib/aws-cloudfront/lib/experimental/edge-function.ts b/packages/aws-cdk-lib/aws-cloudfront/lib/experimental/edge-function.ts index eb4408405490f..fadd4c5630bf8 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/lib/experimental/edge-function.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/lib/experimental/edge-function.ts @@ -1,4 +1,5 @@ import * as path from 'path'; +import { Construct, Node } from 'constructs'; import * as cloudwatch from '../../../aws-cloudwatch'; import * as ec2 from '../../../aws-ec2'; import * as iam from '../../../aws-iam'; @@ -16,7 +17,6 @@ import { Token, } from '../../../core'; -import { Construct, Node } from 'constructs'; /** * Properties for creating a Lambda@Edge function diff --git a/packages/aws-cdk-lib/aws-cloudfront/lib/function.ts b/packages/aws-cdk-lib/aws-cloudfront/lib/function.ts index 8638df3286893..899c3967649f4 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/lib/function.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/lib/function.ts @@ -1,7 +1,7 @@ import * as fs from 'fs'; -import { IResource, Names, Resource, Stack } from '../../core'; import { Construct } from 'constructs'; import { CfnFunction } from './cloudfront.generated'; +import { IResource, Names, Resource, Stack } from '../../core'; /** * Represents the function's source code diff --git a/packages/aws-cdk-lib/aws-cloudfront/lib/key-group.ts b/packages/aws-cdk-lib/aws-cloudfront/lib/key-group.ts index 67e98b4bf140f..c78cf3cde2e5f 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/lib/key-group.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/lib/key-group.ts @@ -1,7 +1,7 @@ -import { IResource, Names, Resource } from '../../core'; import { Construct } from 'constructs'; import { CfnKeyGroup } from './cloudfront.generated'; import { IPublicKey } from './public-key'; +import { IResource, Names, Resource } from '../../core'; /** * Represents a Key Group diff --git a/packages/aws-cdk-lib/aws-cloudfront/lib/origin-access-identity.ts b/packages/aws-cdk-lib/aws-cloudfront/lib/origin-access-identity.ts index 12879e7e23dd3..172f65d51dbe4 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/lib/origin-access-identity.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/lib/origin-access-identity.ts @@ -1,7 +1,7 @@ -import * as iam from '../../aws-iam'; -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { CfnCloudFrontOriginAccessIdentity } from './cloudfront.generated'; +import * as iam from '../../aws-iam'; +import * as cdk from '../../core'; /** * Properties of CloudFront OriginAccessIdentity diff --git a/packages/aws-cdk-lib/aws-cloudfront/lib/origin-request-policy.ts b/packages/aws-cdk-lib/aws-cloudfront/lib/origin-request-policy.ts index 2abca8ba5562d..324fbacbdd9c8 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/lib/origin-request-policy.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/lib/origin-request-policy.ts @@ -1,6 +1,6 @@ -import { Names, Resource, Token } from '../../core'; import { Construct } from 'constructs'; import { CfnOriginRequestPolicy } from './cloudfront.generated'; +import { Names, Resource, Token } from '../../core'; /** * Represents a Origin Request Policy diff --git a/packages/aws-cdk-lib/aws-cloudfront/lib/origin.ts b/packages/aws-cdk-lib/aws-cloudfront/lib/origin.ts index ee7bd55445517..ccddceb0318d6 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/lib/origin.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/lib/origin.ts @@ -1,6 +1,6 @@ -import { Duration, Token } from '../../core'; import { Construct } from 'constructs'; import { CfnDistribution } from './cloudfront.generated'; +import { Duration, Token } from '../../core'; /** * The failover configuration used for Origin Groups, diff --git a/packages/aws-cdk-lib/aws-cloudfront/lib/private/utils.ts b/packages/aws-cdk-lib/aws-cloudfront/lib/private/utils.ts index 3c613a469c56e..88e7bca95eebd 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/lib/private/utils.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/lib/private/utils.ts @@ -1,5 +1,5 @@ -import { Stack } from '../../../core'; import { IDistribution } from '..'; +import { Stack } from '../../../core'; /** * Format distribution ARN from stack and distribution ID. diff --git a/packages/aws-cdk-lib/aws-cloudfront/lib/public-key.ts b/packages/aws-cdk-lib/aws-cloudfront/lib/public-key.ts index 7f0586a54109c..81b20f2ed0ac6 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/lib/public-key.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/lib/public-key.ts @@ -1,6 +1,6 @@ -import { IResource, Names, Resource, Token } from '../../core'; import { Construct } from 'constructs'; import { CfnPublicKey } from './cloudfront.generated'; +import { IResource, Names, Resource, Token } from '../../core'; /** * Represents a Public Key diff --git a/packages/aws-cdk-lib/aws-cloudfront/lib/response-headers-policy.ts b/packages/aws-cdk-lib/aws-cloudfront/lib/response-headers-policy.ts index 2087c43f4f203..aa7838ce5be09 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/lib/response-headers-policy.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/lib/response-headers-policy.ts @@ -1,6 +1,6 @@ -import { Duration, Names, Resource, Token } from '../../core'; import { Construct } from 'constructs'; import { CfnResponseHeadersPolicy } from './cloudfront.generated'; +import { Duration, Names, Resource, Token } from '../../core'; /** * Represents a response headers policy. diff --git a/packages/aws-cdk-lib/aws-cloudfront/lib/web-distribution.ts b/packages/aws-cdk-lib/aws-cloudfront/lib/web-distribution.ts index a9f6c2eb226e3..e748cc05501b4 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/lib/web-distribution.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/lib/web-distribution.ts @@ -1,8 +1,3 @@ -import * as certificatemanager from '../../aws-certificatemanager'; -import * as iam from '../../aws-iam'; -import * as lambda from '../../aws-lambda'; -import * as s3 from '../../aws-s3'; -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { CfnDistribution } from './cloudfront.generated'; import { HttpVersion, IDistribution, LambdaEdgeEventType, OriginProtocolPolicy, PriceClass, ViewerProtocolPolicy, SSLMethod, SecurityPolicyProtocol } from './distribution'; @@ -11,6 +6,11 @@ import { GeoRestriction } from './geo-restriction'; import { IKeyGroup } from './key-group'; import { IOriginAccessIdentity } from './origin-access-identity'; import { formatDistributionArn } from './private/utils'; +import * as certificatemanager from '../../aws-certificatemanager'; +import * as iam from '../../aws-iam'; +import * as lambda from '../../aws-lambda'; +import * as s3 from '../../aws-s3'; +import * as cdk from '../../core'; /** * HTTP status code to failover to second origin diff --git a/packages/aws-cdk-lib/aws-cloudfront/test/distribution.test.ts b/packages/aws-cdk-lib/aws-cloudfront/test/distribution.test.ts index da6288a708544..af3b268688703 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/test/distribution.test.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/test/distribution.test.ts @@ -1,10 +1,10 @@ +import { defaultOrigin, defaultOriginGroup } from './test-origin'; import { Match, Template } from '../../assertions'; import * as acm from '../../aws-certificatemanager'; import * as iam from '../../aws-iam'; import * as lambda from '../../aws-lambda'; import * as s3 from '../../aws-s3'; import { App, Duration, Stack } from '../../core'; -import { defaultOrigin, defaultOriginGroup } from './test-origin'; import { CfnDistribution, Distribution, diff --git a/packages/aws-cdk-lib/aws-cloudfront/test/example.acm-cert-alias.lit.ts b/packages/aws-cdk-lib/aws-cloudfront/test/example.acm-cert-alias.lit.ts index 858a1deecb9e4..a615ed9e19a5d 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/test/example.acm-cert-alias.lit.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/test/example.acm-cert-alias.lit.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as certificatemanager from '../../aws-certificatemanager'; import * as s3 from '../../aws-s3'; import { App, Stack } from '../../core'; -import { Construct } from 'constructs'; import * as cloudfront from '../lib'; class AcmCertificateAliasStack extends Stack { diff --git a/packages/aws-cdk-lib/aws-cloudfront/test/example.default-cert-alias.lit.ts b/packages/aws-cdk-lib/aws-cloudfront/test/example.default-cert-alias.lit.ts index a7aa75f1f22e2..65b377c09ce8e 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/test/example.default-cert-alias.lit.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/test/example.default-cert-alias.lit.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as s3 from '../../aws-s3'; import { App, Stack } from '../../core'; -import { Construct } from 'constructs'; import * as cloudfront from '../lib'; class AcmCertificateAliasStack extends Stack { diff --git a/packages/aws-cdk-lib/aws-cloudfront/test/example.iam-cert-alias.lit.ts b/packages/aws-cdk-lib/aws-cloudfront/test/example.iam-cert-alias.lit.ts index 93978b0d02a77..fae010675d215 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/test/example.iam-cert-alias.lit.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/test/example.iam-cert-alias.lit.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as s3 from '../../aws-s3'; import { App, Stack } from '../../core'; -import { Construct } from 'constructs'; import * as cloudfront from '../lib'; class AcmCertificateAliasStack extends Stack { diff --git a/packages/aws-cdk-lib/aws-cloudfront/test/oai.test.ts b/packages/aws-cdk-lib/aws-cloudfront/test/oai.test.ts index 95b2f589c9bea..e5d7f1186073d 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/test/oai.test.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/test/oai.test.ts @@ -1,5 +1,5 @@ -import { Template } from '../../assertions'; import { testDeprecated } from '@aws-cdk/cdk-build-tools'; +import { Template } from '../../assertions'; import * as cdk from '../../core'; import { OriginAccessIdentity } from '../lib'; diff --git a/packages/aws-cdk-lib/aws-cloudfront/test/origin-groups.test.ts b/packages/aws-cdk-lib/aws-cloudfront/test/origin-groups.test.ts index 4a0c661eda0de..614431cc98b12 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/test/origin-groups.test.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/test/origin-groups.test.ts @@ -1,6 +1,6 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Match, Template } from '../../assertions'; import * as s3 from '../../aws-s3'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../core'; import { CloudFrontWebDistribution, FailoverStatusCode } from '../lib'; diff --git a/packages/aws-cdk-lib/aws-cloudfront/test/origin.test.ts b/packages/aws-cdk-lib/aws-cloudfront/test/origin.test.ts index 75df3c7d6acfb..5669e5e6ffccf 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/test/origin.test.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/test/origin.test.ts @@ -1,5 +1,5 @@ -import { App, Stack, Duration } from '../../core'; import { TestOrigin } from './test-origin'; +import { App, Stack, Duration } from '../../core'; let app: App; let stack: Stack; diff --git a/packages/aws-cdk-lib/aws-cloudfront/test/web-distribution.test.ts b/packages/aws-cdk-lib/aws-cloudfront/test/web-distribution.test.ts index 30466d089333e..370d9670bd91f 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/test/web-distribution.test.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/test/web-distribution.test.ts @@ -1,9 +1,9 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Match, Template } from '../../assertions'; import * as certificatemanager from '../../aws-certificatemanager'; import * as iam from '../../aws-iam'; import * as lambda from '../../aws-lambda'; import * as s3 from '../../aws-s3'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../core'; import { CfnDistribution, diff --git a/packages/aws-cdk-lib/aws-cloudtrail/lib/cloudtrail.ts b/packages/aws-cdk-lib/aws-cloudtrail/lib/cloudtrail.ts index 81a3f97f21286..6c97a6a97d78f 100644 --- a/packages/aws-cdk-lib/aws-cloudtrail/lib/cloudtrail.ts +++ b/packages/aws-cdk-lib/aws-cloudtrail/lib/cloudtrail.ts @@ -1,3 +1,5 @@ +import { Construct } from 'constructs'; +import { CfnTrail } from './cloudtrail.generated'; import * as events from '../../aws-events'; import * as iam from '../../aws-iam'; import * as kms from '../../aws-kms'; @@ -6,8 +8,6 @@ import * as logs from '../../aws-logs'; import * as s3 from '../../aws-s3'; import * as sns from '../../aws-sns'; import { Resource, Stack } from '../../core'; -import { Construct } from 'constructs'; -import { CfnTrail } from './cloudtrail.generated'; /** * Properties for an AWS CloudTrail trail diff --git a/packages/aws-cdk-lib/aws-cloudtrail/test/cloudtrail.test.ts b/packages/aws-cdk-lib/aws-cloudtrail/test/cloudtrail.test.ts index 226869c7807d2..36646f5ee0518 100644 --- a/packages/aws-cdk-lib/aws-cloudtrail/test/cloudtrail.test.ts +++ b/packages/aws-cdk-lib/aws-cloudtrail/test/cloudtrail.test.ts @@ -1,3 +1,4 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Match, Template } from '../../assertions'; import * as iam from '../../aws-iam'; import * as kms from '../../aws-kms'; @@ -5,7 +6,6 @@ import * as lambda from '../../aws-lambda'; import { LogGroup, RetentionDays } from '../../aws-logs'; import * as s3 from '../../aws-s3'; import * as sns from '../../aws-sns'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Stack } from '../../core'; import { ManagementEventSources, ReadWriteType, Trail, InsightType } from '../lib'; diff --git a/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/appscaling.ts b/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/appscaling.ts index 2683044880c63..fef53a56c823b 100644 --- a/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/appscaling.ts +++ b/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/appscaling.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as appscaling from '../../aws-applicationautoscaling'; import * as cloudwatch from '../../aws-cloudwatch'; -import { Construct } from 'constructs'; /** * Use an ApplicationAutoScaling StepScalingAction as an Alarm Action diff --git a/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/autoscaling.ts b/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/autoscaling.ts index 0899e8b2b9a7c..81eb833158030 100644 --- a/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/autoscaling.ts +++ b/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/autoscaling.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as autoscaling from '../../aws-autoscaling'; import * as cloudwatch from '../../aws-cloudwatch'; -import { Construct } from 'constructs'; /** * Use an AutoScaling StepScalingAction as an Alarm Action diff --git a/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/ec2.ts b/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/ec2.ts index 8842d9ad7ab6a..f3d86cbbf0edd 100644 --- a/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/ec2.ts +++ b/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/ec2.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as cloudwatch from '../../aws-cloudwatch'; import { Stack } from '../../core'; -import { Construct } from 'constructs'; /** * Types of EC2 actions available diff --git a/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/sns.ts b/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/sns.ts index 4a9646b8f5d80..ddc00869d7e66 100644 --- a/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/sns.ts +++ b/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/sns.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as cloudwatch from '../../aws-cloudwatch'; import * as sns from '../../aws-sns'; -import { Construct } from 'constructs'; /** * Use an SNS topic as an alarm action diff --git a/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/ssm.ts b/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/ssm.ts index 982b5a7e4c8c0..a8b696556c4de 100644 --- a/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/ssm.ts +++ b/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/ssm.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as cloudwatch from '../../aws-cloudwatch'; import { Stack } from '../../core'; -import { Construct } from 'constructs'; /** * Types of OpsItem severity available diff --git a/packages/aws-cdk-lib/aws-cloudwatch/lib/alarm-base.ts b/packages/aws-cdk-lib/aws-cloudwatch/lib/alarm-base.ts index ce77ee93396af..374fa232b73e1 100644 --- a/packages/aws-cdk-lib/aws-cloudwatch/lib/alarm-base.ts +++ b/packages/aws-cdk-lib/aws-cloudwatch/lib/alarm-base.ts @@ -1,5 +1,5 @@ -import { IResource, Resource } from '../../core'; import { IAlarmAction } from './alarm-action'; +import { IResource, Resource } from '../../core'; /** * Interface for Alarm Rule. diff --git a/packages/aws-cdk-lib/aws-cloudwatch/lib/alarm.ts b/packages/aws-cdk-lib/aws-cloudwatch/lib/alarm.ts index bd8884e380b57..1e6740c06bee2 100644 --- a/packages/aws-cdk-lib/aws-cloudwatch/lib/alarm.ts +++ b/packages/aws-cdk-lib/aws-cloudwatch/lib/alarm.ts @@ -1,4 +1,3 @@ -import { ArnFormat, Lazy, Stack, Token, Annotations } from '../../core'; import { Construct } from 'constructs'; import { IAlarmAction } from './alarm-action'; import { AlarmBase, IAlarm } from './alarm-base'; @@ -10,6 +9,7 @@ import { dispatchMetric, metricPeriod } from './private/metric-util'; import { dropUndefined } from './private/object'; import { MetricSet } from './private/rendering'; import { normalizeStatistic, parseStatistic } from './private/statistic'; +import { ArnFormat, Lazy, Stack, Token, Annotations } from '../../core'; /** * Properties for Alarms diff --git a/packages/aws-cdk-lib/aws-cloudwatch/lib/composite-alarm.ts b/packages/aws-cdk-lib/aws-cloudwatch/lib/composite-alarm.ts index 922064ce7b588..3343cdcdecdff 100644 --- a/packages/aws-cdk-lib/aws-cloudwatch/lib/composite-alarm.ts +++ b/packages/aws-cdk-lib/aws-cloudwatch/lib/composite-alarm.ts @@ -1,7 +1,7 @@ -import { ArnFormat, Lazy, Names, Stack, Duration } from '../../core'; import { Construct } from 'constructs'; import { AlarmBase, IAlarm, IAlarmRule } from './alarm-base'; import { CfnCompositeAlarm } from './cloudwatch.generated'; +import { ArnFormat, Lazy, Names, Stack, Duration } from '../../core'; /** * Properties for creating a Composite Alarm diff --git a/packages/aws-cdk-lib/aws-cloudwatch/lib/dashboard.ts b/packages/aws-cdk-lib/aws-cloudwatch/lib/dashboard.ts index e3da89bf5870d..919ddf643f88d 100644 --- a/packages/aws-cdk-lib/aws-cloudwatch/lib/dashboard.ts +++ b/packages/aws-cdk-lib/aws-cloudwatch/lib/dashboard.ts @@ -1,8 +1,8 @@ -import { Lazy, Resource, Stack, Token, Annotations, Duration } from '../../core'; import { Construct } from 'constructs'; import { CfnDashboard } from './cloudwatch.generated'; import { Column, Row } from './layout'; import { IWidget } from './widget'; +import { Lazy, Resource, Stack, Token, Annotations, Duration } from '../../core'; /** * Specify the period for graphs when the CloudWatch dashboard loads diff --git a/packages/aws-cdk-lib/aws-cloudwatch/lib/graph.ts b/packages/aws-cdk-lib/aws-cloudwatch/lib/graph.ts index 7ec29665e1382..591655941b2d2 100644 --- a/packages/aws-cdk-lib/aws-cloudwatch/lib/graph.ts +++ b/packages/aws-cdk-lib/aws-cloudwatch/lib/graph.ts @@ -1,8 +1,8 @@ -import * as cdk from '../../core'; import { IAlarm } from './alarm-base'; import { IMetric } from './metric-types'; import { allMetricsGraphJson } from './private/rendering'; import { ConcreteWidget } from './widget'; +import * as cdk from '../../core'; /** * Basic properties for widgets that display metrics diff --git a/packages/aws-cdk-lib/aws-cloudwatch/lib/log-query.ts b/packages/aws-cdk-lib/aws-cloudwatch/lib/log-query.ts index 85deb76ca980d..042d65e0b5048 100644 --- a/packages/aws-cdk-lib/aws-cloudwatch/lib/log-query.ts +++ b/packages/aws-cdk-lib/aws-cloudwatch/lib/log-query.ts @@ -1,5 +1,5 @@ -import * as cdk from '../../core'; import { ConcreteWidget } from './widget'; +import * as cdk from '../../core'; /** * Types of view diff --git a/packages/aws-cdk-lib/aws-cloudwatch/lib/metric.ts b/packages/aws-cdk-lib/aws-cloudwatch/lib/metric.ts index 5fa603373ce33..cbb7580fb0b29 100644 --- a/packages/aws-cdk-lib/aws-cloudwatch/lib/metric.ts +++ b/packages/aws-cdk-lib/aws-cloudwatch/lib/metric.ts @@ -1,11 +1,11 @@ -import * as iam from '../../aws-iam'; -import * as cdk from '../../core'; import { Construct, IConstruct } from 'constructs'; import { Alarm, ComparisonOperator, TreatMissingData } from './alarm'; import { Dimension, IMetric, MetricAlarmConfig, MetricConfig, MetricGraphConfig, Statistic, Unit } from './metric-types'; import { dispatchMetric, metricKey } from './private/metric-util'; import { normalizeStatistic, pairStatisticToString, parseStatistic, singleStatisticToString } from './private/statistic'; import { Stats } from './stats'; +import * as iam from '../../aws-iam'; +import * as cdk from '../../core'; export type DimensionHash = { [dim: string]: any }; diff --git a/packages/aws-cdk-lib/aws-cloudwatch/lib/private/drop-empty-object-at-the-end-of-an-array-token.ts b/packages/aws-cdk-lib/aws-cloudwatch/lib/private/drop-empty-object-at-the-end-of-an-array-token.ts index e9f1d2b0ebd32..d7778acb9029d 100644 --- a/packages/aws-cdk-lib/aws-cloudwatch/lib/private/drop-empty-object-at-the-end-of-an-array-token.ts +++ b/packages/aws-cdk-lib/aws-cloudwatch/lib/private/drop-empty-object-at-the-end-of-an-array-token.ts @@ -1,5 +1,5 @@ -import * as cdk from '../../../core'; import { dropUndefined } from './object'; +import * as cdk from '../../../core'; /** * A Token object that will drop the last element of an array if it is an empty object diff --git a/packages/aws-cdk-lib/aws-cloudwatch/test/metrics.test.ts b/packages/aws-cdk-lib/aws-cloudwatch/test/metrics.test.ts index 374364f3727a0..d8f3ed065ad23 100644 --- a/packages/aws-cdk-lib/aws-cloudwatch/test/metrics.test.ts +++ b/packages/aws-cdk-lib/aws-cloudwatch/test/metrics.test.ts @@ -1,6 +1,6 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from '../../assertions'; import * as iam from '../../aws-iam'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../core'; import { Alarm, Metric, Stats } from '../lib'; import { PairStatistic, parseStatistic, SingleStatistic } from '../lib/private/statistic'; diff --git a/packages/aws-cdk-lib/aws-codebuild/lib/artifacts.ts b/packages/aws-cdk-lib/aws-codebuild/lib/artifacts.ts index 312c8763c043c..8b3ee909f8267 100644 --- a/packages/aws-cdk-lib/aws-codebuild/lib/artifacts.ts +++ b/packages/aws-cdk-lib/aws-codebuild/lib/artifacts.ts @@ -1,7 +1,7 @@ -import * as s3 from '../../aws-s3'; import { Construct } from 'constructs'; import { CfnProject } from './codebuild.generated'; import { IProject } from './project'; +import * as s3 from '../../aws-s3'; /** * The type returned from `IArtifacts#bind`. diff --git a/packages/aws-cdk-lib/aws-codebuild/lib/build-spec.ts b/packages/aws-cdk-lib/aws-codebuild/lib/build-spec.ts index 0ff59ba67ae4c..930ade02086f3 100644 --- a/packages/aws-cdk-lib/aws-codebuild/lib/build-spec.ts +++ b/packages/aws-cdk-lib/aws-codebuild/lib/build-spec.ts @@ -1,8 +1,8 @@ -import * as s3_assets from '../../aws-s3-assets'; -import { IResolveContext, Lazy, Stack } from '../../core'; import { Construct } from 'constructs'; import * as yaml_cfn from './private/yaml-cfn'; import { Project } from './project'; +import * as s3_assets from '../../aws-s3-assets'; +import { IResolveContext, Lazy, Stack } from '../../core'; /** * BuildSpec for CodeBuild projects diff --git a/packages/aws-cdk-lib/aws-codebuild/lib/cache.ts b/packages/aws-cdk-lib/aws-codebuild/lib/cache.ts index 68ab19dbee3e5..cbc943d75ee78 100644 --- a/packages/aws-cdk-lib/aws-codebuild/lib/cache.ts +++ b/packages/aws-cdk-lib/aws-codebuild/lib/cache.ts @@ -1,7 +1,7 @@ -import { IBucket } from '../../aws-s3'; -import { Aws, Fn } from '../../core'; import { CfnProject } from './codebuild.generated'; import { IProject } from './project'; +import { IBucket } from '../../aws-s3'; +import { Aws, Fn } from '../../core'; export interface BucketCacheOptions { /** diff --git a/packages/aws-cdk-lib/aws-codebuild/lib/linux-arm-build-image.ts b/packages/aws-cdk-lib/aws-codebuild/lib/linux-arm-build-image.ts index 845d4ff3502e6..8c91b5fe8b7fb 100644 --- a/packages/aws-cdk-lib/aws-codebuild/lib/linux-arm-build-image.ts +++ b/packages/aws-cdk-lib/aws-codebuild/lib/linux-arm-build-image.ts @@ -1,8 +1,8 @@ -import * as ecr from '../../aws-ecr'; -import * as secretsmanager from '../../aws-secretsmanager'; import { BuildSpec } from './build-spec'; import { runScriptLinuxBuildSpec } from './private/run-script-linux-build-spec'; import { BuildEnvironment, ComputeType, IBuildImage, ImagePullPrincipalType } from './project'; +import * as ecr from '../../aws-ecr'; +import * as secretsmanager from '../../aws-secretsmanager'; /** * Construction properties of `LinuxArmBuildImage`. diff --git a/packages/aws-cdk-lib/aws-codebuild/lib/linux-gpu-build-image.ts b/packages/aws-cdk-lib/aws-codebuild/lib/linux-gpu-build-image.ts index f263f0a58c591..af46b6f2776e0 100644 --- a/packages/aws-cdk-lib/aws-codebuild/lib/linux-gpu-build-image.ts +++ b/packages/aws-cdk-lib/aws-codebuild/lib/linux-gpu-build-image.ts @@ -1,6 +1,3 @@ -import * as ecr from '../../aws-ecr'; -import * as core from '../../core'; -import { FactName } from '../../region-info'; import { Construct } from 'constructs'; import { BuildSpec } from './build-spec'; import { runScriptLinuxBuildSpec } from './private/run-script-linux-build-spec'; @@ -8,6 +5,9 @@ import { BuildEnvironment, BuildImageBindOptions, BuildImageConfig, ComputeType, IBindableBuildImage, IBuildImage, ImagePullPrincipalType, IProject, } from './project'; +import * as ecr from '../../aws-ecr'; +import * as core from '../../core'; +import { FactName } from '../../region-info'; /** * A CodeBuild GPU image running Linux. diff --git a/packages/aws-cdk-lib/aws-codebuild/lib/project.ts b/packages/aws-cdk-lib/aws-codebuild/lib/project.ts index 85bb82766520d..cd5e56ff6640f 100644 --- a/packages/aws-cdk-lib/aws-codebuild/lib/project.ts +++ b/packages/aws-cdk-lib/aws-codebuild/lib/project.ts @@ -1,14 +1,3 @@ -import * as cloudwatch from '../../aws-cloudwatch'; -import * as notifications from '../../aws-codestarnotifications'; -import * as ec2 from '../../aws-ec2'; -import * as ecr from '../../aws-ecr'; -import { DockerImageAsset, DockerImageAssetProps } from '../../aws-ecr-assets'; -import * as events from '../../aws-events'; -import * as iam from '../../aws-iam'; -import * as kms from '../../aws-kms'; -import * as s3 from '../../aws-s3'; -import * as secretsmanager from '../../aws-secretsmanager'; -import { ArnFormat, Aws, Duration, IResource, Lazy, Names, PhysicalName, Reference, Resource, SecretValue, Stack, Token, TokenComparison, Tokenization } from '../../core'; import { Construct, IConstruct } from 'constructs'; import { IArtifacts } from './artifacts'; import { BuildSpec } from './build-spec'; @@ -24,6 +13,17 @@ import { LoggingOptions } from './project-logs'; import { renderReportGroupArn } from './report-group-utils'; import { ISource } from './source'; import { CODEPIPELINE_SOURCE_ARTIFACTS_TYPE, NO_SOURCE_TYPE } from './source-types'; +import * as cloudwatch from '../../aws-cloudwatch'; +import * as notifications from '../../aws-codestarnotifications'; +import * as ec2 from '../../aws-ec2'; +import * as ecr from '../../aws-ecr'; +import { DockerImageAsset, DockerImageAssetProps } from '../../aws-ecr-assets'; +import * as events from '../../aws-events'; +import * as iam from '../../aws-iam'; +import * as kms from '../../aws-kms'; +import * as s3 from '../../aws-s3'; +import * as secretsmanager from '../../aws-secretsmanager'; +import { ArnFormat, Aws, Duration, IResource, Lazy, Names, PhysicalName, Reference, Resource, SecretValue, Stack, Token, TokenComparison, Tokenization } from '../../core'; const VPC_POLICY_SYM = Symbol.for('@aws-cdk/aws-codebuild.roleVpcPolicy'); diff --git a/packages/aws-cdk-lib/aws-codebuild/lib/report-group-utils.ts b/packages/aws-cdk-lib/aws-codebuild/lib/report-group-utils.ts index 709bbf731328e..5cda12752b2e8 100644 --- a/packages/aws-cdk-lib/aws-codebuild/lib/report-group-utils.ts +++ b/packages/aws-cdk-lib/aws-codebuild/lib/report-group-utils.ts @@ -1,5 +1,5 @@ -import * as cdk from '../../core'; import { Construct } from 'constructs'; +import * as cdk from '../../core'; // this file contains a bunch of functions shared // between Project and ResourceGroup, diff --git a/packages/aws-cdk-lib/aws-codebuild/lib/report-group.ts b/packages/aws-cdk-lib/aws-codebuild/lib/report-group.ts index 469ef5970e5fe..f3f0082b8afcd 100644 --- a/packages/aws-cdk-lib/aws-codebuild/lib/report-group.ts +++ b/packages/aws-cdk-lib/aws-codebuild/lib/report-group.ts @@ -1,9 +1,9 @@ -import * as iam from '../../aws-iam'; -import * as s3 from '../../aws-s3'; -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { CfnReportGroup } from './codebuild.generated'; import { renderReportGroupArn, reportGroupArnComponents } from './report-group-utils'; +import * as iam from '../../aws-iam'; +import * as s3 from '../../aws-s3'; +import * as cdk from '../../core'; /** * The interface representing the ReportGroup resource - diff --git a/packages/aws-cdk-lib/aws-codebuild/lib/source-credentials.ts b/packages/aws-cdk-lib/aws-codebuild/lib/source-credentials.ts index 1fd3dd836f188..80cea1f0f18e1 100644 --- a/packages/aws-cdk-lib/aws-codebuild/lib/source-credentials.ts +++ b/packages/aws-cdk-lib/aws-codebuild/lib/source-credentials.ts @@ -1,6 +1,6 @@ -import { Resource, SecretValue } from '../../core'; import { Construct } from 'constructs'; import { CfnSourceCredential } from './codebuild.generated'; +import { Resource, SecretValue } from '../../core'; /** * Creation properties for `GitHubSourceCredentials`. diff --git a/packages/aws-cdk-lib/aws-codebuild/lib/source.ts b/packages/aws-cdk-lib/aws-codebuild/lib/source.ts index b12f78ca996f4..b442332fc23a2 100644 --- a/packages/aws-cdk-lib/aws-codebuild/lib/source.ts +++ b/packages/aws-cdk-lib/aws-codebuild/lib/source.ts @@ -1,6 +1,3 @@ -import * as codecommit from '../../aws-codecommit'; -import * as iam from '../../aws-iam'; -import * as s3 from '../../aws-s3'; import { Construct } from 'constructs'; import { CfnProject } from './codebuild.generated'; import { IProject } from './project'; @@ -11,6 +8,9 @@ import { GITHUB_SOURCE_TYPE, S3_SOURCE_TYPE, } from './source-types'; +import * as codecommit from '../../aws-codecommit'; +import * as iam from '../../aws-iam'; +import * as s3 from '../../aws-s3'; /** * The type returned from `ISource#bind`. diff --git a/packages/aws-cdk-lib/aws-codebuild/lib/untrusted-code-boundary-policy.ts b/packages/aws-cdk-lib/aws-codebuild/lib/untrusted-code-boundary-policy.ts index 462af3ffe0ee2..572f505731779 100644 --- a/packages/aws-cdk-lib/aws-codebuild/lib/untrusted-code-boundary-policy.ts +++ b/packages/aws-cdk-lib/aws-codebuild/lib/untrusted-code-boundary-policy.ts @@ -1,5 +1,5 @@ -import * as iam from '../../aws-iam'; import { Construct } from 'constructs'; +import * as iam from '../../aws-iam'; /** * Construction properties for UntrustedCodeBoundaryPolicy diff --git a/packages/aws-cdk-lib/aws-codecommit/lib/code.ts b/packages/aws-cdk-lib/aws-codecommit/lib/code.ts index d428dca123027..12c2d74226d49 100644 --- a/packages/aws-cdk-lib/aws-codecommit/lib/code.ts +++ b/packages/aws-cdk-lib/aws-codecommit/lib/code.ts @@ -1,8 +1,8 @@ import * as fs from 'fs'; import * as path from 'path'; -import * as assets from '../../aws-s3-assets'; import { Construct } from 'constructs'; import { CfnRepository } from './codecommit.generated'; +import * as assets from '../../aws-s3-assets'; /** * Represents the structure to pass into the underlying CfnRepository class. diff --git a/packages/aws-cdk-lib/aws-codecommit/lib/repository.ts b/packages/aws-cdk-lib/aws-codecommit/lib/repository.ts index 53b36ea686d20..3bbdf737877a8 100644 --- a/packages/aws-cdk-lib/aws-codecommit/lib/repository.ts +++ b/packages/aws-cdk-lib/aws-codecommit/lib/repository.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; +import { Code } from './code'; +import { CfnRepository } from './codecommit.generated'; import * as notifications from '../../aws-codestarnotifications'; import * as events from '../../aws-events'; import * as iam from '../../aws-iam'; import { ArnFormat, IResource, Lazy, Resource, Stack } from '../../core'; -import { Construct } from 'constructs'; -import { Code } from './code'; -import { CfnRepository } from './codecommit.generated'; /** * Additional options to pass to the notification rule. diff --git a/packages/aws-cdk-lib/aws-codedeploy/lib/base-deployment-config.ts b/packages/aws-cdk-lib/aws-codedeploy/lib/base-deployment-config.ts index 505bf04421f67..d8657c5dac096 100644 --- a/packages/aws-cdk-lib/aws-codedeploy/lib/base-deployment-config.ts +++ b/packages/aws-cdk-lib/aws-codedeploy/lib/base-deployment-config.ts @@ -1,9 +1,9 @@ -import { ArnFormat, Resource, Stack } from '../../core'; import { Construct } from 'constructs'; import { CfnDeploymentConfig } from './codedeploy.generated'; import { MinimumHealthyHosts } from './host-health-config'; import { arnForDeploymentConfig, validateName } from './private/utils'; import { TrafficRouting } from './traffic-routing-config'; +import { ArnFormat, Resource, Stack } from '../../core'; /** * The base class for ServerDeploymentConfig, EcsDeploymentConfig, diff --git a/packages/aws-cdk-lib/aws-codedeploy/lib/ecs/application.ts b/packages/aws-cdk-lib/aws-codedeploy/lib/ecs/application.ts index 5b344341b81d1..9bd670cea8444 100644 --- a/packages/aws-cdk-lib/aws-codedeploy/lib/ecs/application.ts +++ b/packages/aws-cdk-lib/aws-codedeploy/lib/ecs/application.ts @@ -1,5 +1,5 @@ -import { ArnFormat, IResource, Resource, Stack, Arn } from '../../../core'; import { Construct } from 'constructs'; +import { ArnFormat, IResource, Resource, Stack, Arn } from '../../../core'; import { CfnApplication } from '../codedeploy.generated'; import { arnForApplication, validateName } from '../private/utils'; diff --git a/packages/aws-cdk-lib/aws-codedeploy/lib/ecs/deployment-group.ts b/packages/aws-cdk-lib/aws-codedeploy/lib/ecs/deployment-group.ts index 9b5dc277ed94b..3b1f29cd525b3 100644 --- a/packages/aws-cdk-lib/aws-codedeploy/lib/ecs/deployment-group.ts +++ b/packages/aws-cdk-lib/aws-codedeploy/lib/ecs/deployment-group.ts @@ -1,12 +1,12 @@ +import { Construct } from 'constructs'; +import { IEcsApplication, EcsApplication } from './application'; +import { EcsDeploymentConfig, IEcsDeploymentConfig } from './deployment-config'; import * as cloudwatch from '../../../aws-cloudwatch'; import * as ecs from '../../../aws-ecs'; import * as elbv2 from '../../../aws-elasticloadbalancingv2'; import * as iam from '../../../aws-iam'; import * as cdk from '../../../core'; import { CODEDEPLOY_REMOVE_ALARMS_FROM_DEPLOYMENT_GROUP } from '../../../cx-api'; -import { Construct } from 'constructs'; -import { IEcsApplication, EcsApplication } from './application'; -import { EcsDeploymentConfig, IEcsDeploymentConfig } from './deployment-config'; import { CfnDeploymentGroup } from '../codedeploy.generated'; import { ImportedDeploymentGroupBase, DeploymentGroupBase } from '../private/base-deployment-group'; import { renderAlarmConfiguration, renderAutoRollbackConfiguration } from '../private/utils'; diff --git a/packages/aws-cdk-lib/aws-codedeploy/lib/lambda/application.ts b/packages/aws-cdk-lib/aws-codedeploy/lib/lambda/application.ts index 015130afaecca..8b2e39077efd1 100644 --- a/packages/aws-cdk-lib/aws-codedeploy/lib/lambda/application.ts +++ b/packages/aws-cdk-lib/aws-codedeploy/lib/lambda/application.ts @@ -1,5 +1,5 @@ -import { ArnFormat, IResource, Resource, Stack, Arn } from '../../../core'; import { Construct } from 'constructs'; +import { ArnFormat, IResource, Resource, Stack, Arn } from '../../../core'; import { CfnApplication } from '../codedeploy.generated'; import { arnForApplication, validateName } from '../private/utils'; diff --git a/packages/aws-cdk-lib/aws-codedeploy/lib/lambda/custom-deployment-config.ts b/packages/aws-cdk-lib/aws-codedeploy/lib/lambda/custom-deployment-config.ts index ecc8b32320d04..1ad5309c6ed7f 100644 --- a/packages/aws-cdk-lib/aws-codedeploy/lib/lambda/custom-deployment-config.ts +++ b/packages/aws-cdk-lib/aws-codedeploy/lib/lambda/custom-deployment-config.ts @@ -1,7 +1,7 @@ -import { Duration, Names, Resource } from '../../../core'; -import { AwsCustomResource, AwsCustomResourcePolicy, PhysicalResourceId } from '../../../custom-resources'; import { Construct } from 'constructs'; import { ILambdaDeploymentConfig } from './deployment-config'; +import { Duration, Names, Resource } from '../../../core'; +import { AwsCustomResource, AwsCustomResourcePolicy, PhysicalResourceId } from '../../../custom-resources'; import { arnForDeploymentConfig, validateName } from '../private/utils'; /** diff --git a/packages/aws-cdk-lib/aws-codedeploy/lib/lambda/deployment-group.ts b/packages/aws-cdk-lib/aws-codedeploy/lib/lambda/deployment-group.ts index 2d4387490cf09..6818f643f7ad3 100644 --- a/packages/aws-cdk-lib/aws-codedeploy/lib/lambda/deployment-group.ts +++ b/packages/aws-cdk-lib/aws-codedeploy/lib/lambda/deployment-group.ts @@ -1,11 +1,11 @@ +import { Construct } from 'constructs'; +import { ILambdaApplication, LambdaApplication } from './application'; +import { ILambdaDeploymentConfig, LambdaDeploymentConfig } from './deployment-config'; import * as cloudwatch from '../../../aws-cloudwatch'; import * as iam from '../../../aws-iam'; import * as lambda from '../../../aws-lambda'; import * as cdk from '../../../core'; import { CODEDEPLOY_REMOVE_ALARMS_FROM_DEPLOYMENT_GROUP } from '../../../cx-api'; -import { Construct } from 'constructs'; -import { ILambdaApplication, LambdaApplication } from './application'; -import { ILambdaDeploymentConfig, LambdaDeploymentConfig } from './deployment-config'; import { CfnDeploymentGroup } from '../codedeploy.generated'; import { ImportedDeploymentGroupBase, DeploymentGroupBase } from '../private/base-deployment-group'; import { renderAlarmConfiguration, renderAutoRollbackConfiguration } from '../private/utils'; diff --git a/packages/aws-cdk-lib/aws-codedeploy/lib/private/base-deployment-group.ts b/packages/aws-cdk-lib/aws-codedeploy/lib/private/base-deployment-group.ts index 578d00e8da275..c9d39741e8a65 100644 --- a/packages/aws-cdk-lib/aws-codedeploy/lib/private/base-deployment-group.ts +++ b/packages/aws-cdk-lib/aws-codedeploy/lib/private/base-deployment-group.ts @@ -1,8 +1,8 @@ -import * as iam from '../../../aws-iam'; -import { Resource, IResource, ArnFormat, Arn, Aws } from '../../../core'; import { Construct } from 'constructs'; import { isPredefinedDeploymentConfig } from './predefined-deployment-config'; import { validateName } from './utils'; +import * as iam from '../../../aws-iam'; +import { Resource, IResource, ArnFormat, Arn, Aws } from '../../../core'; import { IBaseDeploymentConfig } from '../base-deployment-config'; import { CfnDeploymentGroup } from '../codedeploy.generated'; diff --git a/packages/aws-cdk-lib/aws-codedeploy/lib/private/utils.ts b/packages/aws-cdk-lib/aws-codedeploy/lib/private/utils.ts index 15407050531f3..f424f5775d506 100644 --- a/packages/aws-cdk-lib/aws-codedeploy/lib/private/utils.ts +++ b/packages/aws-cdk-lib/aws-codedeploy/lib/private/utils.ts @@ -1,6 +1,6 @@ +import { IPredefinedDeploymentConfig } from './predefined-deployment-config'; import * as cloudwatch from '../../../aws-cloudwatch'; import { Token, Stack, ArnFormat, Arn, Fn, Aws, IResource } from '../../../core'; -import { IPredefinedDeploymentConfig } from './predefined-deployment-config'; import { IBaseDeploymentConfig } from '../base-deployment-config'; import { CfnDeploymentGroup } from '../codedeploy.generated'; import { AutoRollbackConfig } from '../rollback-config'; diff --git a/packages/aws-cdk-lib/aws-codedeploy/lib/server/application.ts b/packages/aws-cdk-lib/aws-codedeploy/lib/server/application.ts index c0b103dfc7b72..725cb2521a235 100644 --- a/packages/aws-cdk-lib/aws-codedeploy/lib/server/application.ts +++ b/packages/aws-cdk-lib/aws-codedeploy/lib/server/application.ts @@ -1,5 +1,5 @@ -import { ArnFormat, IResource, Resource, Stack, Arn } from '../../../core'; import { Construct } from 'constructs'; +import { ArnFormat, IResource, Resource, Stack, Arn } from '../../../core'; import { CfnApplication } from '../codedeploy.generated'; import { arnForApplication, validateName } from '../private/utils'; diff --git a/packages/aws-cdk-lib/aws-codedeploy/lib/server/deployment-group.ts b/packages/aws-cdk-lib/aws-codedeploy/lib/server/deployment-group.ts index 278c10418d634..b973cd81beeb4 100644 --- a/packages/aws-cdk-lib/aws-codedeploy/lib/server/deployment-group.ts +++ b/packages/aws-cdk-lib/aws-codedeploy/lib/server/deployment-group.ts @@ -1,3 +1,7 @@ +import { Construct } from 'constructs'; +import { IServerApplication, ServerApplication } from './application'; +import { IServerDeploymentConfig, ServerDeploymentConfig } from './deployment-config'; +import { LoadBalancer, LoadBalancerGeneration } from './load-balancer'; import * as autoscaling from '../../../aws-autoscaling'; import * as cloudwatch from '../../../aws-cloudwatch'; import * as ec2 from '../../../aws-ec2'; @@ -5,10 +9,6 @@ import * as iam from '../../../aws-iam'; import * as s3 from '../../../aws-s3'; import * as cdk from '../../../core'; import { CODEDEPLOY_REMOVE_ALARMS_FROM_DEPLOYMENT_GROUP } from '../../../cx-api'; -import { Construct } from 'constructs'; -import { IServerApplication, ServerApplication } from './application'; -import { IServerDeploymentConfig, ServerDeploymentConfig } from './deployment-config'; -import { LoadBalancer, LoadBalancerGeneration } from './load-balancer'; import { CfnDeploymentGroup } from '../codedeploy.generated'; import { ImportedDeploymentGroupBase, DeploymentGroupBase } from '../private/base-deployment-group'; import { renderAlarmConfiguration, renderAutoRollbackConfiguration } from '../private/utils'; diff --git a/packages/aws-cdk-lib/aws-codedeploy/lib/traffic-routing-config.ts b/packages/aws-cdk-lib/aws-codedeploy/lib/traffic-routing-config.ts index 112c29581b63a..2a637f8646d40 100644 --- a/packages/aws-cdk-lib/aws-codedeploy/lib/traffic-routing-config.ts +++ b/packages/aws-cdk-lib/aws-codedeploy/lib/traffic-routing-config.ts @@ -1,5 +1,5 @@ -import { Duration } from '../../core'; import { Construct } from 'constructs'; +import { Duration } from '../../core'; /** * Represents the structure to pass into the underlying CfnDeploymentConfig class. diff --git a/packages/aws-cdk-lib/aws-codedeploy/test/lambda/custom-deployment-config.test.ts b/packages/aws-cdk-lib/aws-codedeploy/test/lambda/custom-deployment-config.test.ts index 459bcb4806778..8c98cc2e0c0a5 100644 --- a/packages/aws-cdk-lib/aws-codedeploy/test/lambda/custom-deployment-config.test.ts +++ b/packages/aws-cdk-lib/aws-codedeploy/test/lambda/custom-deployment-config.test.ts @@ -1,6 +1,6 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from '../../../assertions'; import * as lambda from '../../../aws-lambda'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../../core'; import * as codedeploy from '../../lib'; diff --git a/packages/aws-cdk-lib/aws-codeguruprofiler/lib/profiling-group.ts b/packages/aws-cdk-lib/aws-codeguruprofiler/lib/profiling-group.ts index bad6d68cd0455..6e412ac9be6b9 100644 --- a/packages/aws-cdk-lib/aws-codeguruprofiler/lib/profiling-group.ts +++ b/packages/aws-cdk-lib/aws-codeguruprofiler/lib/profiling-group.ts @@ -1,7 +1,7 @@ -import { Grant, IGrantable } from '../../aws-iam'; -import { ArnFormat, IResource, Lazy, Names, Resource, Stack } from '../../core'; import { Construct } from 'constructs'; import { CfnProfilingGroup } from './codeguruprofiler.generated'; +import { Grant, IGrantable } from '../../aws-iam'; +import { ArnFormat, IResource, Lazy, Names, Resource, Stack } from '../../core'; /** * The compute platform of the profiling group. diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/alexa-ask/deploy-action.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/alexa-ask/deploy-action.ts index 937fa9c8b2132..1ea10f3ee4662 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/alexa-ask/deploy-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/alexa-ask/deploy-action.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as codepipeline from '../../../aws-codepipeline'; import { SecretValue } from '../../../core'; -import { Construct } from 'constructs'; import { Action } from '../action'; /** diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/bitbucket/source-action.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/bitbucket/source-action.ts index 649682d2304c3..f3e139092badf 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/bitbucket/source-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/bitbucket/source-action.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as codepipeline from '../../../aws-codepipeline'; import * as events from '../../../aws-events'; -import { Construct } from 'constructs'; import { CodeStarConnectionsSourceAction, CodeStarConnectionsSourceActionProps } from '../codestar-connections/source-action'; /** diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/cloudformation/pipeline-actions.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/cloudformation/pipeline-actions.ts index d51535b1936b9..6972fce66056f 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/cloudformation/pipeline-actions.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/cloudformation/pipeline-actions.ts @@ -1,9 +1,9 @@ +import { Construct } from 'constructs'; +import { parseCapabilities, SingletonPolicy } from './private/singleton-policy'; import * as cloudformation from '../../../aws-cloudformation'; import * as codepipeline from '../../../aws-codepipeline'; import * as iam from '../../../aws-iam'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; -import { parseCapabilities, SingletonPolicy } from './private/singleton-policy'; import { Action } from '../action'; /** diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/cloudformation/private/singleton-policy.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/cloudformation/private/singleton-policy.ts index 943af7f3c6872..664ed2e4d42d9 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/cloudformation/private/singleton-policy.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/cloudformation/private/singleton-policy.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as iam from '../../../../aws-iam'; import * as cdk from '../../../../core'; -import { Construct } from 'constructs'; /** * Manages a bunch of singleton-y statements on the policy of an IAM Role. diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/cloudformation/stackinstances-action.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/cloudformation/stackinstances-action.ts index 9db519ce6946d..b42ac41dc0a90 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/cloudformation/stackinstances-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/cloudformation/stackinstances-action.ts @@ -1,7 +1,7 @@ -import * as codepipeline from '../../../aws-codepipeline'; import { Construct } from 'constructs'; import { SingletonPolicy } from './private/singleton-policy'; import { CommonCloudFormationStackSetOptions, StackInstances, StackSetParameters } from './stackset-types'; +import * as codepipeline from '../../../aws-codepipeline'; import { Action } from '../action'; import { validatePercentage } from '../common'; diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/cloudformation/stackset-action.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/cloudformation/stackset-action.ts index e635615187f27..eeddc59d835a1 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/cloudformation/stackset-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/cloudformation/stackset-action.ts @@ -1,8 +1,8 @@ -import * as codepipeline from '../../../aws-codepipeline'; -import * as cdk from '../../../core'; import { Construct } from 'constructs'; import { parseCapabilities, SingletonPolicy } from './private/singleton-policy'; import { CommonCloudFormationStackSetOptions, StackInstances, StackSetDeploymentModel, StackSetParameters, StackSetTemplate } from './stackset-types'; +import * as codepipeline from '../../../aws-codepipeline'; +import * as cdk from '../../../core'; import { Action } from '../action'; import { validatePercentage } from '../common'; diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/cloudformation/stackset-types.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/cloudformation/stackset-types.ts index 9b69f9c323f90..bc0b2835f3613 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/cloudformation/stackset-types.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/cloudformation/stackset-types.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as codepipeline from '../../../aws-codepipeline'; import * as iam from '../../../aws-iam'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; /** * Options in common between both StackSet actions diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codebuild/build-action.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codebuild/build-action.ts index 52d68a8b2e45b..a2e7dfe51c67c 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codebuild/build-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codebuild/build-action.ts @@ -1,9 +1,9 @@ +import { Construct } from 'constructs'; +import { CodeStarConnectionsSourceAction } from '..'; import * as codebuild from '../../../aws-codebuild'; import * as codepipeline from '../../../aws-codepipeline'; import * as iam from '../../../aws-iam'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; -import { CodeStarConnectionsSourceAction } from '..'; import { Action } from '../action'; import { CodeCommitSourceAction } from '../codecommit/source-action'; diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codecommit/source-action.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codecommit/source-action.ts index a21bf349fcc31..2c4a96cacbad7 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codecommit/source-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codecommit/source-action.ts @@ -1,9 +1,9 @@ +import { Construct } from 'constructs'; import * as codecommit from '../../../aws-codecommit'; import * as codepipeline from '../../../aws-codepipeline'; import * as targets from '../../../aws-events-targets'; import * as iam from '../../../aws-iam'; import { Names, Stack, Token, TokenComparison } from '../../../core'; -import { Construct } from 'constructs'; import { Action } from '../action'; import { sourceArtifactBounds } from '../common'; diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codedeploy/ecs-deploy-action.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codedeploy/ecs-deploy-action.ts index c64bbe58f84e8..64ab7aa96e136 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codedeploy/ecs-deploy-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codedeploy/ecs-deploy-action.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import * as codedeploy from '../../../aws-codedeploy'; import * as codepipeline from '../../../aws-codepipeline'; import * as iam from '../../../aws-iam'; import { Lazy } from '../../../core'; -import { Construct } from 'constructs'; import { Action } from '../action'; import { forceSupportStackDependency } from '../private/stack-dependency'; diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codedeploy/server-deploy-action.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codedeploy/server-deploy-action.ts index 94483a6770f88..abfee2a2a59a2 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codedeploy/server-deploy-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codedeploy/server-deploy-action.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as codedeploy from '../../../aws-codedeploy'; import * as codepipeline from '../../../aws-codepipeline'; import * as iam from '../../../aws-iam'; -import { Construct } from 'constructs'; import { Action } from '../action'; import { deployArtifactBounds } from '../common'; diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codestar-connections/source-action.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codestar-connections/source-action.ts index 3234f2f2631b7..dd9666582910e 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codestar-connections/source-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codestar-connections/source-action.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as codepipeline from '../../../aws-codepipeline'; import * as iam from '../../../aws-iam'; -import { Construct } from 'constructs'; import { Action } from '../action'; import { sourceArtifactBounds } from '../common'; diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/ecr/source-action.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/ecr/source-action.ts index d3c66f35184b3..a7e4c6cf8ce7b 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/ecr/source-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/ecr/source-action.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; import * as codepipeline from '../../../aws-codepipeline'; import * as ecr from '../../../aws-ecr'; import { Rule } from '../../../aws-events'; import * as targets from '../../../aws-events-targets'; import * as iam from '../../../aws-iam'; import { Names } from '../../../core'; -import { Construct } from 'constructs'; import { Action } from '../action'; import { sourceArtifactBounds } from '../common'; diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/ecs/deploy-action.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/ecs/deploy-action.ts index 1fc5d7fd83a71..2218cc8ce289c 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/ecs/deploy-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/ecs/deploy-action.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import * as codepipeline from '../../../aws-codepipeline'; import * as ecs from '../../../aws-ecs'; import * as iam from '../../../aws-iam'; import { Duration } from '../../../core'; -import { Construct } from 'constructs'; import { Action } from '../action'; import { deployArtifactBounds } from '../common'; diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/elastic-beanstalk/deploy-action.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/elastic-beanstalk/deploy-action.ts index b81f630702388..89d6d4295d02f 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/elastic-beanstalk/deploy-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/elastic-beanstalk/deploy-action.ts @@ -1,5 +1,6 @@ -import * as codepipeline from '../../../aws-codepipeline'; import { Construct } from 'constructs'; +import * as codepipeline from '../../../aws-codepipeline'; +import { Aws } from '../../../core'; import { Action } from '../action'; import { deployArtifactBounds } from '../common'; @@ -51,7 +52,7 @@ export class ElasticBeanstalkDeployAction extends Action { // Per https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/AWSHowTo.iam.managed-policies.html // it doesn't seem we can scope this down further for the codepipeline action. - options.role.addManagedPolicy({ managedPolicyArn: 'arn:aws:iam::aws:policy/AdministratorAccess-AWSElasticBeanstalk' }); + options.role.addManagedPolicy({ managedPolicyArn: `arn:${Aws.PARTITION}:iam::aws:policy/AdministratorAccess-AWSElasticBeanstalk` }); // the Action's Role needs to read from the Bucket to get artifacts options.bucket.grantRead(options.role); diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/github/source-action.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/github/source-action.ts index 53a40141b8c2c..2a750e0a20325 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/github/source-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/github/source-action.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as codepipeline from '../../../aws-codepipeline'; import { SecretValue } from '../../../core'; -import { Construct } from 'constructs'; import { Action } from '../action'; import { sourceArtifactBounds } from '../common'; diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/jenkins/jenkins-action.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/jenkins/jenkins-action.ts index 8507d10fdd5ca..c9ff8e61cc24e 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/jenkins/jenkins-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/jenkins/jenkins-action.ts @@ -1,6 +1,6 @@ -import * as codepipeline from '../../../aws-codepipeline'; import { Construct } from 'constructs'; import { IJenkinsProvider, jenkinsArtifactsBounds } from './jenkins-provider'; +import * as codepipeline from '../../../aws-codepipeline'; import { Action } from '../action'; /** diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/jenkins/jenkins-provider.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/jenkins/jenkins-provider.ts index 8e4e9d786c955..d4d36cb236cc8 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/jenkins/jenkins-provider.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/jenkins/jenkins-provider.ts @@ -1,5 +1,5 @@ -import * as codepipeline from '../../../aws-codepipeline'; import { Construct, IConstruct } from 'constructs'; +import * as codepipeline from '../../../aws-codepipeline'; /** * A Jenkins provider. diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/lambda/invoke-action.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/lambda/invoke-action.ts index d207d2dcdd48e..54eb106e0185b 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/lambda/invoke-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/lambda/invoke-action.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import * as codepipeline from '../../../aws-codepipeline'; import * as iam from '../../../aws-iam'; import * as lambda from '../../../aws-lambda'; import { Stack } from '../../../core'; -import { Construct } from 'constructs'; import { Action } from '../action'; /** diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/manual-approval-action.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/manual-approval-action.ts index bad1935b8c7e3..cc77ddca50b8f 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/manual-approval-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/manual-approval-action.ts @@ -1,9 +1,9 @@ +import { Construct } from 'constructs'; +import { Action } from './action'; import * as codepipeline from '../../aws-codepipeline'; import * as iam from '../../aws-iam'; import * as sns from '../../aws-sns'; import * as subs from '../../aws-sns-subscriptions'; -import { Construct } from 'constructs'; -import { Action } from './action'; /** * Construction properties of the `ManualApprovalAction`. diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/s3/deploy-action.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/s3/deploy-action.ts index 470a32f2b49ee..8bf60a2696395 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/s3/deploy-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/s3/deploy-action.ts @@ -1,8 +1,8 @@ +import { kebab as toKebabCase } from 'case'; +import { Construct } from 'constructs'; import * as codepipeline from '../../../aws-codepipeline'; import * as s3 from '../../../aws-s3'; import { Duration } from '../../../core'; -import { kebab as toKebabCase } from 'case'; -import { Construct } from 'constructs'; import { Action } from '../action'; import { deployArtifactBounds } from '../common'; diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/s3/source-action.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/s3/source-action.ts index 144aceebf7cf2..a1e74786f82ff 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/s3/source-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/s3/source-action.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import * as codepipeline from '../../../aws-codepipeline'; import * as targets from '../../../aws-events-targets'; import * as s3 from '../../../aws-s3'; import { Names, Token } from '../../../core'; -import { Construct } from 'constructs'; import { Action } from '../action'; import { sourceArtifactBounds } from '../common'; diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/servicecatalog/deploy-action-beta1.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/servicecatalog/deploy-action-beta1.ts index 1bb5a8cfffc9b..db058866d4a44 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/servicecatalog/deploy-action-beta1.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/servicecatalog/deploy-action-beta1.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as codepipeline from '../../../aws-codepipeline'; import * as iam from '../../../aws-iam'; -import { Construct } from 'constructs'; import { Action } from '../action'; /** diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/stepfunctions/invoke-action.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/stepfunctions/invoke-action.ts index 842407f681b4f..4e30e28e0e70f 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/stepfunctions/invoke-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/stepfunctions/invoke-action.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import * as codepipeline from '../../../aws-codepipeline'; import * as iam from '../../../aws-iam'; import * as stepfunction from '../../../aws-stepfunctions'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; import { Action } from '../action'; /** diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/test/bitbucket/bitbucket-source-action.test.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/test/bitbucket/bitbucket-source-action.test.ts index bf55e4ed6434f..79b8c33c6d05c 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/test/bitbucket/bitbucket-source-action.test.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/test/bitbucket/bitbucket-source-action.test.ts @@ -1,7 +1,7 @@ +import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template, Match } from '../../../assertions'; import * as codebuild from '../../../aws-codebuild'; import * as codepipeline from '../../../aws-codepipeline'; -import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import { Stack } from '../../../core'; import * as cpactions from '../../lib'; diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/test/cloudformation/cloudformation-pipeline-actions.test.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/test/cloudformation/cloudformation-pipeline-actions.test.ts index c1102a13ebbb1..7ab75177217ae 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/test/cloudformation/cloudformation-pipeline-actions.test.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/test/cloudformation/cloudformation-pipeline-actions.test.ts @@ -1,10 +1,10 @@ +import { TestFixture } from './test-fixture'; import { Template, Match } from '../../../assertions'; import * as codebuild from '../../../aws-codebuild'; import * as codecommit from '../../../aws-codecommit'; import * as codepipeline from '../../../aws-codepipeline'; import { PolicyStatement, Role, ServicePrincipal } from '../../../aws-iam'; import * as cdk from '../../../core'; -import { TestFixture } from './test-fixture'; import * as cpactions from '../../lib'; /* eslint-disable quote-props */ diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/test/cloudformation/cloudformation-stackset-pipeline-actions.test.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/test/cloudformation/cloudformation-stackset-pipeline-actions.test.ts index a78dea00f1cc9..cfa43a665baea 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/test/cloudformation/cloudformation-stackset-pipeline-actions.test.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/test/cloudformation/cloudformation-stackset-pipeline-actions.test.ts @@ -1,7 +1,7 @@ +import { TestFixture } from './test-fixture'; import { Match, Template } from '../../../assertions'; import * as iam from '../../../aws-iam'; import * as cdk from '../../../core'; -import { TestFixture } from './test-fixture'; import * as cpactions from '../../lib'; /* eslint-disable quote-props */ diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/test/cloudformation/pipeline-actions.test.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/test/cloudformation/pipeline-actions.test.ts index cce7140273c8f..2341aff4f681f 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/test/cloudformation/pipeline-actions.test.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/test/cloudformation/pipeline-actions.test.ts @@ -1,11 +1,11 @@ +import { Construct, IConstruct, Node } from 'constructs'; +import * as _ from 'lodash'; import * as codepipeline from '../../../aws-codepipeline'; import * as notifications from '../../../aws-codestarnotifications'; import * as events from '../../../aws-events'; import * as iam from '../../../aws-iam'; import * as s3 from '../../../aws-s3'; import * as cdk from '../../../core'; -import { Construct, IConstruct, Node } from 'constructs'; -import * as _ from 'lodash'; import * as cpactions from '../../lib'; describe('Pipeline Actions', () => { diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/test/integ.pipeline-ecs-separate-source.lit.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/test/integ.pipeline-ecs-separate-source.lit.ts index 4dce565c3d199..7acc0373dddc4 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/test/integ.pipeline-ecs-separate-source.lit.ts +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/test/integ.pipeline-ecs-separate-source.lit.ts @@ -1,5 +1,6 @@ /// !cdk-integ * +import { Construct } from 'constructs'; import * as codebuild from '../../aws-codebuild'; import * as codecommit from '../../aws-codecommit'; import * as codepipeline from '../../aws-codepipeline'; @@ -8,7 +9,6 @@ import * as ecr from '../../aws-ecr'; import * as ecs from '../../aws-ecs'; import * as s3 from '../../aws-s3'; import * as cdk from '../../core'; -import { Construct } from 'constructs'; import * as codepipeline_actions from '../lib'; /** diff --git a/packages/aws-cdk-lib/aws-codepipeline/lib/action.ts b/packages/aws-cdk-lib/aws-codepipeline/lib/action.ts index 750177cf4c2a9..d390ed0ecf30d 100644 --- a/packages/aws-cdk-lib/aws-codepipeline/lib/action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline/lib/action.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; +import { Artifact } from './artifact'; import * as notifications from '../../aws-codestarnotifications'; import * as events from '../../aws-events'; import * as iam from '../../aws-iam'; import * as s3 from '../../aws-s3'; import { IResource, Lazy } from '../../core'; -import { Construct } from 'constructs'; -import { Artifact } from './artifact'; export enum ActionCategory { SOURCE = 'Source', diff --git a/packages/aws-cdk-lib/aws-codepipeline/lib/artifact.ts b/packages/aws-cdk-lib/aws-codepipeline/lib/artifact.ts index d5ae47f2eef1d..2f8f00e794d05 100644 --- a/packages/aws-cdk-lib/aws-codepipeline/lib/artifact.ts +++ b/packages/aws-cdk-lib/aws-codepipeline/lib/artifact.ts @@ -1,6 +1,6 @@ +import * as validation from './private/validation'; import * as s3 from '../../aws-s3'; import { Lazy, Token } from '../../core'; -import * as validation from './private/validation'; /** * An output artifact of an action. Artifacts can be used as input by some actions. diff --git a/packages/aws-cdk-lib/aws-codepipeline/lib/pipeline.ts b/packages/aws-cdk-lib/aws-codepipeline/lib/pipeline.ts index 37d05564ffd7f..ccd626b952eb8 100644 --- a/packages/aws-cdk-lib/aws-codepipeline/lib/pipeline.ts +++ b/packages/aws-cdk-lib/aws-codepipeline/lib/pipeline.ts @@ -1,3 +1,11 @@ +import { Construct } from 'constructs'; +import { ActionCategory, IAction, IPipeline, IStage, PipelineNotificationEvents, PipelineNotifyOnOptions } from './action'; +import { CfnPipeline } from './codepipeline.generated'; +import { CrossRegionSupportConstruct, CrossRegionSupportStack } from './private/cross-region-support-stack'; +import { FullActionDescriptor } from './private/full-action-descriptor'; +import { RichAction } from './private/rich-action'; +import { Stage } from './private/stage'; +import { validateName, validateNamespaceName, validateSourceAction } from './private/validation'; import * as notifications from '../../aws-codestarnotifications'; import * as events from '../../aws-events'; import * as iam from '../../aws-iam'; @@ -19,14 +27,6 @@ import { Token, } from '../../core'; import * as cxapi from '../../cx-api'; -import { Construct } from 'constructs'; -import { ActionCategory, IAction, IPipeline, IStage, PipelineNotificationEvents, PipelineNotifyOnOptions } from './action'; -import { CfnPipeline } from './codepipeline.generated'; -import { CrossRegionSupportConstruct, CrossRegionSupportStack } from './private/cross-region-support-stack'; -import { FullActionDescriptor } from './private/full-action-descriptor'; -import { RichAction } from './private/rich-action'; -import { Stage } from './private/stage'; -import { validateName, validateNamespaceName, validateSourceAction } from './private/validation'; /** * Allows you to control where to place a new Stage when it's added to the Pipeline. diff --git a/packages/aws-cdk-lib/aws-codepipeline/lib/private/cross-region-support-stack.ts b/packages/aws-cdk-lib/aws-codepipeline/lib/private/cross-region-support-stack.ts index 40e3f17637ba7..a4786251ab9ed 100644 --- a/packages/aws-cdk-lib/aws-codepipeline/lib/private/cross-region-support-stack.ts +++ b/packages/aws-cdk-lib/aws-codepipeline/lib/private/cross-region-support-stack.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as kms from '../../../aws-kms'; import * as s3 from '../../../aws-s3'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; const REQUIRED_ALIAS_PREFIX = 'alias/'; diff --git a/packages/aws-cdk-lib/aws-codepipeline/lib/private/rich-action.ts b/packages/aws-cdk-lib/aws-codepipeline/lib/private/rich-action.ts index 4d3b896523274..688641607cdea 100644 --- a/packages/aws-cdk-lib/aws-codepipeline/lib/private/rich-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline/lib/private/rich-action.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as events from '../../../aws-events'; import { ResourceEnvironment, Stack, Token, TokenComparison } from '../../../core'; -import { Construct } from 'constructs'; import { ActionBindOptions, ActionConfig, ActionProperties, IAction, IPipeline, IStage } from '../action'; /** diff --git a/packages/aws-cdk-lib/aws-codepipeline/lib/private/stage.ts b/packages/aws-cdk-lib/aws-codepipeline/lib/private/stage.ts index c586923aba0b6..7025fb3854916 100644 --- a/packages/aws-cdk-lib/aws-codepipeline/lib/private/stage.ts +++ b/packages/aws-cdk-lib/aws-codepipeline/lib/private/stage.ts @@ -1,9 +1,9 @@ -import * as events from '../../../aws-events'; -import * as cdk from '../../../core'; -import { Token } from '../../../core'; import { Construct, Node } from 'constructs'; import { FullActionDescriptor } from './full-action-descriptor'; import * as validation from './validation'; +import * as events from '../../../aws-events'; +import * as cdk from '../../../core'; +import { Token } from '../../../core'; import { IAction, IPipeline, IStage } from '../action'; import { Artifact } from '../artifact'; import { CfnPipeline } from '../codepipeline.generated'; diff --git a/packages/aws-cdk-lib/aws-codepipeline/test/action.test.ts b/packages/aws-cdk-lib/aws-codepipeline/test/action.test.ts index 090798822b250..ed1d9d520e184 100644 --- a/packages/aws-cdk-lib/aws-codepipeline/test/action.test.ts +++ b/packages/aws-cdk-lib/aws-codepipeline/test/action.test.ts @@ -1,8 +1,8 @@ +import { FakeBuildAction } from './fake-build-action'; +import { FakeSourceAction } from './fake-source-action'; import { Template } from '../../assertions'; import * as iam from '../../aws-iam'; import * as cdk from '../../core'; -import { FakeBuildAction } from './fake-build-action'; -import { FakeSourceAction } from './fake-source-action'; import * as codepipeline from '../lib'; import * as validations from '../lib/private/validation'; diff --git a/packages/aws-cdk-lib/aws-codepipeline/test/artifacts.test.ts b/packages/aws-cdk-lib/aws-codepipeline/test/artifacts.test.ts index 81c6acb4d60da..247e30f7160c4 100644 --- a/packages/aws-cdk-lib/aws-codepipeline/test/artifacts.test.ts +++ b/packages/aws-cdk-lib/aws-codepipeline/test/artifacts.test.ts @@ -1,8 +1,8 @@ -import { Template } from '../../assertions'; -import * as cdk from '../../core'; import { IConstruct } from 'constructs'; import { FakeBuildAction } from './fake-build-action'; import { FakeSourceAction } from './fake-source-action'; +import { Template } from '../../assertions'; +import * as cdk from '../../core'; import * as codepipeline from '../lib'; /* eslint-disable quote-props */ diff --git a/packages/aws-cdk-lib/aws-codepipeline/test/cross-env.test.ts b/packages/aws-cdk-lib/aws-codepipeline/test/cross-env.test.ts index 543e0ee99a7fa..56af22bb97a4f 100644 --- a/packages/aws-cdk-lib/aws-codepipeline/test/cross-env.test.ts +++ b/packages/aws-cdk-lib/aws-codepipeline/test/cross-env.test.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; +import { FakeBuildAction } from './fake-build-action'; +import { FakeSourceAction } from './fake-source-action'; import { Template } from '../../assertions'; import * as iam from '../../aws-iam'; import * as s3 from '../../aws-s3'; import { Stack, App, Stage as CdkStage } from '../../core'; -import { Construct } from 'constructs'; -import { FakeBuildAction } from './fake-build-action'; -import { FakeSourceAction } from './fake-source-action'; import * as codepipeline from '../lib'; describe.each([ diff --git a/packages/aws-cdk-lib/aws-codepipeline/test/fake-build-action.ts b/packages/aws-cdk-lib/aws-codepipeline/test/fake-build-action.ts index ab0d3c53bc1d7..1a879a5fed781 100644 --- a/packages/aws-cdk-lib/aws-codepipeline/test/fake-build-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline/test/fake-build-action.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as iam from '../../aws-iam'; import { IResource } from '../../core'; -import { Construct } from 'constructs'; import * as codepipeline from '../lib'; export interface FakeBuildActionProps extends codepipeline.CommonActionProps { diff --git a/packages/aws-cdk-lib/aws-codepipeline/test/fake-source-action.ts b/packages/aws-cdk-lib/aws-codepipeline/test/fake-source-action.ts index fc29e49448c4e..a1f7ef8552f26 100644 --- a/packages/aws-cdk-lib/aws-codepipeline/test/fake-source-action.ts +++ b/packages/aws-cdk-lib/aws-codepipeline/test/fake-source-action.ts @@ -1,5 +1,5 @@ -import { Lazy } from '../../core'; import { Construct } from 'constructs'; +import { Lazy } from '../../core'; import * as codepipeline from '../lib'; export interface IFakeSourceActionVariables { diff --git a/packages/aws-cdk-lib/aws-codepipeline/test/general-validation.test.ts b/packages/aws-cdk-lib/aws-codepipeline/test/general-validation.test.ts index a54fd65215f53..e15b1296c22df 100644 --- a/packages/aws-cdk-lib/aws-codepipeline/test/general-validation.test.ts +++ b/packages/aws-cdk-lib/aws-codepipeline/test/general-validation.test.ts @@ -1,5 +1,5 @@ -import * as cdk from '../../core'; import { FakeSourceAction } from './fake-source-action'; +import * as cdk from '../../core'; import { IStage } from '../lib/action'; import { Artifact } from '../lib/artifact'; import { Pipeline } from '../lib/pipeline'; diff --git a/packages/aws-cdk-lib/aws-codepipeline/test/notification-rule.test.ts b/packages/aws-cdk-lib/aws-codepipeline/test/notification-rule.test.ts index 3150967ef0e6f..f2bdc0f8efcc5 100644 --- a/packages/aws-cdk-lib/aws-codepipeline/test/notification-rule.test.ts +++ b/packages/aws-cdk-lib/aws-codepipeline/test/notification-rule.test.ts @@ -1,7 +1,7 @@ -import { Template } from '../../assertions'; -import * as cdk from '../../core'; import { FakeBuildAction } from './fake-build-action'; import { FakeSourceAction } from './fake-source-action'; +import { Template } from '../../assertions'; +import * as cdk from '../../core'; import * as codepipeline from '../lib'; describe('pipeline with codestar notification integration', () => { diff --git a/packages/aws-cdk-lib/aws-codepipeline/test/pipeline.test.ts b/packages/aws-cdk-lib/aws-codepipeline/test/pipeline.test.ts index b7a7b9ce68102..cf3375c809216 100644 --- a/packages/aws-cdk-lib/aws-codepipeline/test/pipeline.test.ts +++ b/packages/aws-cdk-lib/aws-codepipeline/test/pipeline.test.ts @@ -1,12 +1,12 @@ +import { Construct } from 'constructs'; +import { FakeBuildAction } from './fake-build-action'; +import { FakeSourceAction } from './fake-source-action'; import { Match, Template } from '../../assertions'; import * as iam from '../../aws-iam'; import * as kms from '../../aws-kms'; import * as s3 from '../../aws-s3'; import * as cdk from '../../core'; import * as cxapi from '../../cx-api'; -import { Construct } from 'constructs'; -import { FakeBuildAction } from './fake-build-action'; -import { FakeSourceAction } from './fake-source-action'; import * as codepipeline from '../lib'; /* eslint-disable quote-props */ diff --git a/packages/aws-cdk-lib/aws-codepipeline/test/stages.test.ts b/packages/aws-cdk-lib/aws-codepipeline/test/stages.test.ts index 59c94547def7e..7e85508b89bdd 100644 --- a/packages/aws-cdk-lib/aws-codepipeline/test/stages.test.ts +++ b/packages/aws-cdk-lib/aws-codepipeline/test/stages.test.ts @@ -1,7 +1,7 @@ -import { Template } from '../../assertions'; -import * as cdk from '../../core'; import { FakeBuildAction } from './fake-build-action'; import { FakeSourceAction } from './fake-source-action'; +import { Template } from '../../assertions'; +import * as cdk from '../../core'; import * as codepipeline from '../lib'; import { Stage } from '../lib/private/stage'; diff --git a/packages/aws-cdk-lib/aws-codepipeline/test/variables.test.ts b/packages/aws-cdk-lib/aws-codepipeline/test/variables.test.ts index be33c2cd19187..b469a11da4d53 100644 --- a/packages/aws-cdk-lib/aws-codepipeline/test/variables.test.ts +++ b/packages/aws-cdk-lib/aws-codepipeline/test/variables.test.ts @@ -1,7 +1,7 @@ -import { Match, Template } from '../../assertions'; -import * as cdk from '../../core'; import { FakeBuildAction } from './fake-build-action'; import { FakeSourceAction } from './fake-source-action'; +import { Match, Template } from '../../assertions'; +import * as cdk from '../../core'; import * as codepipeline from '../lib'; /* eslint-disable quote-props */ diff --git a/packages/aws-cdk-lib/aws-codestarnotifications/lib/notification-rule.ts b/packages/aws-cdk-lib/aws-codestarnotifications/lib/notification-rule.ts index 06dfe9d392263..348db4256178c 100644 --- a/packages/aws-cdk-lib/aws-codestarnotifications/lib/notification-rule.ts +++ b/packages/aws-cdk-lib/aws-codestarnotifications/lib/notification-rule.ts @@ -1,8 +1,8 @@ -import { IResource, Resource, Names } from '../../core'; import * as constructs from 'constructs'; import { CfnNotificationRule } from './codestarnotifications.generated'; import { INotificationRuleSource } from './notification-rule-source'; import { INotificationRuleTarget, NotificationRuleTargetConfig } from './notification-rule-target'; +import { IResource, Resource, Names } from '../../core'; /** * The level of detail to include in the notifications for this resource. diff --git a/packages/aws-cdk-lib/aws-codestarnotifications/test/notification-rule.test.ts b/packages/aws-cdk-lib/aws-codestarnotifications/test/notification-rule.test.ts index 54449ebb91df9..be800082140b1 100644 --- a/packages/aws-cdk-lib/aws-codestarnotifications/test/notification-rule.test.ts +++ b/packages/aws-cdk-lib/aws-codestarnotifications/test/notification-rule.test.ts @@ -1,5 +1,3 @@ -import { Template } from '../../assertions'; -import * as cdk from '../../core'; import { FakeCodeBuild, FakeCodePipeline, @@ -7,6 +5,8 @@ import { FakeSlackTarget, FakeSnsTopicTarget, } from './helpers'; +import { Template } from '../../assertions'; +import * as cdk from '../../core'; import * as notifications from '../lib'; describe('NotificationRule', () => { diff --git a/packages/aws-cdk-lib/aws-cognito/lib/user-pool-attr.ts b/packages/aws-cdk-lib/aws-cognito/lib/user-pool-attr.ts index 78a6980d391e6..1418681fe6f9f 100644 --- a/packages/aws-cdk-lib/aws-cognito/lib/user-pool-attr.ts +++ b/packages/aws-cdk-lib/aws-cognito/lib/user-pool-attr.ts @@ -1,5 +1,5 @@ -import { Token } from '../../core'; import { StandardAttributeNames } from './private/attr-names'; +import { Token } from '../../core'; /** * The set of standard attributes that can be marked as required or mutable. diff --git a/packages/aws-cdk-lib/aws-cognito/lib/user-pool-client.ts b/packages/aws-cdk-lib/aws-cognito/lib/user-pool-client.ts index 14dc510bd4315..8e6b2e3a9cb76 100644 --- a/packages/aws-cdk-lib/aws-cognito/lib/user-pool-client.ts +++ b/packages/aws-cdk-lib/aws-cognito/lib/user-pool-client.ts @@ -1,10 +1,10 @@ -import { IResource, Resource, Duration, Stack, SecretValue } from '../../core'; -import { AwsCustomResource, AwsCustomResourcePolicy, PhysicalResourceId } from '../../custom-resources'; import { Construct } from 'constructs'; import { CfnUserPoolClient } from './cognito.generated'; import { IUserPool } from './user-pool'; import { ClientAttributes } from './user-pool-attr'; import { IUserPoolResourceServer, ResourceServerScope } from './user-pool-resource-server'; +import { IResource, Resource, Duration, Stack, SecretValue } from '../../core'; +import { AwsCustomResource, AwsCustomResourcePolicy, PhysicalResourceId } from '../../custom-resources'; /** * Types of authentication flow diff --git a/packages/aws-cdk-lib/aws-cognito/lib/user-pool-domain.ts b/packages/aws-cdk-lib/aws-cognito/lib/user-pool-domain.ts index 2d6961ff337a8..0ae269403615c 100644 --- a/packages/aws-cdk-lib/aws-cognito/lib/user-pool-domain.ts +++ b/packages/aws-cdk-lib/aws-cognito/lib/user-pool-domain.ts @@ -1,10 +1,10 @@ -import { ICertificate } from '../../aws-certificatemanager'; -import { IResource, Resource, Stack, Token } from '../../core'; -import { AwsCustomResource, AwsCustomResourcePolicy, AwsSdkCall, PhysicalResourceId } from '../../custom-resources'; import { Construct } from 'constructs'; import { CfnUserPoolDomain } from './cognito.generated'; import { IUserPool } from './user-pool'; import { UserPoolClient } from './user-pool-client'; +import { ICertificate } from '../../aws-certificatemanager'; +import { IResource, Resource, Stack, Token } from '../../core'; +import { AwsCustomResource, AwsCustomResourcePolicy, AwsSdkCall, PhysicalResourceId } from '../../custom-resources'; /** * Represents a user pool domain. diff --git a/packages/aws-cdk-lib/aws-cognito/lib/user-pool-email.ts b/packages/aws-cdk-lib/aws-cognito/lib/user-pool-email.ts index dd9a7c6ffc680..f605a9c84c32e 100644 --- a/packages/aws-cdk-lib/aws-cognito/lib/user-pool-email.ts +++ b/packages/aws-cdk-lib/aws-cognito/lib/user-pool-email.ts @@ -1,6 +1,6 @@ -import { Stack, Token } from '../../core'; import { Construct } from 'constructs'; import { toASCII as punycodeEncode } from 'punycode/'; +import { Stack, Token } from '../../core'; /** * Configuration for Cognito sending emails via Amazon SES diff --git a/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idp.ts b/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idp.ts index a89f961850f4e..4e47e3bd1180d 100644 --- a/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idp.ts +++ b/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idp.ts @@ -1,5 +1,5 @@ -import { IResource, Resource } from '../../core'; import { Construct } from 'constructs'; +import { IResource, Resource } from '../../core'; /** * Represents a UserPoolIdentityProvider diff --git a/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idps/google.ts b/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idps/google.ts index 94a25d5a700fd..c99b3c49cd6de 100644 --- a/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idps/google.ts +++ b/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idps/google.ts @@ -1,7 +1,7 @@ -import { SecretValue } from '../../../core'; import { Construct } from 'constructs'; import { UserPoolIdentityProviderProps } from './base'; import { UserPoolIdentityProviderBase } from './private/user-pool-idp-base'; +import { SecretValue } from '../../../core'; import { CfnUserPoolIdentityProvider } from '../cognito.generated'; /** diff --git a/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idps/oidc.ts b/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idps/oidc.ts index 819f5e86fcb7e..3daaf11afccdd 100644 --- a/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idps/oidc.ts +++ b/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idps/oidc.ts @@ -1,7 +1,7 @@ -import { Names, Token } from '../../../core'; import { Construct } from 'constructs'; import { UserPoolIdentityProviderProps } from './base'; import { UserPoolIdentityProviderBase } from './private/user-pool-idp-base'; +import { Names, Token } from '../../../core'; import { CfnUserPoolIdentityProvider } from '../cognito.generated'; /** diff --git a/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idps/private/user-pool-idp-base.ts b/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idps/private/user-pool-idp-base.ts index 7fc36a20a6801..44f81cee1ba1d 100644 --- a/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idps/private/user-pool-idp-base.ts +++ b/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idps/private/user-pool-idp-base.ts @@ -1,5 +1,5 @@ -import { Resource } from '../../../../core'; import { Construct } from 'constructs'; +import { Resource } from '../../../../core'; import { StandardAttributeNames } from '../../private/attr-names'; import { IUserPoolIdentityProvider } from '../../user-pool-idp'; import { UserPoolIdentityProviderProps, AttributeMapping } from '../base'; diff --git a/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idps/saml.ts b/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idps/saml.ts index c9fd3cbb96476..ea4c9614e3ae3 100644 --- a/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idps/saml.ts +++ b/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idps/saml.ts @@ -1,7 +1,7 @@ -import { Names, Token } from '../../../core'; import { Construct } from 'constructs'; import { UserPoolIdentityProviderProps } from './base'; import { UserPoolIdentityProviderBase } from './private/user-pool-idp-base'; +import { Names, Token } from '../../../core'; import { CfnUserPoolIdentityProvider } from '../cognito.generated'; /** diff --git a/packages/aws-cdk-lib/aws-cognito/lib/user-pool-resource-server.ts b/packages/aws-cdk-lib/aws-cognito/lib/user-pool-resource-server.ts index edbfb8f4208f5..992cd469e5191 100644 --- a/packages/aws-cdk-lib/aws-cognito/lib/user-pool-resource-server.ts +++ b/packages/aws-cdk-lib/aws-cognito/lib/user-pool-resource-server.ts @@ -1,7 +1,7 @@ -import { IResource, Resource } from '../../core'; import { Construct } from 'constructs'; import { CfnUserPoolResourceServer } from './cognito.generated'; import { IUserPool } from './user-pool'; +import { IResource, Resource } from '../../core'; /** * Represents a Cognito user pool resource server diff --git a/packages/aws-cdk-lib/aws-cognito/lib/user-pool.ts b/packages/aws-cdk-lib/aws-cognito/lib/user-pool.ts index 929409bc44f49..15256759435c5 100644 --- a/packages/aws-cdk-lib/aws-cognito/lib/user-pool.ts +++ b/packages/aws-cdk-lib/aws-cognito/lib/user-pool.ts @@ -1,7 +1,3 @@ -import { Grant, IGrantable, IRole, PolicyDocument, PolicyStatement, Role, ServicePrincipal } from '../../aws-iam'; -import { IKey } from '../../aws-kms'; -import * as lambda from '../../aws-lambda'; -import { ArnFormat, Duration, IResource, Lazy, Names, RemovalPolicy, Resource, Stack, Token } from '../../core'; import { Construct } from 'constructs'; import { toASCII as punycodeEncode } from 'punycode/'; import { CfnUserPool } from './cognito.generated'; @@ -12,6 +8,10 @@ import { UserPoolDomain, UserPoolDomainOptions } from './user-pool-domain'; import { UserPoolEmail } from './user-pool-email'; import { IUserPoolIdentityProvider } from './user-pool-idp'; import { UserPoolResourceServer, UserPoolResourceServerOptions } from './user-pool-resource-server'; +import { Grant, IGrantable, IRole, PolicyDocument, PolicyStatement, Role, ServicePrincipal } from '../../aws-iam'; +import { IKey } from '../../aws-kms'; +import * as lambda from '../../aws-lambda'; +import { ArnFormat, Duration, IResource, Lazy, Names, RemovalPolicy, Resource, Stack, Token } from '../../core'; /** * The different ways in which users of this pool can sign up or sign in. diff --git a/packages/aws-cdk-lib/aws-cognito/test/user-pool.test.ts b/packages/aws-cdk-lib/aws-cognito/test/user-pool.test.ts index 289032dd0f8e2..0c2c7c42b3ccd 100644 --- a/packages/aws-cdk-lib/aws-cognito/test/user-pool.test.ts +++ b/packages/aws-cdk-lib/aws-cognito/test/user-pool.test.ts @@ -1,10 +1,10 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; +import { Construct } from 'constructs'; import { Match, Template } from '../../assertions'; import { Role, ServicePrincipal } from '../../aws-iam'; import * as kms from '../../aws-kms'; import * as lambda from '../../aws-lambda'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { CfnParameter, Duration, Stack, Tags } from '../../core'; -import { Construct } from 'constructs'; import { AccountRecovery, Mfa, NumberAttribute, StringAttribute, UserPool, UserPoolIdentityProvider, UserPoolOperation, VerificationEmailStyle, UserPoolEmail, AdvancedSecurityMode } from '../lib'; describe('User Pool', () => { diff --git a/packages/aws-cdk-lib/aws-config/lib/managed-rules.ts b/packages/aws-cdk-lib/aws-config/lib/managed-rules.ts index 53de5b5c025e7..d937ef37017bd 100644 --- a/packages/aws-cdk-lib/aws-config/lib/managed-rules.ts +++ b/packages/aws-cdk-lib/aws-config/lib/managed-rules.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; +import { ManagedRule, ManagedRuleIdentifiers, ResourceType, RuleProps, RuleScope } from './rule'; import * as iam from '../../aws-iam'; import * as sns from '../../aws-sns'; import { Duration, Lazy, Stack } from '../../core'; -import { Construct } from 'constructs'; -import { ManagedRule, ManagedRuleIdentifiers, ResourceType, RuleProps, RuleScope } from './rule'; /** * Construction properties for a AccessKeysRotated diff --git a/packages/aws-cdk-lib/aws-config/lib/rule.ts b/packages/aws-cdk-lib/aws-config/lib/rule.ts index e403daca2aa59..469e12db35501 100644 --- a/packages/aws-cdk-lib/aws-config/lib/rule.ts +++ b/packages/aws-cdk-lib/aws-config/lib/rule.ts @@ -1,10 +1,10 @@ import { createHash } from 'crypto'; +import { Construct } from 'constructs'; +import { CfnConfigRule } from './config.generated'; import * as events from '../../aws-events'; import * as iam from '../../aws-iam'; import * as lambda from '../../aws-lambda'; import { IResource, Lazy, Resource, Stack } from '../../core'; -import { Construct } from 'constructs'; -import { CfnConfigRule } from './config.generated'; /** * Interface representing an AWS Config rule diff --git a/packages/aws-cdk-lib/aws-docdb/lib/cluster-ref.ts b/packages/aws-cdk-lib/aws-docdb/lib/cluster-ref.ts index 606495cfc1ca0..293546c2c7ded 100644 --- a/packages/aws-cdk-lib/aws-docdb/lib/cluster-ref.ts +++ b/packages/aws-cdk-lib/aws-docdb/lib/cluster-ref.ts @@ -1,7 +1,7 @@ +import { Endpoint } from './endpoint'; import { IConnectable, ISecurityGroup } from '../../aws-ec2'; import { ISecretAttachmentTarget } from '../../aws-secretsmanager'; import { IResource } from '../../core'; -import { Endpoint } from './endpoint'; /** * Create a clustered database with a given number of instances. diff --git a/packages/aws-cdk-lib/aws-docdb/lib/cluster.ts b/packages/aws-cdk-lib/aws-docdb/lib/cluster.ts index 5b46e6b365c3f..7aeb83c904dd7 100644 --- a/packages/aws-cdk-lib/aws-docdb/lib/cluster.ts +++ b/packages/aws-cdk-lib/aws-docdb/lib/cluster.ts @@ -1,9 +1,3 @@ -import * as ec2 from '../../aws-ec2'; -import { IRole } from '../../aws-iam'; -import * as kms from '../../aws-kms'; -import * as logs from '../../aws-logs'; -import * as secretsmanager from '../../aws-secretsmanager'; -import { CfnResource, Duration, RemovalPolicy, Resource, Token } from '../../core'; import { Construct } from 'constructs'; import { DatabaseClusterAttributes, IDatabaseCluster } from './cluster-ref'; import { DatabaseSecret } from './database-secret'; @@ -11,6 +5,12 @@ import { CfnDBCluster, CfnDBInstance, CfnDBSubnetGroup } from './docdb.generated import { Endpoint } from './endpoint'; import { IClusterParameterGroup } from './parameter-group'; import { BackupProps, Login, RotationMultiUserOptions } from './props'; +import * as ec2 from '../../aws-ec2'; +import { IRole } from '../../aws-iam'; +import * as kms from '../../aws-kms'; +import * as logs from '../../aws-logs'; +import * as secretsmanager from '../../aws-secretsmanager'; +import { CfnResource, Duration, RemovalPolicy, Resource, Token } from '../../core'; /** * Properties for a new database cluster diff --git a/packages/aws-cdk-lib/aws-docdb/lib/database-secret.ts b/packages/aws-cdk-lib/aws-docdb/lib/database-secret.ts index dc380a904872e..7da183748e90a 100644 --- a/packages/aws-cdk-lib/aws-docdb/lib/database-secret.ts +++ b/packages/aws-cdk-lib/aws-docdb/lib/database-secret.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import { IKey } from '../../aws-kms'; import { ISecret, Secret } from '../../aws-secretsmanager'; import { Aws } from '../../core'; -import { Construct } from 'constructs'; /** * Construction properties for a DatabaseSecret. diff --git a/packages/aws-cdk-lib/aws-docdb/lib/instance.ts b/packages/aws-cdk-lib/aws-docdb/lib/instance.ts index 623107ba020f3..813bf2ab8eb30 100644 --- a/packages/aws-cdk-lib/aws-docdb/lib/instance.ts +++ b/packages/aws-cdk-lib/aws-docdb/lib/instance.ts @@ -1,10 +1,10 @@ -import * as ec2 from '../../aws-ec2'; -import * as cdk from '../../core'; -import { ArnFormat } from '../../core'; import { Construct } from 'constructs'; import { IDatabaseCluster } from './cluster-ref'; import { CfnDBInstance } from './docdb.generated'; import { Endpoint } from './endpoint'; +import * as ec2 from '../../aws-ec2'; +import { ArnFormat } from '../../core'; +import * as cdk from '../../core'; /** * A database instance diff --git a/packages/aws-cdk-lib/aws-docdb/lib/parameter-group.ts b/packages/aws-cdk-lib/aws-docdb/lib/parameter-group.ts index f8edd9723a22f..346214a6dc187 100644 --- a/packages/aws-cdk-lib/aws-docdb/lib/parameter-group.ts +++ b/packages/aws-cdk-lib/aws-docdb/lib/parameter-group.ts @@ -1,6 +1,6 @@ -import { IResource, Resource } from '../../core'; import { Construct } from 'constructs'; import { CfnDBClusterParameterGroup } from './docdb.generated'; +import { IResource, Resource } from '../../core'; /** * A parameter group diff --git a/packages/aws-cdk-lib/aws-docdb/test/instance.test.ts b/packages/aws-cdk-lib/aws-docdb/test/instance.test.ts index 8bfb0569d8c8d..dc974da0e112e 100644 --- a/packages/aws-cdk-lib/aws-docdb/test/instance.test.ts +++ b/packages/aws-cdk-lib/aws-docdb/test/instance.test.ts @@ -1,7 +1,7 @@ +import * as constructs from 'constructs'; import { Template } from '../../assertions'; import * as ec2 from '../../aws-ec2'; import * as cdk from '../../core'; -import * as constructs from 'constructs'; import { DatabaseCluster, DatabaseInstance } from '../lib'; const CLUSTER_INSTANCE_TYPE = ec2.InstanceType.of(ec2.InstanceClass.R5, ec2.InstanceSize.LARGE); diff --git a/packages/aws-cdk-lib/aws-dynamodb/lib/replica-handler/index.ts b/packages/aws-cdk-lib/aws-dynamodb/lib/replica-handler/index.ts index 610f4ff48ca86..ea7295ce2d0df 100644 --- a/packages/aws-cdk-lib/aws-dynamodb/lib/replica-handler/index.ts +++ b/packages/aws-cdk-lib/aws-dynamodb/lib/replica-handler/index.ts @@ -1,6 +1,6 @@ /* eslint-disable no-console */ -import type { IsCompleteRequest, IsCompleteResponse, OnEventRequest, OnEventResponse } from '../../../custom-resources/lib/provider-framework/types'; import { DynamoDB } from 'aws-sdk'; // eslint-disable-line import/no-extraneous-dependencies +import type { IsCompleteRequest, IsCompleteResponse, OnEventRequest, OnEventResponse } from '../../../custom-resources/lib/provider-framework/types'; export async function onEventHandler(event: OnEventRequest): Promise { console.log('Event: %j', { ...event, ResponseURL: '...' }); diff --git a/packages/aws-cdk-lib/aws-dynamodb/lib/replica-provider.ts b/packages/aws-cdk-lib/aws-dynamodb/lib/replica-provider.ts index bfb4fc44c90fe..70bcf86842c2d 100644 --- a/packages/aws-cdk-lib/aws-dynamodb/lib/replica-provider.ts +++ b/packages/aws-cdk-lib/aws-dynamodb/lib/replica-provider.ts @@ -1,9 +1,9 @@ import * as path from 'path'; +import { Construct } from 'constructs'; import * as iam from '../../aws-iam'; import * as lambda from '../../aws-lambda'; import { Aws, Duration, NestedStack, Stack } from '../../core'; import * as cr from '../../custom-resources'; -import { Construct } from 'constructs'; /** * Properties for a ReplicaProvider diff --git a/packages/aws-cdk-lib/aws-dynamodb/lib/scalable-table-attribute.ts b/packages/aws-cdk-lib/aws-dynamodb/lib/scalable-table-attribute.ts index bf7ae536c5ff9..02e5b071e3ab2 100644 --- a/packages/aws-cdk-lib/aws-dynamodb/lib/scalable-table-attribute.ts +++ b/packages/aws-cdk-lib/aws-dynamodb/lib/scalable-table-attribute.ts @@ -1,5 +1,5 @@ -import * as appscaling from '../../aws-applicationautoscaling'; import { UtilizationScalingProps } from './scalable-attribute-api'; +import * as appscaling from '../../aws-applicationautoscaling'; /** * A scalable table attribute diff --git a/packages/aws-cdk-lib/aws-dynamodb/lib/table.ts b/packages/aws-cdk-lib/aws-dynamodb/lib/table.ts index 8130250b10272..03aeec46fc05b 100644 --- a/packages/aws-cdk-lib/aws-dynamodb/lib/table.ts +++ b/packages/aws-cdk-lib/aws-dynamodb/lib/table.ts @@ -1,3 +1,10 @@ +import { Construct } from 'constructs'; +import { DynamoDBMetrics } from './dynamodb-canned-metrics.generated'; +import { CfnTable, CfnTableProps } from './dynamodb.generated'; +import * as perms from './perms'; +import { ReplicaProvider } from './replica-provider'; +import { EnableScalingProps, IScalableTableAttribute } from './scalable-attribute-api'; +import { ScalableTableAttribute } from './scalable-table-attribute'; import * as appscaling from '../../aws-applicationautoscaling'; import * as cloudwatch from '../../aws-cloudwatch'; import * as iam from '../../aws-iam'; @@ -8,13 +15,6 @@ import { Aws, CfnCondition, CfnCustomResource, CfnResource, CustomResource, Duration, Fn, IResource, Lazy, Names, RemovalPolicy, Resource, Stack, Token, } from '../../core'; -import { Construct } from 'constructs'; -import { DynamoDBMetrics } from './dynamodb-canned-metrics.generated'; -import { CfnTable, CfnTableProps } from './dynamodb.generated'; -import * as perms from './perms'; -import { ReplicaProvider } from './replica-provider'; -import { EnableScalingProps, IScalableTableAttribute } from './scalable-attribute-api'; -import { ScalableTableAttribute } from './scalable-table-attribute'; const HASH_KEY_TYPE = 'HASH'; const RANGE_KEY_TYPE = 'RANGE'; @@ -280,11 +280,11 @@ export interface TableOptions extends SchemaOptions { * in one deployment, as CloudFormation only supports one region replication * at a time. CDK overcomes this limitation by waiting for replication to * finish before starting new replicationRegion. - * + * * If the custom resource which handles replication has a physical resource - * ID with the format `region` instead of `tablename-region` (this would happen - * if the custom resource hasn't received an event since v1.91.0), DO NOT SET - * this property to false without making a change to the table name. + * ID with the format `region` instead of `tablename-region` (this would happen + * if the custom resource hasn't received an event since v1.91.0), DO NOT SET + * this property to false without making a change to the table name. * This will cause the existing replicas to be deleted. * * @see https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-globaltable.html#cfn-dynamodb-globaltable-replicas diff --git a/packages/aws-cdk-lib/aws-dynamodb/test/dynamodb.test.ts b/packages/aws-cdk-lib/aws-dynamodb/test/dynamodb.test.ts index f2806631c7c5f..1485b3bffbf68 100644 --- a/packages/aws-cdk-lib/aws-dynamodb/test/dynamodb.test.ts +++ b/packages/aws-cdk-lib/aws-dynamodb/test/dynamodb.test.ts @@ -1,13 +1,13 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; +import { Construct } from 'constructs'; import { Annotations, Match, Template } from '../../assertions'; import * as appscaling from '../../aws-applicationautoscaling'; import * as cloudwatch from '../../aws-cloudwatch'; import * as iam from '../../aws-iam'; import * as kinesis from '../../aws-kinesis'; import * as kms from '../../aws-kms'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { App, Aws, CfnDeletionPolicy, Duration, PhysicalName, RemovalPolicy, Resource, Stack, Tags } from '../../core'; import * as cr from '../../custom-resources'; -import { Construct } from 'constructs'; import { Attribute, AttributeType, diff --git a/packages/aws-cdk-lib/aws-dynamodb/test/replica-provider.test.ts b/packages/aws-cdk-lib/aws-dynamodb/test/replica-provider.test.ts index b841ded5824a0..1e892b60130ec 100644 --- a/packages/aws-cdk-lib/aws-dynamodb/test/replica-provider.test.ts +++ b/packages/aws-cdk-lib/aws-dynamodb/test/replica-provider.test.ts @@ -1,6 +1,6 @@ -import { OnEventRequest } from '../../custom-resources/lib/provider-framework/types'; import * as AWS from 'aws-sdk-mock'; import * as sinon from 'sinon'; +import { OnEventRequest } from '../../custom-resources/lib/provider-framework/types'; import { isCompleteHandler, onEventHandler } from '../lib/replica-handler'; let oldConsoleLog: any; diff --git a/packages/aws-cdk-lib/aws-ec2/lib/aspects/require-imdsv2-aspect.ts b/packages/aws-cdk-lib/aws-ec2/lib/aspects/require-imdsv2-aspect.ts index a938c35e56379..9f73da2fd710e 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/aspects/require-imdsv2-aspect.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/aspects/require-imdsv2-aspect.ts @@ -1,6 +1,6 @@ +import { IConstruct } from 'constructs'; import * as cdk from '../../../core'; import * as cxapi from '../../../cx-api'; -import { IConstruct } from 'constructs'; import { CfnLaunchTemplate } from '../ec2.generated'; import { Instance } from '../instance'; import { LaunchTemplate } from '../launch-template'; diff --git a/packages/aws-cdk-lib/aws-ec2/lib/bastion-host.ts b/packages/aws-cdk-lib/aws-ec2/lib/bastion-host.ts index 86d739b38ec94..b65f9762c6c4a 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/bastion-host.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/bastion-host.ts @@ -1,5 +1,3 @@ -import { IPrincipal, IRole, PolicyStatement } from '../../aws-iam'; -import { CfnOutput, Resource, Stack } from '../../core'; import { Construct } from 'constructs'; import { AmazonLinuxGeneration, InstanceArchitecture, InstanceClass, InstanceSize, InstanceType } from '.'; import { CloudFormationInit } from './cfn-init'; @@ -11,6 +9,8 @@ import { Port } from './port'; import { ISecurityGroup } from './security-group'; import { BlockDevice } from './volume'; import { IVpc, SubnetSelection } from './vpc'; +import { IPrincipal, IRole, PolicyStatement } from '../../aws-iam'; +import { CfnOutput, Resource, Stack } from '../../core'; /** * Properties of the bastion host diff --git a/packages/aws-cdk-lib/aws-ec2/lib/cfn-init-elements.ts b/packages/aws-cdk-lib/aws-ec2/lib/cfn-init-elements.ts index ac3a015909666..8fff7b7ab5706 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/cfn-init-elements.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/cfn-init-elements.ts @@ -1,9 +1,9 @@ import * as fs from 'fs'; +import { InitBindOptions, InitElementConfig, InitElementType, InitPlatform } from './private/cfn-init-internal'; import * as iam from '../../aws-iam'; import * as s3 from '../../aws-s3'; import * as s3_assets from '../../aws-s3-assets'; import { Duration } from '../../core'; -import { InitBindOptions, InitElementConfig, InitElementType, InitPlatform } from './private/cfn-init-internal'; /** * An object that represents reasons to restart an InitService diff --git a/packages/aws-cdk-lib/aws-ec2/lib/cfn-init.ts b/packages/aws-cdk-lib/aws-ec2/lib/cfn-init.ts index 6363269c8e9a1..5abcbc35fb926 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/cfn-init.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/cfn-init.ts @@ -1,11 +1,11 @@ import * as crypto from 'crypto'; -import * as iam from '../../aws-iam'; -import { Aws, CfnResource } from '../../core'; import { Construct } from 'constructs'; import { InitElement } from './cfn-init-elements'; import { OperatingSystemType } from './machine-image'; import { InitBindOptions, InitElementConfig, InitElementType, InitPlatform } from './private/cfn-init-internal'; import { UserData } from './user-data'; +import * as iam from '../../aws-iam'; +import { Aws, CfnResource } from '../../core'; /** * A CloudFormation-init configuration diff --git a/packages/aws-cdk-lib/aws-ec2/lib/client-vpn-authorization-rule.ts b/packages/aws-cdk-lib/aws-ec2/lib/client-vpn-authorization-rule.ts index 1a124bc72a8d9..1eca7b1aa9b9b 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/client-vpn-authorization-rule.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/client-vpn-authorization-rule.ts @@ -1,7 +1,7 @@ -import { Resource } from '../../core'; import { Construct } from 'constructs'; import { IClientVpnEndpoint } from './client-vpn-endpoint-types'; import { CfnClientVpnAuthorizationRule } from './ec2.generated'; +import { Resource } from '../../core'; /** * Options for a ClientVpnAuthorizationRule diff --git a/packages/aws-cdk-lib/aws-ec2/lib/client-vpn-endpoint-types.ts b/packages/aws-cdk-lib/aws-ec2/lib/client-vpn-endpoint-types.ts index 2a0a703571cfc..19577829cb489 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/client-vpn-endpoint-types.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/client-vpn-endpoint-types.ts @@ -1,6 +1,6 @@ -import { IResource } from '../../core'; import { IDependable } from 'constructs'; import { IConnectable } from './connections'; +import { IResource } from '../../core'; /** * A client VPN endpoint diff --git a/packages/aws-cdk-lib/aws-ec2/lib/client-vpn-endpoint.ts b/packages/aws-cdk-lib/aws-ec2/lib/client-vpn-endpoint.ts index f5cb8e94bc7c1..a64e3ed68b61b 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/client-vpn-endpoint.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/client-vpn-endpoint.ts @@ -1,6 +1,3 @@ -import { ISamlProvider } from '../../aws-iam'; -import * as logs from '../../aws-logs'; -import { CfnOutput, Resource, Token } from '../../core'; import { Construct, DependencyGroup, IDependable } from 'constructs'; import { ClientVpnAuthorizationRule, ClientVpnAuthorizationRuleOptions } from './client-vpn-authorization-rule'; import { IClientVpnConnectionHandler, IClientVpnEndpoint, TransportProtocol, VpnPort } from './client-vpn-endpoint-types'; @@ -10,6 +7,9 @@ import { CfnClientVpnEndpoint, CfnClientVpnTargetNetworkAssociation } from './ec import { CidrBlock } from './network-util'; import { ISecurityGroup, SecurityGroup } from './security-group'; import { IVpc, SubnetSelection } from './vpc'; +import { ISamlProvider } from '../../aws-iam'; +import * as logs from '../../aws-logs'; +import { CfnOutput, Resource, Token } from '../../core'; /** * Options for a client VPN endpoint diff --git a/packages/aws-cdk-lib/aws-ec2/lib/client-vpn-route.ts b/packages/aws-cdk-lib/aws-ec2/lib/client-vpn-route.ts index 4b79c8bbbee7c..c5d3b960720ec 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/client-vpn-route.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/client-vpn-route.ts @@ -1,8 +1,8 @@ -import { Resource } from '../../core'; import { Construct } from 'constructs'; import { IClientVpnEndpoint } from './client-vpn-endpoint-types'; import { CfnClientVpnRoute } from './ec2.generated'; import { ISubnet } from './vpc'; +import { Resource } from '../../core'; /** * Options for a ClientVpnRoute diff --git a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts index e7e3d03dfc916..e8e18c608dd0d 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts @@ -893,7 +893,7 @@ export enum InstanceClass { * Inferentia Chips based instances for machine learning inference applications, 2nd generation */ INF2 = 'inf2', - + /** * Macintosh instances built on Apple Mac mini computers, 1st generation with Intel procesors */ diff --git a/packages/aws-cdk-lib/aws-ec2/lib/instance.ts b/packages/aws-cdk-lib/aws-ec2/lib/instance.ts index 345afab15be25..e9f877cff1558 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/instance.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/instance.ts @@ -1,7 +1,4 @@ -import * as iam from '../../aws-iam'; -import { Annotations, Aspects, Duration, Fn, IResource, Lazy, Resource, Stack, Tags } from '../../core'; -import { md5hash } from '../../core/lib/helpers-internal'; import { Construct } from 'constructs'; import { InstanceRequireImdsv2Aspect } from './aspects'; import { CloudFormationInit } from './cfn-init'; @@ -14,6 +11,9 @@ import { ISecurityGroup, SecurityGroup } from './security-group'; import { UserData } from './user-data'; import { BlockDevice } from './volume'; import { IVpc, Subnet, SubnetSelection } from './vpc'; +import * as iam from '../../aws-iam'; +import { Annotations, Aspects, Duration, Fn, IResource, Lazy, Resource, Stack, Tags } from '../../core'; +import { md5hash } from '../../core/lib/helpers-internal'; /** * Name tag constant diff --git a/packages/aws-cdk-lib/aws-ec2/lib/ip-addresses.ts b/packages/aws-cdk-lib/aws-ec2/lib/ip-addresses.ts index 86a1347c0b8ae..d6b4e7cb0b93d 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/ip-addresses.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/ip-addresses.ts @@ -1,7 +1,7 @@ -import { Fn, Token } from '../../core'; import { calculateCidrSplits } from './cidr-splits'; import { NetworkBuilder } from './network-util'; import { SubnetConfiguration } from './vpc'; +import { Fn, Token } from '../../core'; /** * An abstract Provider of IpAddresses diff --git a/packages/aws-cdk-lib/aws-ec2/lib/launch-template.ts b/packages/aws-cdk-lib/aws-ec2/lib/launch-template.ts index fddedade2ee8c..24d0be46106e9 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/launch-template.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/launch-template.ts @@ -1,5 +1,14 @@ -import * as iam from '../../aws-iam'; +import { Construct } from 'constructs'; +import { Connections, IConnectable } from './connections'; +import { CfnLaunchTemplate } from './ec2.generated'; +import { InstanceType } from './instance-types'; +import { IMachineImage, MachineImageConfig, OperatingSystemType } from './machine-image'; +import { launchTemplateBlockDeviceMappings } from './private/ebs-util'; +import { ISecurityGroup } from './security-group'; +import { UserData } from './user-data'; +import { BlockDevice } from './volume'; +import * as iam from '../../aws-iam'; import { Annotations, Duration, @@ -15,15 +24,6 @@ import { FeatureFlags, } from '../../core'; import * as cxapi from '../../cx-api'; -import { Construct } from 'constructs'; -import { Connections, IConnectable } from './connections'; -import { CfnLaunchTemplate } from './ec2.generated'; -import { InstanceType } from './instance-types'; -import { IMachineImage, MachineImageConfig, OperatingSystemType } from './machine-image'; -import { launchTemplateBlockDeviceMappings } from './private/ebs-util'; -import { ISecurityGroup } from './security-group'; -import { UserData } from './user-data'; -import { BlockDevice } from './volume'; /** * Name tag constant diff --git a/packages/aws-cdk-lib/aws-ec2/lib/nat.ts b/packages/aws-cdk-lib/aws-ec2/lib/nat.ts index 6b8487c9d8b56..6914f03200e41 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/nat.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/nat.ts @@ -1,5 +1,3 @@ -import * as iam from '../../aws-iam'; -import { Fn, Token } from '../../core'; import { Connections, IConnectable } from './connections'; import { Instance } from './instance'; import { InstanceType } from './instance-types'; @@ -7,6 +5,8 @@ import { IMachineImage, LookupMachineImage } from './machine-image'; import { Port } from './port'; import { ISecurityGroup, SecurityGroup } from './security-group'; import { PrivateSubnet, PublicSubnet, RouterType, Vpc } from './vpc'; +import * as iam from '../../aws-iam'; +import { Fn, Token } from '../../core'; /** * Direction of traffic to allow all by default. diff --git a/packages/aws-cdk-lib/aws-ec2/lib/network-acl.ts b/packages/aws-cdk-lib/aws-ec2/lib/network-acl.ts index 5fa160ee58421..323c4bd1b38e8 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/network-acl.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/network-acl.ts @@ -1,8 +1,8 @@ -import { IResource, Resource } from '../../core'; import { Construct } from 'constructs'; import { CfnNetworkAcl, CfnNetworkAclEntry, CfnSubnetNetworkAclAssociation } from './ec2.generated'; import { AclCidr, AclTraffic } from './network-acl-types'; import { ISubnet, IVpc, SubnetSelection } from './vpc'; +import { IResource, Resource } from '../../core'; /** * A NetworkAcl diff --git a/packages/aws-cdk-lib/aws-ec2/lib/peer.ts b/packages/aws-cdk-lib/aws-ec2/lib/peer.ts index 875b62afc975b..b699e8d4d7a50 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/peer.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/peer.ts @@ -1,5 +1,5 @@ -import { Token } from '../../core'; import { Connections, IConnectable } from './connections'; +import { Token } from '../../core'; /** * Interface for classes that provide the peer-specification parts of a security group rule diff --git a/packages/aws-cdk-lib/aws-ec2/lib/placement-group.ts b/packages/aws-cdk-lib/aws-ec2/lib/placement-group.ts index 2dc8c9c0bd312..f8a42cb056d0a 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/placement-group.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/placement-group.ts @@ -1,6 +1,6 @@ -import { IResource, Resource } from '../../core'; import { Construct } from 'constructs'; import { CfnPlacementGroup } from './ec2.generated'; +import { IResource, Resource } from '../../core'; /** * Determines where your instances are placed on the underlying hardware according to the specified PlacementGroupStrategy diff --git a/packages/aws-cdk-lib/aws-ec2/lib/prefix-list.ts b/packages/aws-cdk-lib/aws-ec2/lib/prefix-list.ts index 147a6143865f0..1f0ae1efbd77a 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/prefix-list.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/prefix-list.ts @@ -1,6 +1,6 @@ -import { IResource, Lazy, Resource, Names } from '../../core'; import { Construct } from 'constructs'; import { CfnPrefixList } from './ec2.generated'; +import { IResource, Lazy, Resource, Names } from '../../core'; /** * A prefix list diff --git a/packages/aws-cdk-lib/aws-ec2/lib/private/cfn-init-internal.ts b/packages/aws-cdk-lib/aws-ec2/lib/private/cfn-init-internal.ts index 1d8c4e245a971..af1787291614a 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/private/cfn-init-internal.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/private/cfn-init-internal.ts @@ -1,5 +1,5 @@ -import * as iam from '../../../aws-iam'; import { Construct } from 'constructs'; +import * as iam from '../../../aws-iam'; /** * The type of the init element. diff --git a/packages/aws-cdk-lib/aws-ec2/lib/private/ebs-util.ts b/packages/aws-cdk-lib/aws-ec2/lib/private/ebs-util.ts index d3ccff05f38a4..a443f2bf99191 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/private/ebs-util.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/private/ebs-util.ts @@ -1,5 +1,5 @@ -import { Annotations } from '../../../core'; import { Construct } from 'constructs'; +import { Annotations } from '../../../core'; import { CfnInstance, CfnLaunchTemplate } from '../ec2.generated'; import { BlockDevice, EbsDeviceVolumeType } from '../volume'; diff --git a/packages/aws-cdk-lib/aws-ec2/lib/security-group.ts b/packages/aws-cdk-lib/aws-ec2/lib/security-group.ts index 5e745e535a6ba..ea610637c1c2c 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/security-group.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/security-group.ts @@ -1,12 +1,12 @@ -import * as cxschema from '../../cloud-assembly-schema'; -import { Annotations, ContextProvider, IResource, Lazy, Names, Resource, ResourceProps, Stack, Token } from '../../core'; -import * as cxapi from '../../cx-api'; import { Construct } from 'constructs'; import { Connections } from './connections'; import { CfnSecurityGroup, CfnSecurityGroupEgress, CfnSecurityGroupIngress } from './ec2.generated'; import { IPeer, Peer } from './peer'; import { Port } from './port'; import { IVpc } from './vpc'; +import * as cxschema from '../../cloud-assembly-schema'; +import { Annotations, ContextProvider, IResource, Lazy, Names, Resource, ResourceProps, Stack, Token } from '../../core'; +import * as cxapi from '../../cx-api'; const SECURITY_GROUP_SYMBOL = Symbol.for('@aws-cdk/iam.SecurityGroup'); diff --git a/packages/aws-cdk-lib/aws-ec2/lib/subnet.ts b/packages/aws-cdk-lib/aws-ec2/lib/subnet.ts index 73814b36d6127..b9b2dc2be631f 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/subnet.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/subnet.ts @@ -1,6 +1,6 @@ -import { Token } from '../../core'; import { CidrBlock, NetworkUtils } from './network-util'; import { ISubnet } from './vpc'; +import { Token } from '../../core'; /** * Contains logic which chooses a set of subnets from a larger list, in conjunction * with SubnetSelection, to determine where to place AWS resources such as VPC diff --git a/packages/aws-cdk-lib/aws-ec2/lib/user-data.ts b/packages/aws-cdk-lib/aws-ec2/lib/user-data.ts index 84f0527d854ce..e29065ca03d8d 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/user-data.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/user-data.ts @@ -1,6 +1,6 @@ +import { OperatingSystemType } from './machine-image'; import { IBucket } from '../../aws-s3'; import { Fn, Resource, Stack, CfnResource } from '../../core'; -import { OperatingSystemType } from './machine-image'; /** * Options when constructing UserData for Linux diff --git a/packages/aws-cdk-lib/aws-ec2/lib/volume.ts b/packages/aws-cdk-lib/aws-ec2/lib/volume.ts index a49c104e9734a..2c29b6e6dbbd9 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/volume.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/volume.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; +import { CfnVolume } from './ec2.generated'; +import { IInstance } from './instance'; import { AccountRootPrincipal, Grant, IGrantable } from '../../aws-iam'; import { IKey, ViaServicePrincipal } from '../../aws-kms'; import { IResource, Resource, Size, SizeRoundingBehavior, Stack, Token, Tags, Names, RemovalPolicy } from '../../core'; import { md5hash } from '../../core/lib/helpers-internal'; -import { Construct } from 'constructs'; -import { CfnVolume } from './ec2.generated'; -import { IInstance } from './instance'; /** * Block device diff --git a/packages/aws-cdk-lib/aws-ec2/lib/vpc-endpoint-service.ts b/packages/aws-cdk-lib/aws-ec2/lib/vpc-endpoint-service.ts index a0e5d9ae59eef..b388de8fd3259 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/vpc-endpoint-service.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/vpc-endpoint-service.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; +import { CfnVPCEndpointService, CfnVPCEndpointServicePermissions } from './ec2.generated'; import { ArnPrincipal } from '../../aws-iam'; import { Aws, Fn, IResource, Resource, Stack, Token } from '../../core'; import { Default, RegionInfo } from '../../region-info'; -import { Construct } from 'constructs'; -import { CfnVPCEndpointService, CfnVPCEndpointServicePermissions } from './ec2.generated'; /** * A load balancer that can host a VPC Endpoint Service diff --git a/packages/aws-cdk-lib/aws-ec2/lib/vpc-endpoint.ts b/packages/aws-cdk-lib/aws-ec2/lib/vpc-endpoint.ts index 3a094ad69076b..c3a8c2d506d00 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/vpc-endpoint.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/vpc-endpoint.ts @@ -1,6 +1,3 @@ -import * as iam from '../../aws-iam'; -import * as cxschema from '../../cloud-assembly-schema'; -import { Aws, ContextProvider, IResource, Lazy, Resource, Stack, Token } from '../../core'; import { Construct } from 'constructs'; import { Connections, IConnectable } from './connections'; import { CfnVPCEndpoint } from './ec2.generated'; @@ -9,6 +6,9 @@ import { Port } from './port'; import { ISecurityGroup, SecurityGroup } from './security-group'; import { allRouteTableIds, flatten } from './util'; import { ISubnet, IVpc, SubnetSelection } from './vpc'; +import * as iam from '../../aws-iam'; +import * as cxschema from '../../cloud-assembly-schema'; +import { Aws, ContextProvider, IResource, Lazy, Resource, Stack, Token } from '../../core'; /** * A VPC endpoint. diff --git a/packages/aws-cdk-lib/aws-ec2/lib/vpc-flow-logs.ts b/packages/aws-cdk-lib/aws-ec2/lib/vpc-flow-logs.ts index 1ee2302550d7b..0f08bd85f59fc 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/vpc-flow-logs.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/vpc-flow-logs.ts @@ -1,11 +1,11 @@ +import { Construct } from 'constructs'; +import { CfnFlowLog } from './ec2.generated'; +import { ISubnet, IVpc } from './vpc'; import * as iam from '../../aws-iam'; import * as logs from '../../aws-logs'; import * as s3 from '../../aws-s3'; import { IResource, PhysicalName, RemovalPolicy, Resource, FeatureFlags, Stack, CfnResource } from '../../core'; import { S3_CREATE_DEFAULT_LOGGING_POLICY } from '../../cx-api'; -import { Construct } from 'constructs'; -import { CfnFlowLog } from './ec2.generated'; -import { ISubnet, IVpc } from './vpc'; /** * A FlowLog diff --git a/packages/aws-cdk-lib/aws-ec2/lib/vpn.ts b/packages/aws-cdk-lib/aws-ec2/lib/vpn.ts index cfaa5b5aea9a8..2c690d1d3e13e 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/vpn.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/vpn.ts @@ -1,6 +1,4 @@ import * as net from 'net'; -import * as cloudwatch from '../../aws-cloudwatch'; -import { IResource, Resource, SecretValue, Token } from '../../core'; import { Construct } from 'constructs'; import { CfnCustomerGateway, @@ -9,6 +7,8 @@ import { CfnVPNGateway, } from './ec2.generated'; import { IVpc, SubnetSelection } from './vpc'; +import * as cloudwatch from '../../aws-cloudwatch'; +import { IResource, Resource, SecretValue, Token } from '../../core'; export interface IVpnConnection extends IResource { /** diff --git a/packages/aws-cdk-lib/aws-ec2/test/aspects/require-imdsv2-aspect.test.ts b/packages/aws-cdk-lib/aws-ec2/test/aspects/require-imdsv2-aspect.test.ts index 7bf08f8ec7dc7..116b7463ddf19 100644 --- a/packages/aws-cdk-lib/aws-ec2/test/aspects/require-imdsv2-aspect.test.ts +++ b/packages/aws-cdk-lib/aws-ec2/test/aspects/require-imdsv2-aspect.test.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import { Annotations, Template, Match } from '../../../assertions'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; import { CfnLaunchTemplate, Instance, diff --git a/packages/aws-cdk-lib/aws-ec2/test/cfn-init.test.ts b/packages/aws-cdk-lib/aws-ec2/test/cfn-init.test.ts index 42638c6577390..a5658931a2eb5 100644 --- a/packages/aws-cdk-lib/aws-ec2/test/cfn-init.test.ts +++ b/packages/aws-cdk-lib/aws-ec2/test/cfn-init.test.ts @@ -1,13 +1,13 @@ import * as fs from 'fs'; import * as os from 'os'; import * as path from 'path'; +import { stringLike } from './util'; import { Match, Template } from '../../assertions'; import * as iam from '../../aws-iam'; import * as s3 from '../../aws-s3'; import { Asset } from '../../aws-s3-assets'; import { AssetStaging, App, Aws, CfnResource, Stack, DefaultStackSynthesizer, IStackSynthesizer, FileAssetSource, FileAssetLocation } from '../../core'; import * as cxapi from '../../cx-api'; -import { stringLike } from './util'; import * as ec2 from '../lib'; let app: App; diff --git a/packages/aws-cdk-lib/aws-ec2/test/client-vpn-authorization-rule.test.ts b/packages/aws-cdk-lib/aws-ec2/test/client-vpn-authorization-rule.test.ts index 3246333cb7060..8ff999a1829e2 100644 --- a/packages/aws-cdk-lib/aws-ec2/test/client-vpn-authorization-rule.test.ts +++ b/packages/aws-cdk-lib/aws-ec2/test/client-vpn-authorization-rule.test.ts @@ -1,5 +1,5 @@ -import { Template } from '../../assertions'; import { testDeprecated } from '@aws-cdk/cdk-build-tools'; +import { Template } from '../../assertions'; import { App, Stack } from '../../core'; import { Connections, IClientVpnEndpoint } from '../lib'; import { ClientVpnAuthorizationRule } from '../lib/client-vpn-authorization-rule'; diff --git a/packages/aws-cdk-lib/aws-ec2/test/client-vpn-route.test.ts b/packages/aws-cdk-lib/aws-ec2/test/client-vpn-route.test.ts index 80bfd7fbe583f..4c15824af3d8f 100644 --- a/packages/aws-cdk-lib/aws-ec2/test/client-vpn-route.test.ts +++ b/packages/aws-cdk-lib/aws-ec2/test/client-vpn-route.test.ts @@ -1,6 +1,6 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from '../../assertions'; import { SamlMetadataDocument, SamlProvider } from '../../aws-iam'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { App, Stack } from '../../core'; import * as ec2 from '../lib'; import { diff --git a/packages/aws-cdk-lib/aws-ec2/test/integ.share-vpcs.lit.ts b/packages/aws-cdk-lib/aws-ec2/test/integ.share-vpcs.lit.ts index 61ed323fdc3f5..cf545555dd281 100644 --- a/packages/aws-cdk-lib/aws-ec2/test/integ.share-vpcs.lit.ts +++ b/packages/aws-cdk-lib/aws-ec2/test/integ.share-vpcs.lit.ts @@ -1,6 +1,6 @@ /// !cdk-integ * -import * as cdk from '../../core'; import { Construct } from 'constructs'; +import * as cdk from '../../core'; import * as ec2 from '../lib'; const app = new cdk.App(); diff --git a/packages/aws-cdk-lib/aws-ec2/test/launch-template.test.ts b/packages/aws-cdk-lib/aws-ec2/test/launch-template.test.ts index a46580072fd2a..1cea1fdf597f9 100644 --- a/packages/aws-cdk-lib/aws-ec2/test/launch-template.test.ts +++ b/packages/aws-cdk-lib/aws-ec2/test/launch-template.test.ts @@ -1,3 +1,4 @@ +import { stringLike } from './util'; import { Annotations, Template, Match } from '../../assertions'; import { CfnInstanceProfile, @@ -13,7 +14,6 @@ import { Tags, } from '../../core'; import * as cxapi from '../../cx-api'; -import { stringLike } from './util'; import { AmazonLinuxImage, BlockDevice, diff --git a/packages/aws-cdk-lib/aws-ec2/test/security-group.test.ts b/packages/aws-cdk-lib/aws-ec2/test/security-group.test.ts index e77baa0e60fe7..2248e818f35a0 100644 --- a/packages/aws-cdk-lib/aws-ec2/test/security-group.test.ts +++ b/packages/aws-cdk-lib/aws-ec2/test/security-group.test.ts @@ -1,5 +1,5 @@ -import { Template } from '../../assertions'; import { testDeprecated } from '@aws-cdk/cdk-build-tools'; +import { Template } from '../../assertions'; import { App, Intrinsic, Lazy, Stack, Token } from '../../core'; import { Peer, Port, SecurityGroup, SecurityGroupProps, Vpc } from '../lib'; diff --git a/packages/aws-cdk-lib/aws-ec2/test/vpc.from-lookup.test.ts b/packages/aws-cdk-lib/aws-ec2/test/vpc.from-lookup.test.ts index 27f5985a0f479..148a63ed6692b 100644 --- a/packages/aws-cdk-lib/aws-ec2/test/vpc.from-lookup.test.ts +++ b/packages/aws-cdk-lib/aws-ec2/test/vpc.from-lookup.test.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as cxschema from '../../cloud-assembly-schema'; import { ContextProvider, GetContextValueOptions, GetContextValueResult, Lazy, Stack } from '../../core'; import * as cxapi from '../../cx-api'; -import { Construct } from 'constructs'; import { GenericLinuxImage, Instance, InstanceType, SubnetType, Vpc } from '../lib'; describe('vpc from lookup', () => { diff --git a/packages/aws-cdk-lib/aws-ec2/test/vpn.test.ts b/packages/aws-cdk-lib/aws-ec2/test/vpn.test.ts index b4b63efedef4a..2d0c188169db3 100644 --- a/packages/aws-cdk-lib/aws-ec2/test/vpn.test.ts +++ b/packages/aws-cdk-lib/aws-ec2/test/vpn.test.ts @@ -1,5 +1,5 @@ -import { Template } from '../../assertions'; import { testDeprecated } from '@aws-cdk/cdk-build-tools'; +import { Template } from '../../assertions'; import { Duration, SecretValue, Stack, Token } from '../../core'; import { PublicSubnet, Vpc, VpnConnection } from '../lib'; diff --git a/packages/aws-cdk-lib/aws-ecr-assets/lib/image-asset.ts b/packages/aws-cdk-lib/aws-ecr-assets/lib/image-asset.ts index dbb5e8887b7af..3ca82c7194cb8 100644 --- a/packages/aws-cdk-lib/aws-ecr-assets/lib/image-asset.ts +++ b/packages/aws-cdk-lib/aws-ecr-assets/lib/image-asset.ts @@ -1,10 +1,10 @@ import * as fs from 'fs'; import * as path from 'path'; +import { Construct } from 'constructs'; import { FingerprintOptions, FollowMode, IAsset } from '../../assets'; import * as ecr from '../../aws-ecr'; import { Annotations, AssetStaging, FeatureFlags, FileFingerprintOptions, IgnoreMode, Stack, SymlinkFollowMode, Token, Stage, CfnResource } from '../../core'; import * as cxapi from '../../cx-api'; -import { Construct } from 'constructs'; /** * networking mode on build time supported by docker diff --git a/packages/aws-cdk-lib/aws-ecr-assets/lib/tarball-asset.ts b/packages/aws-cdk-lib/aws-ecr-assets/lib/tarball-asset.ts index b73d331bda7c8..3265b43719529 100644 --- a/packages/aws-cdk-lib/aws-ecr-assets/lib/tarball-asset.ts +++ b/packages/aws-cdk-lib/aws-ecr-assets/lib/tarball-asset.ts @@ -1,9 +1,9 @@ import * as fs from 'fs'; import * as path from 'path'; +import { Construct } from 'constructs'; import { IAsset } from '../../assets'; import * as ecr from '../../aws-ecr'; import { AssetStaging, Stack, Stage } from '../../core'; -import { Construct } from 'constructs'; /** * Options for TarballImageAsset diff --git a/packages/aws-cdk-lib/aws-ecr/lib/repository.ts b/packages/aws-cdk-lib/aws-ecr/lib/repository.ts index 2be5e491f2ac6..f1776bc0e747b 100644 --- a/packages/aws-cdk-lib/aws-ecr/lib/repository.ts +++ b/packages/aws-cdk-lib/aws-ecr/lib/repository.ts @@ -1,5 +1,8 @@ import { EOL } from 'os'; import * as path from 'path'; +import { IConstruct, Construct } from 'constructs'; +import { CfnRepository } from './ecr.generated'; +import { LifecycleRule, TagStatus } from './lifecycle'; import * as events from '../../aws-events'; import * as iam from '../../aws-iam'; import * as kms from '../../aws-kms'; @@ -18,9 +21,6 @@ import { CustomResourceProvider, builtInCustomResourceProviderNodeRuntime, } from '../../core'; -import { IConstruct, Construct } from 'constructs'; -import { CfnRepository } from './ecr.generated'; -import { LifecycleRule, TagStatus } from './lifecycle'; const AUTO_DELETE_IMAGES_RESOURCE_TYPE = 'Custom::ECRAutoDeleteImages'; const AUTO_DELETE_IMAGES_TAG = 'aws-cdk:auto-delete-images'; diff --git a/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/application-load-balanced-service-base.ts b/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/application-load-balanced-service-base.ts index 514639acd71ee..7e18f4768b61c 100644 --- a/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/application-load-balanced-service-base.ts +++ b/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/application-load-balanced-service-base.ts @@ -1,3 +1,4 @@ +import { Construct } from 'constructs'; import { Certificate, CertificateValidation, ICertificate } from '../../../aws-certificatemanager'; import { IVpc } from '../../../aws-ec2'; import { @@ -13,7 +14,6 @@ import { ARecord, IHostedZone, RecordTarget, CnameRecord } from '../../../aws-ro import { LoadBalancerTarget } from '../../../aws-route53-targets'; import * as cdk from '../../../core'; import { Duration } from '../../../core'; -import { Construct } from 'constructs'; /** * Describes the type of DNS record the service should create diff --git a/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/application-multiple-target-groups-service-base.ts b/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/application-multiple-target-groups-service-base.ts index 4e11fad6db585..7bdeeaa6fcd9a 100644 --- a/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/application-multiple-target-groups-service-base.ts +++ b/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/application-multiple-target-groups-service-base.ts @@ -1,3 +1,4 @@ +import { Construct } from 'constructs'; import { Certificate, CertificateValidation, ICertificate } from '../../../aws-certificatemanager'; import { IVpc } from '../../../aws-ec2'; import { @@ -16,7 +17,6 @@ import { IRole } from '../../../aws-iam'; import { ARecord, IHostedZone, RecordTarget } from '../../../aws-route53'; import { LoadBalancerTarget } from '../../../aws-route53-targets'; import { CfnOutput, Duration, Stack } from '../../../core'; -import { Construct } from 'constructs'; /** * The properties for the base ApplicationMultipleTargetGroupsEc2Service or ApplicationMultipleTargetGroupsFargateService service. diff --git a/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/network-load-balanced-service-base.ts b/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/network-load-balanced-service-base.ts index 61911ae406578..2efac59c20ae6 100644 --- a/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/network-load-balanced-service-base.ts +++ b/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/network-load-balanced-service-base.ts @@ -1,3 +1,4 @@ +import { Construct } from 'constructs'; import { IVpc } from '../../../aws-ec2'; import { AwsLogDriver, BaseService, CloudMapOptions, Cluster, ContainerImage, DeploymentController, DeploymentCircuitBreaker, @@ -8,7 +9,6 @@ import { IRole } from '../../../aws-iam'; import { ARecord, CnameRecord, IHostedZone, RecordTarget } from '../../../aws-route53'; import { LoadBalancerTarget } from '../../../aws-route53-targets'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; /** * Describes the type of DNS record the service should create diff --git a/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/network-multiple-target-groups-service-base.ts b/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/network-multiple-target-groups-service-base.ts index 33427c75c3758..5eeaa3ba9bf82 100644 --- a/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/network-multiple-target-groups-service-base.ts +++ b/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/network-multiple-target-groups-service-base.ts @@ -1,3 +1,4 @@ +import { Construct } from 'constructs'; import { IVpc } from '../../../aws-ec2'; import { AwsLogDriver, BaseService, CloudMapOptions, Cluster, ContainerDefinition, ContainerImage, ICluster, LogDriver, @@ -8,7 +9,6 @@ import { IRole } from '../../../aws-iam'; import { ARecord, IHostedZone, RecordTarget } from '../../../aws-route53'; import { LoadBalancerTarget } from '../../../aws-route53-targets'; import { CfnOutput, Duration, Stack } from '../../../core'; -import { Construct } from 'constructs'; /** * The properties for the base NetworkMultipleTargetGroupsEc2Service or NetworkMultipleTargetGroupsFargateService service. diff --git a/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/queue-processing-service-base.ts b/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/queue-processing-service-base.ts index 0dbce5b6b96e0..385caafdc0ca2 100644 --- a/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/queue-processing-service-base.ts +++ b/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/queue-processing-service-base.ts @@ -1,3 +1,4 @@ +import { Construct } from 'constructs'; import { ScalingInterval } from '../../../aws-applicationautoscaling'; import { IVpc } from '../../../aws-ec2'; import { @@ -7,7 +8,6 @@ import { import { IQueue, Queue } from '../../../aws-sqs'; import { CfnOutput, Duration, FeatureFlags, Stack } from '../../../core'; import * as cxapi from '../../../cx-api'; -import { Construct } from 'constructs'; /** * The properties for the base QueueProcessingEc2Service or QueueProcessingFargateService service. diff --git a/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/scheduled-task-base.ts b/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/scheduled-task-base.ts index 3f1faf6a4f148..01f4c5933fe05 100644 --- a/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/scheduled-task-base.ts +++ b/packages/aws-cdk-lib/aws-ecs-patterns/lib/base/scheduled-task-base.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; import { Schedule } from '../../../aws-applicationautoscaling'; import { ISecurityGroup, IVpc, SubnetSelection, SubnetType } from '../../../aws-ec2'; import { AwsLogDriver, Cluster, ContainerImage, ICluster, LogDriver, PropagatedTagSource, Secret, TaskDefinition } from '../../../aws-ecs'; import { Rule } from '../../../aws-events'; import { EcsTask, Tag } from '../../../aws-events-targets'; import { Stack } from '../../../core'; -import { Construct } from 'constructs'; /** * The properties for the base ScheduledEc2Task or ScheduledFargateTask task. diff --git a/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/application-load-balanced-ecs-service.ts b/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/application-load-balanced-ecs-service.ts index df3dc32bac74e..292d31bed3f5d 100644 --- a/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/application-load-balanced-ecs-service.ts +++ b/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/application-load-balanced-ecs-service.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import { Ec2Service, Ec2TaskDefinition, PlacementConstraint, PlacementStrategy } from '../../../aws-ecs'; import { FeatureFlags } from '../../../core'; import * as cxapi from '../../../cx-api'; -import { Construct } from 'constructs'; import { ApplicationLoadBalancedServiceBase, ApplicationLoadBalancedServiceBaseProps } from '../base/application-load-balanced-service-base'; /** diff --git a/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/application-multiple-target-groups-ecs-service.ts b/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/application-multiple-target-groups-ecs-service.ts index c69386bd2e719..77064f85a62e1 100644 --- a/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/application-multiple-target-groups-ecs-service.ts +++ b/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/application-multiple-target-groups-ecs-service.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import { Ec2Service, Ec2TaskDefinition, PlacementConstraint, PlacementStrategy } from '../../../aws-ecs'; import { ApplicationTargetGroup } from '../../../aws-elasticloadbalancingv2'; import { FeatureFlags } from '../../../core'; import * as cxapi from '../../../cx-api'; -import { Construct } from 'constructs'; import { ApplicationMultipleTargetGroupsServiceBase, ApplicationMultipleTargetGroupsServiceBaseProps, diff --git a/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/network-load-balanced-ecs-service.ts b/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/network-load-balanced-ecs-service.ts index e525ee02cf65e..65c8970912b14 100644 --- a/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/network-load-balanced-ecs-service.ts +++ b/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/network-load-balanced-ecs-service.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import { Ec2Service, Ec2TaskDefinition, PlacementConstraint, PlacementStrategy } from '../../../aws-ecs'; import { FeatureFlags } from '../../../core'; import * as cxapi from '../../../cx-api'; -import { Construct } from 'constructs'; import { NetworkLoadBalancedServiceBase, NetworkLoadBalancedServiceBaseProps } from '../base/network-load-balanced-service-base'; /** diff --git a/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/network-multiple-target-groups-ecs-service.ts b/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/network-multiple-target-groups-ecs-service.ts index fa176f8930962..d68ac374b7c76 100644 --- a/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/network-multiple-target-groups-ecs-service.ts +++ b/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/network-multiple-target-groups-ecs-service.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import { Ec2Service, Ec2TaskDefinition, PlacementConstraint, PlacementStrategy } from '../../../aws-ecs'; import { NetworkTargetGroup } from '../../../aws-elasticloadbalancingv2'; import { FeatureFlags } from '../../../core'; import * as cxapi from '../../../cx-api'; -import { Construct } from 'constructs'; import { NetworkMultipleTargetGroupsServiceBase, NetworkMultipleTargetGroupsServiceBaseProps, diff --git a/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/queue-processing-ecs-service.ts b/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/queue-processing-ecs-service.ts index 95b3f8edefeae..fa53d91f0898d 100644 --- a/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/queue-processing-ecs-service.ts +++ b/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/queue-processing-ecs-service.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import { Ec2Service, Ec2TaskDefinition, PlacementConstraint, PlacementStrategy } from '../../../aws-ecs'; import { FeatureFlags } from '../../../core'; import * as cxapi from '../../../cx-api'; -import { Construct } from 'constructs'; import { QueueProcessingServiceBase, QueueProcessingServiceBaseProps } from '../base/queue-processing-service-base'; /** diff --git a/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/scheduled-ecs-task.ts b/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/scheduled-ecs-task.ts index 1bc0ffe350239..bac551a7499de 100644 --- a/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/scheduled-ecs-task.ts +++ b/packages/aws-cdk-lib/aws-ecs-patterns/lib/ecs/scheduled-ecs-task.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import { Ec2TaskDefinition } from '../../../aws-ecs'; import { EcsTask } from '../../../aws-events-targets'; -import { Construct } from 'constructs'; import { ScheduledTaskBase, ScheduledTaskBaseProps, ScheduledTaskImageProps } from '../base/scheduled-task-base'; /** diff --git a/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/application-load-balanced-fargate-service.ts b/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/application-load-balanced-fargate-service.ts index 236a763bcd3f8..39131198893dd 100644 --- a/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/application-load-balanced-fargate-service.ts +++ b/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/application-load-balanced-fargate-service.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import { ISecurityGroup, SubnetSelection } from '../../../aws-ec2'; import { FargateService, FargateTaskDefinition } from '../../../aws-ecs'; import { FeatureFlags } from '../../../core'; import * as cxapi from '../../../cx-api'; -import { Construct } from 'constructs'; import { ApplicationLoadBalancedServiceBase, ApplicationLoadBalancedServiceBaseProps } from '../base/application-load-balanced-service-base'; import { FargateServiceBaseProps } from '../base/fargate-service-base'; /** diff --git a/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/application-multiple-target-groups-fargate-service.ts b/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/application-multiple-target-groups-fargate-service.ts index 69a5b65309a40..df9ed2cfd79e3 100644 --- a/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/application-multiple-target-groups-fargate-service.ts +++ b/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/application-multiple-target-groups-fargate-service.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import { FargateService, FargateTaskDefinition } from '../../../aws-ecs'; import { ApplicationTargetGroup } from '../../../aws-elasticloadbalancingv2'; import { FeatureFlags } from '../../../core'; import * as cxapi from '../../../cx-api'; -import { Construct } from 'constructs'; import { ApplicationMultipleTargetGroupsServiceBase, ApplicationMultipleTargetGroupsServiceBaseProps, diff --git a/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/network-load-balanced-fargate-service.ts b/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/network-load-balanced-fargate-service.ts index 1ec8f38e16547..a7c2c01f6d9f7 100644 --- a/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/network-load-balanced-fargate-service.ts +++ b/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/network-load-balanced-fargate-service.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import { SubnetSelection } from '../../../aws-ec2'; import { FargateService, FargateTaskDefinition } from '../../../aws-ecs'; import { FeatureFlags } from '../../../core'; import * as cxapi from '../../../cx-api'; -import { Construct } from 'constructs'; import { FargateServiceBaseProps } from '../base/fargate-service-base'; import { NetworkLoadBalancedServiceBase, NetworkLoadBalancedServiceBaseProps } from '../base/network-load-balanced-service-base'; diff --git a/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/network-multiple-target-groups-fargate-service.ts b/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/network-multiple-target-groups-fargate-service.ts index 2ee925d585b7c..2786c30ae4682 100644 --- a/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/network-multiple-target-groups-fargate-service.ts +++ b/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/network-multiple-target-groups-fargate-service.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import { FargateService, FargateTaskDefinition } from '../../../aws-ecs'; import { NetworkTargetGroup } from '../../../aws-elasticloadbalancingv2'; import { FeatureFlags } from '../../../core'; import * as cxapi from '../../../cx-api'; -import { Construct } from 'constructs'; import { FargateServiceBaseProps } from '../base/fargate-service-base'; import { NetworkMultipleTargetGroupsServiceBase, diff --git a/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/queue-processing-fargate-service.ts b/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/queue-processing-fargate-service.ts index 8c48023c4bc1c..5d3ba07353b7c 100644 --- a/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/queue-processing-fargate-service.ts +++ b/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/queue-processing-fargate-service.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import * as ec2 from '../../../aws-ec2'; import { FargateService, FargateTaskDefinition, HealthCheck } from '../../../aws-ecs'; import { FeatureFlags } from '../../../core'; import * as cxapi from '../../../cx-api'; -import { Construct } from 'constructs'; import { FargateServiceBaseProps } from '../base/fargate-service-base'; import { QueueProcessingServiceBase, QueueProcessingServiceBaseProps } from '../base/queue-processing-service-base'; diff --git a/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/scheduled-fargate-task.ts b/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/scheduled-fargate-task.ts index f73724026bad9..46b96a7bb1d4e 100644 --- a/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/scheduled-fargate-task.ts +++ b/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/scheduled-fargate-task.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import { FargateTaskDefinition } from '../../../aws-ecs'; import { EcsTask } from '../../../aws-events-targets'; -import { Construct } from 'constructs'; import { FargateServiceBaseProps } from '../base/fargate-service-base'; import { ScheduledTaskBase, ScheduledTaskBaseProps, ScheduledTaskImageProps } from '../base/scheduled-task-base'; diff --git a/packages/aws-cdk-lib/aws-ecs-patterns/test/ec2/queue-processing-ecs-service.test.ts b/packages/aws-cdk-lib/aws-ecs-patterns/test/ec2/queue-processing-ecs-service.test.ts index c89fe64261a58..b0f79d178a404 100644 --- a/packages/aws-cdk-lib/aws-ecs-patterns/test/ec2/queue-processing-ecs-service.test.ts +++ b/packages/aws-cdk-lib/aws-ecs-patterns/test/ec2/queue-processing-ecs-service.test.ts @@ -1,3 +1,4 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Match, Template } from '../../../assertions'; import { AutoScalingGroup } from '../../../aws-autoscaling'; import * as autoscaling from '../../../aws-autoscaling'; @@ -7,7 +8,6 @@ import { AsgCapacityProvider } from '../../../aws-ecs'; import * as ecs from '../../../aws-ecs'; import * as sqs from '../../../aws-sqs'; import { Queue } from '../../../aws-sqs'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../../core'; import * as ecsPatterns from '../../lib'; diff --git a/packages/aws-cdk-lib/aws-ecs-patterns/test/fargate/queue-processing-fargate-service.test.ts b/packages/aws-cdk-lib/aws-ecs-patterns/test/fargate/queue-processing-fargate-service.test.ts index 5cce579170906..05a4755e5bbdc 100644 --- a/packages/aws-cdk-lib/aws-ecs-patterns/test/fargate/queue-processing-fargate-service.test.ts +++ b/packages/aws-cdk-lib/aws-ecs-patterns/test/fargate/queue-processing-fargate-service.test.ts @@ -1,3 +1,4 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Match, Template } from '../../../assertions'; import { AutoScalingGroup } from '../../../aws-autoscaling'; import * as ec2 from '../../../aws-ec2'; @@ -6,7 +7,6 @@ import * as ecs from '../../../aws-ecs'; import { AsgCapacityProvider } from '../../../aws-ecs'; import * as sqs from '../../../aws-sqs'; import { Queue } from '../../../aws-sqs'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../../core'; import * as ecsPatterns from '../../lib'; diff --git a/packages/aws-cdk-lib/aws-ecs/lib/base/_imported-task-definition.ts b/packages/aws-cdk-lib/aws-ecs/lib/base/_imported-task-definition.ts index a4a02ba424ea2..03ad4e47ce7bb 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/base/_imported-task-definition.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/base/_imported-task-definition.ts @@ -1,7 +1,7 @@ -import { IRole } from '../../../aws-iam'; -import { Resource } from '../../../core'; import { Construct } from 'constructs'; import { Compatibility, NetworkMode, isEc2Compatible, isFargateCompatible, isExternalCompatible } from './task-definition'; +import { IRole } from '../../../aws-iam'; +import { Resource } from '../../../core'; import { IEc2TaskDefinition } from '../ec2/ec2-task-definition'; import { IFargateTaskDefinition } from '../fargate/fargate-task-definition'; diff --git a/packages/aws-cdk-lib/aws-ecs/lib/base/base-service.ts b/packages/aws-cdk-lib/aws-ecs/lib/base/base-service.ts index 3d5642e4cda65..fba485aaaf09b 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/base/base-service.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/base/base-service.ts @@ -1,3 +1,5 @@ +import { Construct } from 'constructs'; +import { ScalableTaskCount } from './scalable-task-count'; import * as appscaling from '../../../aws-applicationautoscaling'; import * as cloudwatch from '../../../aws-cloudwatch'; import * as ec2 from '../../../aws-ec2'; @@ -18,8 +20,6 @@ import { } from '../../../core'; import * as cxapi from '../../../cx-api'; -import { Construct } from 'constructs'; -import { ScalableTaskCount } from './scalable-task-count'; import { LoadBalancerTargetOptions, NetworkMode, TaskDefinition } from '../base/task-definition'; import { ICluster, CapacityProviderStrategy, ExecuteCommandLogging, Cluster } from '../cluster'; import { ContainerDefinition, Protocol } from '../container-definition'; diff --git a/packages/aws-cdk-lib/aws-ecs/lib/base/from-service-attributes.ts b/packages/aws-cdk-lib/aws-ecs/lib/base/from-service-attributes.ts index 7dc1ebbc60dc8..4d23add32e483 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/base/from-service-attributes.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/base/from-service-attributes.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import { ArnFormat, FeatureFlags, Fn, Resource, Stack, Token } from '../../../core'; import { ECS_ARN_FORMAT_INCLUDES_CLUSTER_NAME } from '../../../cx-api'; -import { Construct } from 'constructs'; import { IBaseService } from '../base/base-service'; import { ICluster } from '../cluster'; diff --git a/packages/aws-cdk-lib/aws-ecs/lib/base/scalable-task-count.ts b/packages/aws-cdk-lib/aws-ecs/lib/base/scalable-task-count.ts index 4ebeb178dc292..f1ccac8362183 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/base/scalable-task-count.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/base/scalable-task-count.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as appscaling from '../../../aws-applicationautoscaling'; import * as cloudwatch from '../../../aws-cloudwatch'; import * as elbv2 from '../../../aws-elasticloadbalancingv2'; -import { Construct } from 'constructs'; /** * The properties of a scalable attribute representing task count. diff --git a/packages/aws-cdk-lib/aws-ecs/lib/base/task-definition.ts b/packages/aws-cdk-lib/aws-ecs/lib/base/task-definition.ts index e56de0dac93da..3e595c907dd63 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/base/task-definition.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/base/task-definition.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; +import { ImportedTaskDefinition } from './_imported-task-definition'; import * as ec2 from '../../../aws-ec2'; import * as iam from '../../../aws-iam'; import { IResource, Lazy, Names, PhysicalName, Resource } from '../../../core'; -import { Construct } from 'constructs'; -import { ImportedTaskDefinition } from './_imported-task-definition'; import { ContainerDefinition, ContainerDefinitionOptions, PortMapping, Protocol } from '../container-definition'; import { CfnTaskDefinition } from '../ecs.generated'; import { FirelensLogRouter, FirelensLogRouterDefinitionOptions, FirelensLogRouterType, obtainDefaultFluentBitECRImage } from '../firelens-log-router'; diff --git a/packages/aws-cdk-lib/aws-ecs/lib/cluster.ts b/packages/aws-cdk-lib/aws-ecs/lib/cluster.ts index 45da021aabb75..3e27e61af8538 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/cluster.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/cluster.ts @@ -1,3 +1,8 @@ +import { Construct, IConstruct } from 'constructs'; +import { BottleRocketImage, EcsOptimizedAmi } from './amis'; +import { InstanceDrainHook } from './drain-hook/instance-drain-hook'; +import { ECSMetrics } from './ecs-canned-metrics.generated'; +import { CfnCluster, CfnCapacityProvider, CfnClusterCapacityProviderAssociations } from './ecs.generated'; import * as autoscaling from '../../aws-autoscaling'; import * as cloudwatch from '../../aws-cloudwatch'; import * as ec2 from '../../aws-ec2'; @@ -7,11 +12,6 @@ import * as logs from '../../aws-logs'; import * as s3 from '../../aws-s3'; import * as cloudmap from '../../aws-servicediscovery'; import { Duration, IResource, Resource, Stack, Aspects, ArnFormat, IAspect } from '../../core'; -import { Construct, IConstruct } from 'constructs'; -import { BottleRocketImage, EcsOptimizedAmi } from './amis'; -import { InstanceDrainHook } from './drain-hook/instance-drain-hook'; -import { ECSMetrics } from './ecs-canned-metrics.generated'; -import { CfnCluster, CfnCapacityProvider, CfnClusterCapacityProviderAssociations } from './ecs.generated'; const CLUSTER_SYMBOL = Symbol.for('@aws-cdk/aws-ecs/lib/cluster.Cluster'); diff --git a/packages/aws-cdk-lib/aws-ecs/lib/container-definition.ts b/packages/aws-cdk-lib/aws-ecs/lib/container-definition.ts index f93aa9d492a30..7b92134619b3b 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/container-definition.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/container-definition.ts @@ -1,7 +1,3 @@ -import * as iam from '../../aws-iam'; -import * as secretsmanager from '../../aws-secretsmanager'; -import * as ssm from '../../aws-ssm'; -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { NetworkMode, TaskDefinition } from './base/task-definition'; import { ContainerImage, ContainerImageConfig } from './container-image'; @@ -9,6 +5,10 @@ import { CfnTaskDefinition } from './ecs.generated'; import { EnvironmentFile, EnvironmentFileConfig } from './environment-file'; import { LinuxParameters } from './linux-parameters'; import { LogDriver, LogDriverConfig } from './log-drivers/log-driver'; +import * as iam from '../../aws-iam'; +import * as secretsmanager from '../../aws-secretsmanager'; +import * as ssm from '../../aws-ssm'; +import * as cdk from '../../core'; /** * Specify the secret's version id or version stage diff --git a/packages/aws-cdk-lib/aws-ecs/lib/container-image.ts b/packages/aws-cdk-lib/aws-ecs/lib/container-image.ts index 64d4011e87889..7ba6d6bf320d7 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/container-image.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/container-image.ts @@ -1,8 +1,9 @@ -import * as ecr from '../../aws-ecr'; -import { DockerImageAsset, TarballImageAsset } from '../../aws-ecr-assets'; +/* eslint-disable import/order */ import { Construct } from 'constructs'; import { ContainerDefinition } from './container-definition'; import { CfnTaskDefinition } from './ecs.generated'; +import * as ecr from '../../aws-ecr'; +import { DockerImageAsset, TarballImageAsset } from '../../aws-ecr-assets'; /** * Constructs for types of container images @@ -94,7 +95,7 @@ export interface ContainerImageConfig { readonly repositoryCredentials?: CfnTaskDefinition.RepositoryCredentialsProperty; } +// These imports have to be at the end to prevent circular imports import { AssetImage, AssetImageProps } from './images/asset-image'; import { EcrImage } from './images/ecr'; -import { RepositoryImage, RepositoryImageProps } from './images/repository'; - +import { RepositoryImage, RepositoryImageProps } from './images/repository'; \ No newline at end of file diff --git a/packages/aws-cdk-lib/aws-ecs/lib/drain-hook/instance-drain-hook.ts b/packages/aws-cdk-lib/aws-ecs/lib/drain-hook/instance-drain-hook.ts index ae9357a5666da..a96b519297906 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/drain-hook/instance-drain-hook.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/drain-hook/instance-drain-hook.ts @@ -1,12 +1,12 @@ import * as fs from 'fs'; import * as path from 'path'; +import { Construct } from 'constructs'; import * as autoscaling from '../../../aws-autoscaling'; import * as hooks from '../../../aws-autoscaling-hooktargets'; import * as iam from '../../../aws-iam'; import * as kms from '../../../aws-kms'; import * as lambda from '../../../aws-lambda'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; import { ICluster } from '../cluster'; // Reference for the source in this package: diff --git a/packages/aws-cdk-lib/aws-ecs/lib/ec2/ec2-service.ts b/packages/aws-cdk-lib/aws-ecs/lib/ec2/ec2-service.ts index c0b20ca3979b2..745b67bd3f1de 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/ec2/ec2-service.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/ec2/ec2-service.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as ec2 from '../../../aws-ec2'; import { Lazy, Resource, Stack } from '../../../core'; -import { Construct } from 'constructs'; import { BaseService, BaseServiceOptions, DeploymentControllerType, IBaseService, IService, LaunchType } from '../base/base-service'; import { fromServiceAttributes, extractServiceNameFromArn } from '../base/from-service-attributes'; import { NetworkMode, TaskDefinition } from '../base/task-definition'; diff --git a/packages/aws-cdk-lib/aws-ecs/lib/environment-file.ts b/packages/aws-cdk-lib/aws-ecs/lib/environment-file.ts index 74db621b3c6ac..7b40a6668a109 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/environment-file.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/environment-file.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import { IBucket, Location } from '../../aws-s3'; import { Asset, AssetOptions } from '../../aws-s3-assets'; -import { Construct } from 'constructs'; /** * Constructs for types of environment files diff --git a/packages/aws-cdk-lib/aws-ecs/lib/external/external-service.ts b/packages/aws-cdk-lib/aws-ecs/lib/external/external-service.ts index 1059e38ab681c..1b21cb3e41c4c 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/external/external-service.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/external/external-service.ts @@ -1,9 +1,9 @@ +import { Construct } from 'constructs'; import * as appscaling from '../../../aws-applicationautoscaling'; import * as ec2 from '../../../aws-ec2'; import * as elbv2 from '../../../aws-elasticloadbalancingv2'; import * as cloudmap from '../../../aws-servicediscovery'; import { ArnFormat, Resource, Stack } from '../../../core'; -import { Construct } from 'constructs'; import { AssociateCloudMapServiceOptions, BaseService, BaseServiceOptions, CloudMapOptions, DeploymentControllerType, EcsTarget, IBaseService, IEcsLoadBalancerTarget, IService, LaunchType, PropagatedTagSource } from '../base/base-service'; import { fromServiceAttributes } from '../base/from-service-attributes'; import { ScalableTaskCount } from '../base/scalable-task-count'; diff --git a/packages/aws-cdk-lib/aws-ecs/lib/fargate/fargate-service.ts b/packages/aws-cdk-lib/aws-ecs/lib/fargate/fargate-service.ts index 56c64eac1852c..d380272f1f413 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/fargate/fargate-service.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/fargate/fargate-service.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as ec2 from '../../../aws-ec2'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; import { BaseService, BaseServiceOptions, DeploymentControllerType, IBaseService, IService, LaunchType } from '../base/base-service'; import { fromServiceAttributes, extractServiceNameFromArn } from '../base/from-service-attributes'; import { TaskDefinition } from '../base/task-definition'; diff --git a/packages/aws-cdk-lib/aws-ecs/lib/fargate/fargate-task-definition.ts b/packages/aws-cdk-lib/aws-ecs/lib/fargate/fargate-task-definition.ts index 56615529c3656..bb42e4262764c 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/fargate/fargate-task-definition.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/fargate/fargate-task-definition.ts @@ -1,5 +1,5 @@ -import { Tokenization, Token } from '../../../core'; import { Construct } from 'constructs'; +import { Tokenization, Token } from '../../../core'; import { ImportedTaskDefinition } from '../base/_imported-task-definition'; import { CommonTaskDefinitionAttributes, diff --git a/packages/aws-cdk-lib/aws-ecs/lib/firelens-log-router.ts b/packages/aws-cdk-lib/aws-ecs/lib/firelens-log-router.ts index ea5ed7b756b41..373e6b877cfde 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/firelens-log-router.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/firelens-log-router.ts @@ -1,12 +1,12 @@ -import * as iam from '../../aws-iam'; -import * as ssm from '../../aws-ssm'; -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { TaskDefinition } from './base/task-definition'; import { ContainerDefinition, ContainerDefinitionOptions, ContainerDefinitionProps } from './container-definition'; import { ContainerImage } from './container-image'; import { CfnTaskDefinition } from './ecs.generated'; import { LogDriverConfig } from './log-drivers/log-driver'; +import * as iam from '../../aws-iam'; +import * as ssm from '../../aws-ssm'; +import * as cdk from '../../core'; /** * Firelens log router type, fluentbit or fluentd. diff --git a/packages/aws-cdk-lib/aws-ecs/lib/images/asset-image.ts b/packages/aws-cdk-lib/aws-ecs/lib/images/asset-image.ts index 7f2fd2f766b34..07eef9ca04773 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/images/asset-image.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/images/asset-image.ts @@ -1,5 +1,5 @@ -import { DockerImageAsset, DockerImageAssetOptions } from '../../../aws-ecr-assets'; import { Construct } from 'constructs'; +import { DockerImageAsset, DockerImageAssetOptions } from '../../../aws-ecr-assets'; import { ContainerDefinition } from '../container-definition'; import { ContainerImage, ContainerImageConfig } from '../container-image'; diff --git a/packages/aws-cdk-lib/aws-ecs/lib/images/ecr.ts b/packages/aws-cdk-lib/aws-ecs/lib/images/ecr.ts index 3038faedb0a66..44cfbd619938e 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/images/ecr.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/images/ecr.ts @@ -1,5 +1,5 @@ -import * as ecr from '../../../aws-ecr'; import { Construct } from 'constructs'; +import * as ecr from '../../../aws-ecr'; import { ContainerDefinition } from '../container-definition'; import { ContainerImage, ContainerImageConfig } from '../container-image'; diff --git a/packages/aws-cdk-lib/aws-ecs/lib/images/repository.ts b/packages/aws-cdk-lib/aws-ecs/lib/images/repository.ts index 88f2ff532dde4..bbfc2a7dc6a95 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/images/repository.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/images/repository.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as secretsmanager from '../../../aws-secretsmanager'; import { Annotations, Token } from '../../../core'; -import { Construct } from 'constructs'; import { ContainerDefinition } from '../container-definition'; import { ContainerImage, ContainerImageConfig } from '../container-image'; diff --git a/packages/aws-cdk-lib/aws-ecs/lib/images/tag-parameter-container-image.ts b/packages/aws-cdk-lib/aws-ecs/lib/images/tag-parameter-container-image.ts index c5c79884efad1..54ab32ce6311a 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/images/tag-parameter-container-image.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/images/tag-parameter-container-image.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as ecr from '../../../aws-ecr'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; import { ContainerDefinition } from '../container-definition'; import { ContainerImage, ContainerImageConfig } from '../container-image'; diff --git a/packages/aws-cdk-lib/aws-ecs/lib/linux-parameters.ts b/packages/aws-cdk-lib/aws-ecs/lib/linux-parameters.ts index 8b65259c01c3d..1e4f67d79aa33 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/linux-parameters.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/linux-parameters.ts @@ -1,6 +1,6 @@ -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { CfnTaskDefinition } from './ecs.generated'; +import * as cdk from '../../core'; /** * The properties for defining Linux-specific options that are applied to the container. diff --git a/packages/aws-cdk-lib/aws-ecs/lib/log-drivers/aws-log-driver.ts b/packages/aws-cdk-lib/aws-ecs/lib/log-drivers/aws-log-driver.ts index 454796b2be4f4..54b729985da31 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/log-drivers/aws-log-driver.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/log-drivers/aws-log-driver.ts @@ -1,7 +1,7 @@ -import * as logs from '../../../aws-logs'; import { Construct } from 'constructs'; import { LogDriver, LogDriverConfig } from './log-driver'; import { removeEmpty } from './utils'; +import * as logs from '../../../aws-logs'; import { ContainerDefinition } from '../container-definition'; /** diff --git a/packages/aws-cdk-lib/aws-ecs/lib/log-drivers/fluentd-log-driver.ts b/packages/aws-cdk-lib/aws-ecs/lib/log-drivers/fluentd-log-driver.ts index 0c1f4c73284f8..298a722b42411 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/log-drivers/fluentd-log-driver.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/log-drivers/fluentd-log-driver.ts @@ -1,8 +1,8 @@ -import { Duration } from '../../../core'; import { Construct } from 'constructs'; import { BaseLogDriverProps } from './base-log-driver'; import { LogDriver, LogDriverConfig } from './log-driver'; import { renderCommonLogDriverOptions, stringifyOptions } from './utils'; +import { Duration } from '../../../core'; import { ContainerDefinition } from '../container-definition'; /** diff --git a/packages/aws-cdk-lib/aws-ecs/lib/log-drivers/gelf-log-driver.ts b/packages/aws-cdk-lib/aws-ecs/lib/log-drivers/gelf-log-driver.ts index f01b6f1a3c218..8a9677aafc576 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/log-drivers/gelf-log-driver.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/log-drivers/gelf-log-driver.ts @@ -1,8 +1,8 @@ -import { Duration } from '../../../core'; import { Construct } from 'constructs'; import { BaseLogDriverProps } from './base-log-driver'; import { LogDriver, LogDriverConfig } from './log-driver'; import { ensureInRange, ensurePositiveInteger, renderCommonLogDriverOptions, stringifyOptions } from './utils'; +import { Duration } from '../../../core'; import { ContainerDefinition } from '../container-definition'; /** diff --git a/packages/aws-cdk-lib/aws-ecs/lib/log-drivers/splunk-log-driver.ts b/packages/aws-cdk-lib/aws-ecs/lib/log-drivers/splunk-log-driver.ts index e5cefb822c7ca..f2b18cea3c30f 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/log-drivers/splunk-log-driver.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/log-drivers/splunk-log-driver.ts @@ -1,8 +1,8 @@ -import { SecretValue } from '../../../core'; import { Construct } from 'constructs'; import { BaseLogDriverProps } from './base-log-driver'; import { LogDriver, LogDriverConfig } from './log-driver'; import { ensureInRange, renderCommonLogDriverOptions, renderLogDriverSecretOptions, stringifyOptions } from './utils'; +import { SecretValue } from '../../../core'; import { ContainerDefinition, Secret } from '../container-definition'; /** diff --git a/packages/aws-cdk-lib/aws-ecs/lib/log-drivers/utils.ts b/packages/aws-cdk-lib/aws-ecs/lib/log-drivers/utils.ts index 3df2bfeae1c3b..23287e8f128f5 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/log-drivers/utils.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/log-drivers/utils.ts @@ -1,5 +1,5 @@ -import { Duration, SecretValue, Token } from '../../../core'; import { BaseLogDriverProps } from './base-log-driver'; +import { Duration, SecretValue, Token } from '../../../core'; import { TaskDefinition } from '../base/task-definition'; import { Secret } from '../container-definition'; import { CfnTaskDefinition } from '../ecs.generated'; diff --git a/packages/aws-cdk-lib/aws-ecs/test/cluster.test.ts b/packages/aws-cdk-lib/aws-ecs/test/cluster.test.ts index c22e70137fae6..714a8a34e7e5d 100644 --- a/packages/aws-cdk-lib/aws-ecs/test/cluster.test.ts +++ b/packages/aws-cdk-lib/aws-ecs/test/cluster.test.ts @@ -1,3 +1,4 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Match, Template } from '../../assertions'; import * as autoscaling from '../../aws-autoscaling'; import * as ec2 from '../../aws-ec2'; @@ -5,7 +6,6 @@ import * as kms from '../../aws-kms'; import * as logs from '../../aws-logs'; import * as s3 from '../../aws-s3'; import * as cloudmap from '../../aws-servicediscovery'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../core'; import * as cxapi from '../../cx-api'; import * as ecs from '../lib'; diff --git a/packages/aws-cdk-lib/aws-ecs/test/ec2/ec2-service.test.ts b/packages/aws-cdk-lib/aws-ecs/test/ec2/ec2-service.test.ts index 5a8ab96f5bbd8..170e8399ff4aa 100644 --- a/packages/aws-cdk-lib/aws-ecs/test/ec2/ec2-service.test.ts +++ b/packages/aws-cdk-lib/aws-ecs/test/ec2/ec2-service.test.ts @@ -1,3 +1,4 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Annotations, Match, Template } from '../../../assertions'; import * as autoscaling from '../../../aws-autoscaling'; import * as ec2 from '../../../aws-ec2'; @@ -7,7 +8,6 @@ import * as kms from '../../../aws-kms'; import * as logs from '../../../aws-logs'; import * as s3 from '../../../aws-s3'; import * as cloudmap from '../../../aws-servicediscovery'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../../core'; import { App } from '../../../core'; import { ECS_ARN_FORMAT_INCLUDES_CLUSTER_NAME } from '../../../cx-api'; diff --git a/packages/aws-cdk-lib/aws-ecs/test/fargate/fargate-service.test.ts b/packages/aws-cdk-lib/aws-ecs/test/fargate/fargate-service.test.ts index 222fcd47cb803..79a66a928292a 100644 --- a/packages/aws-cdk-lib/aws-ecs/test/fargate/fargate-service.test.ts +++ b/packages/aws-cdk-lib/aws-ecs/test/fargate/fargate-service.test.ts @@ -1,3 +1,4 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Annotations, Match, Template } from '../../../assertions'; import * as appscaling from '../../../aws-applicationautoscaling'; import * as cloudwatch from '../../../aws-cloudwatch'; @@ -8,7 +9,6 @@ import * as logs from '../../../aws-logs'; import * as s3 from '../../../aws-s3'; import * as secretsmanager from '../../../aws-secretsmanager'; import * as cloudmap from '../../../aws-servicediscovery'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../../core'; import { App } from '../../../core'; import * as cxapi from '../../../cx-api'; diff --git a/packages/aws-cdk-lib/aws-efs/lib/access-point.ts b/packages/aws-cdk-lib/aws-efs/lib/access-point.ts index 8685bc5231f00..dcdea87857de9 100644 --- a/packages/aws-cdk-lib/aws-efs/lib/access-point.ts +++ b/packages/aws-cdk-lib/aws-efs/lib/access-point.ts @@ -1,7 +1,7 @@ -import { ArnFormat, IResource, Resource, Stack, Tags } from '../../core'; import { Construct } from 'constructs'; import { IFileSystem } from './efs-file-system'; import { CfnAccessPoint } from './efs.generated'; +import { ArnFormat, IResource, Resource, Stack, Tags } from '../../core'; /** * Represents an EFS AccessPoint diff --git a/packages/aws-cdk-lib/aws-efs/lib/efs-file-system.ts b/packages/aws-cdk-lib/aws-efs/lib/efs-file-system.ts index 31ee4a61e3be1..7dace91d25335 100644 --- a/packages/aws-cdk-lib/aws-efs/lib/efs-file-system.ts +++ b/packages/aws-cdk-lib/aws-efs/lib/efs-file-system.ts @@ -1,11 +1,11 @@ +import { Construct, DependencyGroup, IDependable } from 'constructs'; +import { AccessPoint, AccessPointOptions } from './access-point'; +import { CfnFileSystem, CfnMountTarget } from './efs.generated'; import * as ec2 from '../../aws-ec2'; import * as iam from '../../aws-iam'; import * as kms from '../../aws-kms'; import { ArnFormat, FeatureFlags, Lazy, RemovalPolicy, Resource, Size, Stack, Tags } from '../../core'; import * as cxapi from '../../cx-api'; -import { Construct, DependencyGroup, IDependable } from 'constructs'; -import { AccessPoint, AccessPointOptions } from './access-point'; -import { CfnFileSystem, CfnMountTarget } from './efs.generated'; /** * EFS Lifecycle Policy, if a file is not accessed for given days, it will move to EFS Infrequent Access. diff --git a/packages/aws-cdk-lib/aws-eks/README.md b/packages/aws-cdk-lib/aws-eks/README.md index 10869d374537e..d4a4566b3c826 100644 --- a/packages/aws-cdk-lib/aws-eks/README.md +++ b/packages/aws-cdk-lib/aws-eks/README.md @@ -38,12 +38,12 @@ This example defines an Amazon EKS cluster with the following configuration: * A Kubernetes pod with a container based on the [paulbouwer/hello-kubernetes](https://github.com/paulbouwer/hello-kubernetes) image. ```ts -import { KubectlV25Layer } from '@aws-cdk/lambda-layer-kubectl-v25'; +import { KubectlV26Layer } from '@aws-cdk/lambda-layer-kubectl-v26'; // provisioning a cluster const cluster = new eks.Cluster(this, 'hello-eks', { version: eks.KubernetesVersion.V1_26, - kubectlLayer: new KubectlV25Layer(this, 'kubectl'), + kubectlLayer: new KubectlV26Layer(this, 'kubectl'), }); // apply a kubernetes manifest to the cluster @@ -676,11 +676,11 @@ Only version 1.20 of kubectl is available in `aws-cdk-lib`. If you need a differ version, you will need to use one of the `@aws-cdk/lambda-layer-kubectl-vXY` packages. ```ts -import { KubectlV25Layer } from '@aws-cdk/lambda-layer-kubectl-v25'; +import { KubectlV26Layer } from '@aws-cdk/lambda-layer-kubectl-v26'; const cluster = new eks.Cluster(this, 'hello-eks', { version: eks.KubernetesVersion.V1_26, - kubectlLayer: new KubectlV25Layer(this, 'kubectl'), + kubectlLayer: new KubectlV26Layer(this, 'kubectl'), }); ``` diff --git a/packages/aws-cdk-lib/aws-eks/lib/alb-controller.ts b/packages/aws-cdk-lib/aws-eks/lib/alb-controller.ts index 4de410208995b..699e0286a0906 100644 --- a/packages/aws-cdk-lib/aws-eks/lib/alb-controller.ts +++ b/packages/aws-cdk-lib/aws-eks/lib/alb-controller.ts @@ -1,10 +1,10 @@ import * as fs from 'fs'; import * as path from 'path'; -import * as iam from '../../aws-iam'; import { Construct, Node } from 'constructs'; import { Cluster } from './cluster'; import { HelmChart } from './helm-chart'; import { ServiceAccount } from './service-account'; +import * as iam from '../../aws-iam'; // v2 - keep this import as a separate section to reduce merge conflict when forward merging with the v2 branch. // eslint-disable-next-line diff --git a/packages/aws-cdk-lib/aws-eks/lib/aws-auth.ts b/packages/aws-cdk-lib/aws-eks/lib/aws-auth.ts index cfe6c8f16f8ab..07b1d2b99f162 100644 --- a/packages/aws-cdk-lib/aws-eks/lib/aws-auth.ts +++ b/packages/aws-cdk-lib/aws-eks/lib/aws-auth.ts @@ -1,9 +1,9 @@ -import * as iam from '../../aws-iam'; -import { Lazy, Stack } from '../../core'; import { Construct, IConstruct } from 'constructs'; import { AwsAuthMapping } from './aws-auth-mapping'; import { Cluster } from './cluster'; import { KubernetesManifest } from './k8s-manifest'; +import * as iam from '../../aws-iam'; +import { Lazy, Stack } from '../../core'; /** * Configuration props for the AwsAuth construct. diff --git a/packages/aws-cdk-lib/aws-eks/lib/cluster-resource-handler/cluster.ts b/packages/aws-cdk-lib/aws-eks/lib/cluster-resource-handler/cluster.ts index 7516298cbab1c..558fbe9884428 100644 --- a/packages/aws-cdk-lib/aws-eks/lib/cluster-resource-handler/cluster.ts +++ b/packages/aws-cdk-lib/aws-eks/lib/cluster-resource-handler/cluster.ts @@ -1,11 +1,11 @@ /* eslint-disable no-console */ // eslint-disable-next-line import/no-extraneous-dependencies -import { IsCompleteResponse, OnEventResponse } from '../../../custom-resources/lib/provider-framework/types'; // eslint-disable-next-line import/no-extraneous-dependencies import * as aws from 'aws-sdk'; import { EksClient, ResourceEvent, ResourceHandler } from './common'; import { compareLoggingProps } from './compareLogging'; +import { IsCompleteResponse, OnEventResponse } from '../../../custom-resources/lib/provider-framework/types'; const MAX_CLUSTER_NAME_LEN = 100; diff --git a/packages/aws-cdk-lib/aws-eks/lib/cluster-resource-handler/common.ts b/packages/aws-cdk-lib/aws-eks/lib/cluster-resource-handler/common.ts index 20259e74056c2..ba7177677ced4 100644 --- a/packages/aws-cdk-lib/aws-eks/lib/cluster-resource-handler/common.ts +++ b/packages/aws-cdk-lib/aws-eks/lib/cluster-resource-handler/common.ts @@ -1,8 +1,8 @@ // eslint-disable-next-line import/no-extraneous-dependencies +import * as aws from 'aws-sdk'; import { IsCompleteResponse, OnEventResponse } from '../../../custom-resources/lib/provider-framework/types'; // eslint-disable-next-line import/no-extraneous-dependencies -import * as aws from 'aws-sdk'; export interface EksUpdateId { /** diff --git a/packages/aws-cdk-lib/aws-eks/lib/cluster-resource-handler/index.ts b/packages/aws-cdk-lib/aws-eks/lib/cluster-resource-handler/index.ts index 537277c83a226..e71a8de720ed6 100644 --- a/packages/aws-cdk-lib/aws-eks/lib/cluster-resource-handler/index.ts +++ b/packages/aws-cdk-lib/aws-eks/lib/cluster-resource-handler/index.ts @@ -1,12 +1,12 @@ /* eslint-disable no-console */ // eslint-disable-next-line import/no-extraneous-dependencies -import { IsCompleteResponse } from '../../../custom-resources/lib/provider-framework/types'; // eslint-disable-next-line import/no-extraneous-dependencies import * as aws from 'aws-sdk'; import { ClusterResourceHandler } from './cluster'; import { EksClient } from './common'; import * as consts from './consts'; import { FargateProfileResourceHandler } from './fargate'; +import { IsCompleteResponse } from '../../../custom-resources/lib/provider-framework/types'; // eslint-disable-next-line @typescript-eslint/no-require-imports, import/no-extraneous-dependencies const ProxyAgent = require('proxy-agent'); diff --git a/packages/aws-cdk-lib/aws-eks/lib/cluster-resource-provider.ts b/packages/aws-cdk-lib/aws-eks/lib/cluster-resource-provider.ts index 60865e7ddfe27..8cac05607d049 100644 --- a/packages/aws-cdk-lib/aws-eks/lib/cluster-resource-provider.ts +++ b/packages/aws-cdk-lib/aws-eks/lib/cluster-resource-provider.ts @@ -1,11 +1,11 @@ import * as path from 'path'; +import { Construct } from 'constructs'; import * as ec2 from '../../aws-ec2'; import * as iam from '../../aws-iam'; import * as lambda from '../../aws-lambda'; import { Duration, NestedStack, Stack } from '../../core'; import * as cr from '../../custom-resources'; import { NodeProxyAgentLayer } from '../../lambda-layer-node-proxy-agent'; -import { Construct } from 'constructs'; const HANDLER_DIR = path.join(__dirname, 'cluster-resource-handler'); const HANDLER_RUNTIME = lambda.Runtime.NODEJS_14_X; diff --git a/packages/aws-cdk-lib/aws-eks/lib/cluster-resource.ts b/packages/aws-cdk-lib/aws-eks/lib/cluster-resource.ts index c450526357daf..7399cbf809521 100644 --- a/packages/aws-cdk-lib/aws-eks/lib/cluster-resource.ts +++ b/packages/aws-cdk-lib/aws-eks/lib/cluster-resource.ts @@ -1,12 +1,12 @@ +import { Construct } from 'constructs'; +import { CLUSTER_RESOURCE_TYPE } from './cluster-resource-handler/consts'; +import { ClusterResourceProvider } from './cluster-resource-provider'; +import { CfnCluster } from './eks.generated'; import * as ec2 from '../../aws-ec2'; import * as iam from '../../aws-iam'; import * as kms from '../../aws-kms'; import * as lambda from '../../aws-lambda'; import { ArnComponents, CustomResource, Token, Stack, Lazy } from '../../core'; -import { Construct } from 'constructs'; -import { CLUSTER_RESOURCE_TYPE } from './cluster-resource-handler/consts'; -import { ClusterResourceProvider } from './cluster-resource-provider'; -import { CfnCluster } from './eks.generated'; export interface ClusterResourceProps { readonly resourcesVpcConfig: CfnCluster.ResourcesVpcConfigProperty; diff --git a/packages/aws-cdk-lib/aws-eks/lib/cluster.ts b/packages/aws-cdk-lib/aws-eks/lib/cluster.ts index 0559860458f31..f5814d853af90 100644 --- a/packages/aws-cdk-lib/aws-eks/lib/cluster.ts +++ b/packages/aws-cdk-lib/aws-eks/lib/cluster.ts @@ -1,12 +1,5 @@ import * as fs from 'fs'; import * as path from 'path'; -import * as autoscaling from '../../aws-autoscaling'; -import * as ec2 from '../../aws-ec2'; -import * as iam from '../../aws-iam'; -import * as kms from '../../aws-kms'; -import * as lambda from '../../aws-lambda'; -import * as ssm from '../../aws-ssm'; -import { Annotations, CfnOutput, CfnResource, IResource, Resource, Stack, Tags, Token, Duration, Size } from '../../core'; import { Construct, Node } from 'constructs'; import * as semver from 'semver'; import * as YAML from 'yaml'; @@ -25,6 +18,13 @@ import { OpenIdConnectProvider } from './oidc-provider'; import { BottleRocketImage } from './private/bottlerocket'; import { ServiceAccount, ServiceAccountOptions } from './service-account'; import { LifecycleLabel, renderAmazonLinuxUserData, renderBottlerocketUserData } from './user-data'; +import * as autoscaling from '../../aws-autoscaling'; +import * as ec2 from '../../aws-ec2'; +import * as iam from '../../aws-iam'; +import * as kms from '../../aws-kms'; +import * as lambda from '../../aws-lambda'; +import * as ssm from '../../aws-ssm'; +import { Annotations, CfnOutput, CfnResource, IResource, Resource, Stack, Tags, Token, Duration, Size } from '../../core'; // defaults are based on https://eksctl.io const DEFAULT_CAPACITY_COUNT = 2; diff --git a/packages/aws-cdk-lib/aws-eks/lib/fargate-profile.ts b/packages/aws-cdk-lib/aws-eks/lib/fargate-profile.ts index db753ce283e8d..a0e8775b83c6d 100644 --- a/packages/aws-cdk-lib/aws-eks/lib/fargate-profile.ts +++ b/packages/aws-cdk-lib/aws-eks/lib/fargate-profile.ts @@ -1,10 +1,10 @@ -import * as ec2 from '../../aws-ec2'; -import * as iam from '../../aws-iam'; -import { Annotations, CustomResource, ITaggable, Lazy, TagManager, TagType } from '../../core'; import { Construct } from 'constructs'; import { Cluster } from './cluster'; import { FARGATE_PROFILE_RESOURCE_TYPE } from './cluster-resource-handler/consts'; import { ClusterResourceProvider } from './cluster-resource-provider'; +import * as ec2 from '../../aws-ec2'; +import * as iam from '../../aws-iam'; +import { Annotations, CustomResource, ITaggable, Lazy, TagManager, TagType } from '../../core'; /** * Options for defining EKS Fargate Profiles. diff --git a/packages/aws-cdk-lib/aws-eks/lib/helm-chart.ts b/packages/aws-cdk-lib/aws-eks/lib/helm-chart.ts index a8ea30baa43ae..c314bea596079 100644 --- a/packages/aws-cdk-lib/aws-eks/lib/helm-chart.ts +++ b/packages/aws-cdk-lib/aws-eks/lib/helm-chart.ts @@ -1,8 +1,8 @@ -import { Asset } from '../../aws-s3-assets'; -import { CustomResource, Duration, Names, Stack } from '../../core'; import { Construct } from 'constructs'; import { ICluster } from './cluster'; import { KubectlProvider } from './kubectl-provider'; +import { Asset } from '../../aws-s3-assets'; +import { CustomResource, Duration, Names, Stack } from '../../core'; /** * Helm Chart options. diff --git a/packages/aws-cdk-lib/aws-eks/lib/k8s-manifest.ts b/packages/aws-cdk-lib/aws-eks/lib/k8s-manifest.ts index 3354f9b288026..e4ed6d813be86 100644 --- a/packages/aws-cdk-lib/aws-eks/lib/k8s-manifest.ts +++ b/packages/aws-cdk-lib/aws-eks/lib/k8s-manifest.ts @@ -1,8 +1,8 @@ -import { CustomResource, Stack } from '../../core'; import { Construct, Node } from 'constructs'; import { AlbScheme } from './alb-controller'; import { ICluster } from './cluster'; import { KubectlProvider } from './kubectl-provider'; +import { CustomResource, Stack } from '../../core'; const PRUNE_LABEL_PREFIX = 'aws.cdk.eks/prune-'; diff --git a/packages/aws-cdk-lib/aws-eks/lib/k8s-object-value.ts b/packages/aws-cdk-lib/aws-eks/lib/k8s-object-value.ts index 843cf5272d0da..9a78f1774eadb 100644 --- a/packages/aws-cdk-lib/aws-eks/lib/k8s-object-value.ts +++ b/packages/aws-cdk-lib/aws-eks/lib/k8s-object-value.ts @@ -1,7 +1,7 @@ -import { CustomResource, Token, Duration } from '../../core'; import { Construct } from 'constructs'; import { ICluster } from './cluster'; import { KubectlProvider } from './kubectl-provider'; +import { CustomResource, Token, Duration } from '../../core'; /** * Properties for KubernetesObjectValue. diff --git a/packages/aws-cdk-lib/aws-eks/lib/k8s-patch.ts b/packages/aws-cdk-lib/aws-eks/lib/k8s-patch.ts index 866baf2a9113c..3ec0932c31987 100644 --- a/packages/aws-cdk-lib/aws-eks/lib/k8s-patch.ts +++ b/packages/aws-cdk-lib/aws-eks/lib/k8s-patch.ts @@ -1,7 +1,7 @@ -import { CustomResource, Stack } from '../../core'; import { Construct } from 'constructs'; import { ICluster } from './cluster'; import { KubectlProvider } from './kubectl-provider'; +import { CustomResource, Stack } from '../../core'; /** * Properties for KubernetesPatch diff --git a/packages/aws-cdk-lib/aws-eks/lib/kubectl-provider.ts b/packages/aws-cdk-lib/aws-eks/lib/kubectl-provider.ts index dffb0422622cf..5bbb324350437 100644 --- a/packages/aws-cdk-lib/aws-eks/lib/kubectl-provider.ts +++ b/packages/aws-cdk-lib/aws-eks/lib/kubectl-provider.ts @@ -1,12 +1,12 @@ import * as path from 'path'; +import { Construct, IConstruct } from 'constructs'; +import { ICluster, Cluster } from './cluster'; import * as iam from '../../aws-iam'; import * as lambda from '../../aws-lambda'; import { Duration, Stack, NestedStack, Names, CfnCondition, Fn, Aws } from '../../core'; import * as cr from '../../custom-resources'; import { AwsCliLayer } from '../../lambda-layer-awscli'; import { KubectlLayer } from '../../lambda-layer-kubectl'; -import { Construct, IConstruct } from 'constructs'; -import { ICluster, Cluster } from './cluster'; /** * Properties for a KubectlProvider diff --git a/packages/aws-cdk-lib/aws-eks/lib/managed-nodegroup.ts b/packages/aws-cdk-lib/aws-eks/lib/managed-nodegroup.ts index a5eff0bdefceb..4d675795505fe 100644 --- a/packages/aws-cdk-lib/aws-eks/lib/managed-nodegroup.ts +++ b/packages/aws-cdk-lib/aws-eks/lib/managed-nodegroup.ts @@ -1,9 +1,9 @@ -import { InstanceType, ISecurityGroup, SubnetSelection, InstanceArchitecture, InstanceClass, InstanceSize } from '../../aws-ec2'; -import { IRole, ManagedPolicy, Role, ServicePrincipal } from '../../aws-iam'; -import { IResource, Resource, Annotations, withResolved } from '../../core'; import { Construct, Node } from 'constructs'; import { Cluster, ICluster } from './cluster'; import { CfnNodegroup } from './eks.generated'; +import { InstanceType, ISecurityGroup, SubnetSelection, InstanceArchitecture, InstanceClass, InstanceSize } from '../../aws-ec2'; +import { IRole, ManagedPolicy, Role, ServicePrincipal } from '../../aws-iam'; +import { IResource, Resource, Annotations, withResolved } from '../../core'; /** * NodeGroup interface diff --git a/packages/aws-cdk-lib/aws-eks/lib/oidc-provider.ts b/packages/aws-cdk-lib/aws-eks/lib/oidc-provider.ts index b46d38673ea01..d11b7fdff1eb8 100644 --- a/packages/aws-cdk-lib/aws-eks/lib/oidc-provider.ts +++ b/packages/aws-cdk-lib/aws-eks/lib/oidc-provider.ts @@ -1,5 +1,5 @@ -import * as iam from '../../aws-iam'; import { Construct } from 'constructs'; +import * as iam from '../../aws-iam'; /** * Initialization properties for `OpenIdConnectProvider`. diff --git a/packages/aws-cdk-lib/aws-eks/lib/private/bottlerocket.ts b/packages/aws-cdk-lib/aws-eks/lib/private/bottlerocket.ts index 08ef0583f704e..a1389dd8c89f8 100644 --- a/packages/aws-cdk-lib/aws-eks/lib/private/bottlerocket.ts +++ b/packages/aws-cdk-lib/aws-eks/lib/private/bottlerocket.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as ec2 from '../../../aws-ec2'; import * as ssm from '../../../aws-ssm'; -import { Construct } from 'constructs'; /** * Properties for BottleRocketImage diff --git a/packages/aws-cdk-lib/aws-eks/lib/service-account.ts b/packages/aws-cdk-lib/aws-eks/lib/service-account.ts index b27faaa360712..4698c8a1a478c 100644 --- a/packages/aws-cdk-lib/aws-eks/lib/service-account.ts +++ b/packages/aws-cdk-lib/aws-eks/lib/service-account.ts @@ -1,8 +1,8 @@ -import { AddToPrincipalPolicyResult, IPrincipal, IRole, OpenIdConnectPrincipal, PolicyStatement, PrincipalPolicyFragment, Role } from '../../aws-iam'; -import { CfnJson, Names } from '../../core'; import { Construct } from 'constructs'; import { ICluster } from './cluster'; import { KubernetesManifest } from './k8s-manifest'; +import { AddToPrincipalPolicyResult, IPrincipal, IRole, OpenIdConnectPrincipal, PolicyStatement, PrincipalPolicyFragment, Role } from '../../aws-iam'; +import { CfnJson, Names } from '../../core'; /** * Options for `ServiceAccount` diff --git a/packages/aws-cdk-lib/aws-eks/lib/user-data.ts b/packages/aws-cdk-lib/aws-eks/lib/user-data.ts index 7a280571d5358..25f748b851b1a 100644 --- a/packages/aws-cdk-lib/aws-eks/lib/user-data.ts +++ b/packages/aws-cdk-lib/aws-eks/lib/user-data.ts @@ -1,6 +1,6 @@ +import { BootstrapOptions, ICluster } from './cluster'; import * as autoscaling from '../../aws-autoscaling'; import { Stack } from '../../core'; -import { BootstrapOptions, ICluster } from './cluster'; // eslint-disable-next-line max-len export function renderAmazonLinuxUserData(cluster: ICluster, autoScalingGroup: autoscaling.AutoScalingGroup, options: BootstrapOptions = {}): string[] { diff --git a/packages/aws-cdk-lib/aws-eks/test/alb-controller.test.ts b/packages/aws-cdk-lib/aws-eks/test/alb-controller.test.ts index 4eb5c6d317f96..48f827412cff2 100644 --- a/packages/aws-cdk-lib/aws-eks/test/alb-controller.test.ts +++ b/packages/aws-cdk-lib/aws-eks/test/alb-controller.test.ts @@ -1,8 +1,8 @@ import * as fs from 'fs'; import * as path from 'path'; +import { testFixture } from './util'; import { Template } from '../../assertions'; import * as iam from '../../aws-iam'; -import { testFixture } from './util'; import { Cluster, KubernetesVersion, AlbController, AlbControllerVersion, HelmChart } from '../lib'; test('all vended policies are valid', () => { diff --git a/packages/aws-cdk-lib/aws-eks/test/awsauth.test.ts b/packages/aws-cdk-lib/aws-eks/test/awsauth.test.ts index 9bd996210c421..03f9503b633c2 100644 --- a/packages/aws-cdk-lib/aws-eks/test/awsauth.test.ts +++ b/packages/aws-cdk-lib/aws-eks/test/awsauth.test.ts @@ -1,7 +1,7 @@ +import { testFixtureNoVpc } from './util'; import { Template } from '../../assertions'; import * as iam from '../../aws-iam'; import * as cdk from '../../core'; -import { testFixtureNoVpc } from './util'; import { Cluster, KubernetesManifest, KubernetesVersion } from '../lib'; import { AwsAuth } from '../lib/aws-auth'; diff --git a/packages/aws-cdk-lib/aws-eks/test/bucket-pinger/bucket-pinger.ts b/packages/aws-cdk-lib/aws-eks/test/bucket-pinger/bucket-pinger.ts index 3bc2cbab063f3..bb458c9161178 100644 --- a/packages/aws-cdk-lib/aws-eks/test/bucket-pinger/bucket-pinger.ts +++ b/packages/aws-cdk-lib/aws-eks/test/bucket-pinger/bucket-pinger.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as lambda from '../../../aws-lambda'; import { CustomResource, Token, Duration } from '../../../core'; import * as cr from '../../../custom-resources'; -import { Construct } from 'constructs'; export interface BucketPingerProps { readonly bucketName: string; diff --git a/packages/aws-cdk-lib/aws-eks/test/cluster.test.ts b/packages/aws-cdk-lib/aws-eks/test/cluster.test.ts index 0fc838a105b2f..1457dc785c9b4 100644 --- a/packages/aws-cdk-lib/aws-eks/test/cluster.test.ts +++ b/packages/aws-cdk-lib/aws-eks/test/cluster.test.ts @@ -1,5 +1,9 @@ import * as fs from 'fs'; import * as path from 'path'; +import * as cdk8s from 'cdk8s'; +import { Construct } from 'constructs'; +import * as YAML from 'yaml'; +import { testFixture, testFixtureNoVpc } from './util'; import { Annotations, Match, Template } from '../../assertions'; import * as asg from '../../aws-autoscaling'; import * as ec2 from '../../aws-ec2'; @@ -7,10 +11,6 @@ import * as iam from '../../aws-iam'; import * as kms from '../../aws-kms'; import * as lambda from '../../aws-lambda'; import * as cdk from '../../core'; -import * as cdk8s from 'cdk8s'; -import { Construct } from 'constructs'; -import * as YAML from 'yaml'; -import { testFixture, testFixtureNoVpc } from './util'; import * as eks from '../lib'; import { HelmChart } from '../lib'; import { KubectlProvider } from '../lib/kubectl-provider'; diff --git a/packages/aws-cdk-lib/aws-eks/test/helm-chart.test.ts b/packages/aws-cdk-lib/aws-eks/test/helm-chart.test.ts index f2cd895abbea9..8332635b6a218 100644 --- a/packages/aws-cdk-lib/aws-eks/test/helm-chart.test.ts +++ b/packages/aws-cdk-lib/aws-eks/test/helm-chart.test.ts @@ -1,8 +1,8 @@ import * as path from 'path'; +import { testFixtureCluster } from './util'; import { Template } from '../../assertions'; import { Asset } from '../../aws-s3-assets'; import { Duration } from '../../core'; -import { testFixtureCluster } from './util'; import * as eks from '../lib'; /* eslint-disable max-len */ diff --git a/packages/aws-cdk-lib/aws-eks/test/k8s-manifest.test.ts b/packages/aws-cdk-lib/aws-eks/test/k8s-manifest.test.ts index 11bbac8ea653d..359bcc1bbb19d 100644 --- a/packages/aws-cdk-lib/aws-eks/test/k8s-manifest.test.ts +++ b/packages/aws-cdk-lib/aws-eks/test/k8s-manifest.test.ts @@ -1,6 +1,6 @@ +import { testFixtureNoVpc, testFixtureCluster } from './util'; import { Template } from '../../assertions'; import { CfnResource, Stack } from '../../core'; -import { testFixtureNoVpc, testFixtureCluster } from './util'; import { Cluster, KubernetesManifest, KubernetesVersion, HelmChart } from '../lib'; /* eslint-disable max-len */ diff --git a/packages/aws-cdk-lib/aws-eks/test/nodegroup.test.ts b/packages/aws-cdk-lib/aws-eks/test/nodegroup.test.ts index 728db296754c6..ff066fa92deef 100644 --- a/packages/aws-cdk-lib/aws-eks/test/nodegroup.test.ts +++ b/packages/aws-cdk-lib/aws-eks/test/nodegroup.test.ts @@ -1,8 +1,8 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; +import { testFixture } from './util'; import { Template } from '../../assertions'; import * as ec2 from '../../aws-ec2'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../core'; -import { testFixture } from './util'; import * as eks from '../lib'; import { NodegroupAmiType, TaintEffect } from '../lib'; diff --git a/packages/aws-cdk-lib/aws-eks/test/pinger/pinger.ts b/packages/aws-cdk-lib/aws-eks/test/pinger/pinger.ts index 10b2efc626764..60188d65a238d 100644 --- a/packages/aws-cdk-lib/aws-eks/test/pinger/pinger.ts +++ b/packages/aws-cdk-lib/aws-eks/test/pinger/pinger.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import * as ec2 from '../../../aws-ec2'; import * as lambda from '../../../aws-lambda'; import { CustomResource, Token, Duration } from '../../../core'; import * as cr from '../../../custom-resources'; -import { Construct } from 'constructs'; export interface PingerProps { readonly url: string; diff --git a/packages/aws-cdk-lib/aws-eks/test/service-account.test.ts b/packages/aws-cdk-lib/aws-eks/test/service-account.test.ts index d673f67ec0e70..942b1ce1a4c16 100644 --- a/packages/aws-cdk-lib/aws-eks/test/service-account.test.ts +++ b/packages/aws-cdk-lib/aws-eks/test/service-account.test.ts @@ -1,6 +1,6 @@ +import { testFixture, testFixtureCluster } from './util'; import { Template } from '../../assertions'; import * as iam from '../../aws-iam'; -import { testFixture, testFixtureCluster } from './util'; import * as eks from '../lib'; /* eslint-disable max-len */ diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancing/lib/load-balancer.ts b/packages/aws-cdk-lib/aws-elasticloadbalancing/lib/load-balancer.ts index bba10b2e8f3d2..7bf17e38cbed4 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancing/lib/load-balancer.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancing/lib/load-balancer.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; +import { CfnLoadBalancer } from './elasticloadbalancing.generated'; import { Connections, IConnectable, Instance, ISecurityGroup, IVpc, Peer, Port, SecurityGroup, SelectedSubnets, SubnetSelection, SubnetType, } from '../../aws-ec2'; import { Duration, Lazy, Resource } from '../../core'; -import { Construct } from 'constructs'; -import { CfnLoadBalancer } from './elasticloadbalancing.generated'; /** * Construction properties for a LoadBalancer diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancing/test/loadbalancer.test.ts b/packages/aws-cdk-lib/aws-elasticloadbalancing/test/loadbalancer.test.ts index b190f2a9327cf..92cae7e813bd7 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancing/test/loadbalancer.test.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancing/test/loadbalancer.test.ts @@ -1,6 +1,6 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from '../../assertions'; import { AmazonLinuxGeneration, Connections, Instance, InstanceClass, InstanceSize, InstanceType, MachineImage, Peer, SubnetType, Vpc } from '../../aws-ec2'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Duration, Stack } from '../../core'; import { ILoadBalancerTarget, InstanceTarget, LoadBalancer, LoadBalancingProtocol } from '../lib'; diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-listener-action.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-listener-action.ts index f3135ecd94ca9..589c3f1f24cb7 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-listener-action.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-listener-action.ts @@ -49,7 +49,7 @@ export class ListenerAction implements IListenerAction { }); } - return ListenerAction.weightedForward(targetGroups.map(g => ({ targetGroup: g, weight: 1 })), options) + return ListenerAction.weightedForward(targetGroups.map(g => ({ targetGroup: g, weight: 1 })), options); } /** diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-listener-rule.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-listener-rule.ts index 6dc422fdf8ed8..c9627e18688c8 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-listener-rule.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-listener-rule.ts @@ -254,8 +254,8 @@ export class ApplicationListenerRule extends Construct { this.configureAction(props.action); } - if(props.targetGroups) { - this.configureAction(ListenerAction.forward(props.targetGroups)); + if (props.targetGroups) { + this.configureAction(ListenerAction.forward(props.targetGroups)); } if (props.fixedResponse) { diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-listener.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-listener.ts index e51673f330ffc..bbb7d02f34214 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-listener.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-listener.ts @@ -1,7 +1,3 @@ -import * as ec2 from '../../../aws-ec2'; -import * as cxschema from '../../../cloud-assembly-schema'; -import { Duration, Lazy, Resource, Token } from '../../../core'; -import * as cxapi from '../../../cx-api'; import { Construct } from 'constructs'; import { ListenerAction } from './application-listener-action'; import { ApplicationListenerCertificate } from './application-listener-certificate'; @@ -9,6 +5,10 @@ import { ApplicationListenerRule, FixedResponse, RedirectResponse } from './appl import { IApplicationLoadBalancer } from './application-load-balancer'; import { ApplicationTargetGroup, IApplicationLoadBalancerTarget, IApplicationTargetGroup } from './application-target-group'; import { ListenerCondition } from './conditions'; +import * as ec2 from '../../../aws-ec2'; +import * as cxschema from '../../../cloud-assembly-schema'; +import { Duration, Lazy, Resource, Token } from '../../../core'; +import * as cxapi from '../../../cx-api'; import { BaseListener, BaseListenerLookupOptions, IListener } from '../shared/base-listener'; import { HealthCheck } from '../shared/base-target-group'; import { ApplicationProtocol, ApplicationProtocolVersion, TargetGroupLoadBalancingAlgorithmType, IpAddressType, SslPolicy } from '../shared/enums'; diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-load-balancer.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-load-balancer.ts index d0c339e23ddb0..fef38ff28be08 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-load-balancer.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-load-balancer.ts @@ -1,11 +1,11 @@ +import { Construct } from 'constructs'; +import { ApplicationListener, BaseApplicationListenerProps } from './application-listener'; +import { ListenerAction } from './application-listener-action'; import * as cloudwatch from '../../../aws-cloudwatch'; import * as ec2 from '../../../aws-ec2'; import * as cxschema from '../../../cloud-assembly-schema'; import { Duration, Lazy, Names, Resource } from '../../../core'; import * as cxapi from '../../../cx-api'; -import { Construct } from 'constructs'; -import { ApplicationListener, BaseApplicationListenerProps } from './application-listener'; -import { ListenerAction } from './application-listener-action'; import { ApplicationELBMetrics } from '../elasticloadbalancingv2-canned-metrics.generated'; import { BaseLoadBalancer, BaseLoadBalancerLookupOptions, BaseLoadBalancerProps, ILoadBalancerV2 } from '../shared/base-load-balancer'; import { IpAddressType, ApplicationProtocol, DesyncMitigationMode } from '../shared/enums'; diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-target-group.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-target-group.ts index e5a57aaca7e4c..253c29ad4b129 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-target-group.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-target-group.ts @@ -1,9 +1,9 @@ -import * as cloudwatch from '../../../aws-cloudwatch'; -import * as ec2 from '../../../aws-ec2'; -import { Aws, Annotations, Duration, Token } from '../../../core'; import { IConstruct, Construct } from 'constructs'; import { IApplicationListener } from './application-listener'; import { HttpCodeTarget } from './application-load-balancer'; +import * as cloudwatch from '../../../aws-cloudwatch'; +import * as ec2 from '../../../aws-ec2'; +import { Aws, Annotations, Duration, Token } from '../../../core'; import { ApplicationELBMetrics } from '../elasticloadbalancingv2-canned-metrics.generated'; import { BaseTargetGroupProps, ITargetGroup, loadBalancerNameFromListenerArn, LoadBalancerTargetProps, diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/nlb/network-listener.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/nlb/network-listener.ts index e2b25492af90c..d15f730ed8851 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/nlb/network-listener.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/nlb/network-listener.ts @@ -1,10 +1,10 @@ -import * as cxschema from '../../../cloud-assembly-schema'; -import { Duration, Resource, Lazy } from '../../../core'; import { Construct } from 'constructs'; import { NetworkListenerAction } from './network-listener-action'; import { NetworkListenerCertificate } from './network-listener-certificate'; import { INetworkLoadBalancer } from './network-load-balancer'; import { INetworkLoadBalancerTarget, INetworkTargetGroup, NetworkTargetGroup } from './network-target-group'; +import * as cxschema from '../../../cloud-assembly-schema'; +import { Duration, Resource, Lazy } from '../../../core'; import { BaseListener, BaseListenerLookupOptions, IListener } from '../shared/base-listener'; import { HealthCheck } from '../shared/base-target-group'; import { AlpnPolicy, Protocol, SslPolicy } from '../shared/enums'; diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/nlb/network-load-balancer.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/nlb/network-load-balancer.ts index e522fad91139d..ff512bc0e1613 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/nlb/network-load-balancer.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/nlb/network-load-balancer.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; +import { BaseNetworkListenerProps, NetworkListener } from './network-listener'; import * as cloudwatch from '../../../aws-cloudwatch'; import * as ec2 from '../../../aws-ec2'; import * as cxschema from '../../../cloud-assembly-schema'; import { Resource } from '../../../core'; import * as cxapi from '../../../cx-api'; -import { Construct } from 'constructs'; -import { BaseNetworkListenerProps, NetworkListener } from './network-listener'; import { NetworkELBMetrics } from '../elasticloadbalancingv2-canned-metrics.generated'; import { BaseLoadBalancer, BaseLoadBalancerLookupOptions, BaseLoadBalancerProps, ILoadBalancerV2 } from '../shared/base-load-balancer'; import { parseLoadBalancerFullName } from '../shared/util'; diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/nlb/network-target-group.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/nlb/network-target-group.ts index 3752edd2b7629..509741b701c17 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/nlb/network-target-group.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/nlb/network-target-group.ts @@ -1,7 +1,7 @@ -import * as cloudwatch from '../../../aws-cloudwatch'; -import * as cdk from '../../../core'; import { Construct } from 'constructs'; import { INetworkListener } from './network-listener'; +import * as cloudwatch from '../../../aws-cloudwatch'; +import * as cdk from '../../../core'; import { BaseTargetGroupProps, HealthCheck, ITargetGroup, loadBalancerNameFromListenerArn, LoadBalancerTargetProps, TargetGroupAttributes, TargetGroupBase, TargetGroupImportProps, diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/base-listener.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/base-listener.ts index f88496216ec1a..9c2aa911a247e 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/base-listener.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/base-listener.ts @@ -1,9 +1,9 @@ -import * as cxschema from '../../../cloud-assembly-schema'; -import { Annotations, ContextProvider, IResource, Lazy, Resource, Token } from '../../../core'; -import * as cxapi from '../../../cx-api'; import { Construct } from 'constructs'; import { IListenerAction } from './listener-action'; import { mapTagMapToCxschema } from './util'; +import * as cxschema from '../../../cloud-assembly-schema'; +import { Annotations, ContextProvider, IResource, Lazy, Resource, Token } from '../../../core'; +import * as cxapi from '../../../cx-api'; import { CfnListener } from '../elasticloadbalancingv2.generated'; /** @@ -99,6 +99,7 @@ export abstract class BaseListener extends Resource implements IListener { loadBalancerType: options.loadBalancerType, } as cxschema.LoadBalancerListenerContextQuery, dummyValue: { + // eslint-disable-next-line @aws-cdk/no-literal-partition listenerArn: `arn:aws:elasticloadbalancing:us-west-2:123456789012:listener/${options.loadBalancerType}/my-load-balancer/50dc6c495c0c9188/f2f7dc8efc522ab2`, listenerPort: 80, securityGroupIds: ['sg-123456789012'], diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/base-load-balancer.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/base-load-balancer.ts index bc0352a2968bf..436dbf54254ae 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/base-load-balancer.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/base-load-balancer.ts @@ -1,3 +1,5 @@ +import { Construct } from 'constructs'; +import { Attributes, ifUndefined, mapTagMapToCxschema, renderAttributes } from './util'; import * as ec2 from '../../../aws-ec2'; import * as iam from '../../../aws-iam'; import { PolicyStatement, ServicePrincipal } from '../../../aws-iam'; @@ -6,8 +8,6 @@ import * as cxschema from '../../../cloud-assembly-schema'; import { ContextProvider, IResource, Lazy, Resource, Stack, Token } from '../../../core'; import * as cxapi from '../../../cx-api'; import { RegionInfo } from '../../../region-info'; -import { Construct } from 'constructs'; -import { Attributes, ifUndefined, mapTagMapToCxschema, renderAttributes } from './util'; import { CfnLoadBalancer } from '../elasticloadbalancingv2.generated'; /** @@ -130,6 +130,7 @@ export abstract class BaseLoadBalancer extends Resource { } as cxschema.LoadBalancerContextQuery, dummyValue: { ipAddressType: cxapi.LoadBalancerIpAddressType.DUAL_STACK, + // eslint-disable-next-line @aws-cdk/no-literal-partition loadBalancerArn: `arn:aws:elasticloadbalancing:us-west-2:123456789012:loadbalancer/${options.loadBalancerType}/my-load-balancer/50dc6c495c0c9188`, loadBalancerCanonicalHostedZoneId: 'Z3DZXE0EXAMPLE', loadBalancerDnsName: 'my-load-balancer-1234567890.us-west-2.elb.amazonaws.com', diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/base-target-group.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/base-target-group.ts index 826c7c1ad16bb..dc180d2d9f8f1 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/base-target-group.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/base-target-group.ts @@ -1,8 +1,8 @@ -import * as ec2 from '../../../aws-ec2'; -import * as cdk from '../../../core'; import { Construct, DependencyGroup, IConstruct, IDependable } from 'constructs'; import { Protocol, TargetType } from './enums'; import { Attributes, renderAttributes } from './util'; +import * as ec2 from '../../../aws-ec2'; +import * as cdk from '../../../core'; import { CfnTargetGroup } from '../elasticloadbalancingv2.generated'; /** diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/imported.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/imported.ts index 39c32216a54bb..0e3e0e52f5cff 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/imported.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/imported.ts @@ -1,6 +1,6 @@ -import * as cdk from '../../../core'; import { Construct, DependencyGroup, IDependable } from 'constructs'; import { ITargetGroup, TargetGroupImportProps } from './base-target-group'; +import * as cdk from '../../../core'; /** * Base internal class for existing target groups diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/util.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/util.ts index 4ef628989d4f4..ffad9627f52c1 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/util.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/util.ts @@ -1,6 +1,6 @@ +import { ApplicationProtocol, Protocol } from './enums'; import * as cxschema from '../../../cloud-assembly-schema'; import { Arn, ArnFormat, Fn, Token } from '../../../core'; -import { ApplicationProtocol, Protocol } from './enums'; export type Attributes = { [key: string]: string | undefined }; diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/alb/listener.test.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/alb/listener.test.ts index 8911186f0f98d..907cf8a20a683 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/alb/listener.test.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/alb/listener.test.ts @@ -1,11 +1,11 @@ +import { describeDeprecated, testDeprecated } from '@aws-cdk/cdk-build-tools'; +import * as constructs from 'constructs'; import { Match, Template } from '../../../assertions'; import * as acm from '../../../aws-certificatemanager'; import { Metric } from '../../../aws-cloudwatch'; import * as ec2 from '../../../aws-ec2'; -import { describeDeprecated, testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../../core'; import { SecretValue } from '../../../core'; -import * as constructs from 'constructs'; import * as elbv2 from '../../lib'; import { FakeSelfRegisteringTarget } from '../helpers'; diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/alb/security-group.test.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/alb/security-group.test.ts index 5e8f538064703..f40c9a44738b6 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/alb/security-group.test.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/alb/security-group.test.ts @@ -1,6 +1,6 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from '../../../assertions'; import * as ec2 from '../../../aws-ec2'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../../core'; import * as elbv2 from '../../lib'; import { FakeSelfRegisteringTarget } from '../helpers'; diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/alb/target-group.test.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/alb/target-group.test.ts index 69c85c77205e2..60928abdc46ae 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/alb/target-group.test.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/alb/target-group.test.ts @@ -1,6 +1,6 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from '../../../assertions'; import * as ec2 from '../../../aws-ec2'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../../core'; import * as elbv2 from '../../lib'; import { FakeSelfRegisteringTarget } from '../helpers'; diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/helpers.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/helpers.ts index c31d7f54fb05c..b404fe9ed8aae 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/helpers.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/helpers.ts @@ -1,5 +1,5 @@ -import * as ec2 from '../../aws-ec2'; import { Construct } from 'constructs'; +import * as ec2 from '../../aws-ec2'; import * as elbv2 from '../lib'; export class FakeSelfRegisteringTarget extends Construct implements elbv2.IApplicationLoadBalancerTarget, elbv2.INetworkLoadBalancerTarget, diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/nlb/listener.test.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/nlb/listener.test.ts index 15ba68b9e0341..b9a5a3a4b2875 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/nlb/listener.test.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/nlb/listener.test.ts @@ -1,9 +1,9 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; +import * as constructs from 'constructs'; import { Match, Template } from '../../../assertions'; import * as acm from '../../../aws-certificatemanager'; import * as ec2 from '../../../aws-ec2'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../../core'; -import * as constructs from 'constructs'; import * as elbv2 from '../../lib'; import { FakeSelfRegisteringTarget } from '../helpers'; diff --git a/packages/aws-cdk-lib/aws-elasticsearch/lib/domain.ts b/packages/aws-cdk-lib/aws-elasticsearch/lib/domain.ts index 3867cf7f7d200..3080bfeea5d34 100644 --- a/packages/aws-cdk-lib/aws-elasticsearch/lib/domain.ts +++ b/packages/aws-cdk-lib/aws-elasticsearch/lib/domain.ts @@ -1,5 +1,10 @@ import { URL } from 'url'; +import { Construct } from 'constructs'; +import { ElasticsearchAccessPolicy } from './elasticsearch-access-policy'; +import { CfnDomain } from './elasticsearch.generated'; +import { LogGroupResourcePolicy } from './log-group-resource-policy'; +import * as perms from './perms'; import * as acm from '../../aws-certificatemanager'; import { Metric, MetricOptions, Statistic } from '../../aws-cloudwatch'; import * as ec2 from '../../aws-ec2'; @@ -9,12 +14,7 @@ import * as logs from '../../aws-logs'; import * as route53 from '../../aws-route53'; import * as secretsmanager from '../../aws-secretsmanager'; import * as cdk from '../../core'; -import { Construct } from 'constructs'; -import { ElasticsearchAccessPolicy } from './elasticsearch-access-policy'; -import { CfnDomain } from './elasticsearch.generated'; -import { LogGroupResourcePolicy } from './log-group-resource-policy'; -import * as perms from './perms'; /** * Elasticsearch version diff --git a/packages/aws-cdk-lib/aws-elasticsearch/lib/elasticsearch-access-policy.ts b/packages/aws-cdk-lib/aws-elasticsearch/lib/elasticsearch-access-policy.ts index 8a1626770a6e8..1a87c2fe1a820 100644 --- a/packages/aws-cdk-lib/aws-elasticsearch/lib/elasticsearch-access-policy.ts +++ b/packages/aws-cdk-lib/aws-elasticsearch/lib/elasticsearch-access-policy.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as iam from '../../aws-iam'; import * as cdk from '../../core'; import * as cr from '../../custom-resources'; -import { Construct } from 'constructs'; /** * Construction properties for ElasticsearchAccessPolicy diff --git a/packages/aws-cdk-lib/aws-elasticsearch/lib/log-group-resource-policy.ts b/packages/aws-cdk-lib/aws-elasticsearch/lib/log-group-resource-policy.ts index 5a9058076016d..02efb71afc184 100644 --- a/packages/aws-cdk-lib/aws-elasticsearch/lib/log-group-resource-policy.ts +++ b/packages/aws-cdk-lib/aws-elasticsearch/lib/log-group-resource-policy.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as iam from '../../aws-iam'; import * as cr from '../../custom-resources'; -import { Construct } from 'constructs'; /** * Construction properties for LogGroupResourcePolicy diff --git a/packages/aws-cdk-lib/aws-elasticsearch/test/domain.test.ts b/packages/aws-cdk-lib/aws-elasticsearch/test/domain.test.ts index 2c55825bb24a9..451ae9f564961 100644 --- a/packages/aws-cdk-lib/aws-elasticsearch/test/domain.test.ts +++ b/packages/aws-cdk-lib/aws-elasticsearch/test/domain.test.ts @@ -1,4 +1,5 @@ /* eslint-disable jest/expect-expect */ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Match, Template } from '../../assertions'; import * as acm from '../../aws-certificatemanager'; import { Metric, Statistic } from '../../aws-cloudwatch'; @@ -7,7 +8,6 @@ import * as iam from '../../aws-iam'; import * as kms from '../../aws-kms'; import * as logs from '../../aws-logs'; import * as route53 from '../../aws-route53'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { App, Stack, Duration, SecretValue, CfnParameter, Token } from '../../core'; import { Domain, ElasticsearchVersion } from '../lib/domain'; diff --git a/packages/aws-cdk-lib/aws-events-targets/lib/api-destination.ts b/packages/aws-cdk-lib/aws-events-targets/lib/api-destination.ts index 538cdaaa356af..3bbc61917bf35 100644 --- a/packages/aws-cdk-lib/aws-events-targets/lib/api-destination.ts +++ b/packages/aws-cdk-lib/aws-events-targets/lib/api-destination.ts @@ -1,6 +1,6 @@ +import { addToDeadLetterQueueResourcePolicy, bindBaseTargetConfig, singletonEventRole, TargetBaseProps } from './util'; import * as events from '../../aws-events'; import * as iam from '../../aws-iam'; -import { addToDeadLetterQueueResourcePolicy, bindBaseTargetConfig, singletonEventRole, TargetBaseProps } from './util'; /** * Customize the EventBridge Api Destinations Target diff --git a/packages/aws-cdk-lib/aws-events-targets/lib/api-gateway.ts b/packages/aws-cdk-lib/aws-events-targets/lib/api-gateway.ts index b6e364d2dcf80..11fd71abcf056 100644 --- a/packages/aws-cdk-lib/aws-events-targets/lib/api-gateway.ts +++ b/packages/aws-cdk-lib/aws-events-targets/lib/api-gateway.ts @@ -1,7 +1,7 @@ +import { addToDeadLetterQueueResourcePolicy, bindBaseTargetConfig, singletonEventRole, TargetBaseProps } from './util'; import * as api from '../../aws-apigateway'; import * as events from '../../aws-events'; import * as iam from '../../aws-iam'; -import { addToDeadLetterQueueResourcePolicy, bindBaseTargetConfig, singletonEventRole, TargetBaseProps } from './util'; /** * Customize the API Gateway Event Target diff --git a/packages/aws-cdk-lib/aws-events-targets/lib/aws-api.ts b/packages/aws-cdk-lib/aws-events-targets/lib/aws-api.ts index 74c09c0b9c94f..028e48fc224d5 100644 --- a/packages/aws-cdk-lib/aws-events-targets/lib/aws-api.ts +++ b/packages/aws-cdk-lib/aws-events-targets/lib/aws-api.ts @@ -1,10 +1,10 @@ import * as path from 'path'; +import { metadata } from './sdk-api-metadata.generated'; +import { addLambdaPermission } from './util'; import * as events from '../../aws-events'; import * as iam from '../../aws-iam'; import * as lambda from '../../aws-lambda'; import { Annotations } from '../../core'; -import { metadata } from './sdk-api-metadata.generated'; -import { addLambdaPermission } from './util'; /** * AWS SDK service metadata. diff --git a/packages/aws-cdk-lib/aws-events-targets/lib/batch.ts b/packages/aws-cdk-lib/aws-events-targets/lib/batch.ts index b0155b92adfd4..9a0dda428bec7 100644 --- a/packages/aws-cdk-lib/aws-events-targets/lib/batch.ts +++ b/packages/aws-cdk-lib/aws-events-targets/lib/batch.ts @@ -1,8 +1,8 @@ +import { IConstruct } from 'constructs'; +import { addToDeadLetterQueueResourcePolicy, bindBaseTargetConfig, singletonEventRole, TargetBaseProps } from './util'; import * as events from '../../aws-events'; import * as iam from '../../aws-iam'; import { Names, Token } from '../../core'; -import { IConstruct } from 'constructs'; -import { addToDeadLetterQueueResourcePolicy, bindBaseTargetConfig, singletonEventRole, TargetBaseProps } from './util'; /** * Customize the Batch Job Event Target diff --git a/packages/aws-cdk-lib/aws-events-targets/lib/codebuild.ts b/packages/aws-cdk-lib/aws-events-targets/lib/codebuild.ts index 9b58fce51e3ac..d5b17b1d45635 100644 --- a/packages/aws-cdk-lib/aws-events-targets/lib/codebuild.ts +++ b/packages/aws-cdk-lib/aws-events-targets/lib/codebuild.ts @@ -1,7 +1,7 @@ +import { addToDeadLetterQueueResourcePolicy, bindBaseTargetConfig, singletonEventRole, TargetBaseProps } from './util'; import * as codebuild from '../../aws-codebuild'; import * as events from '../../aws-events'; import * as iam from '../../aws-iam'; -import { addToDeadLetterQueueResourcePolicy, bindBaseTargetConfig, singletonEventRole, TargetBaseProps } from './util'; /** * Customize the CodeBuild Event Target diff --git a/packages/aws-cdk-lib/aws-events-targets/lib/codepipeline.ts b/packages/aws-cdk-lib/aws-events-targets/lib/codepipeline.ts index 2c4c2cf7db95a..d9248dcb20d20 100644 --- a/packages/aws-cdk-lib/aws-events-targets/lib/codepipeline.ts +++ b/packages/aws-cdk-lib/aws-events-targets/lib/codepipeline.ts @@ -1,7 +1,7 @@ +import { bindBaseTargetConfig, singletonEventRole, TargetBaseProps } from './util'; import * as codepipeline from '../../aws-codepipeline'; import * as events from '../../aws-events'; import * as iam from '../../aws-iam'; -import { bindBaseTargetConfig, singletonEventRole, TargetBaseProps } from './util'; /** * Customization options when creating a `CodePipeline` event target. diff --git a/packages/aws-cdk-lib/aws-events-targets/lib/ecs-task.ts b/packages/aws-cdk-lib/aws-events-targets/lib/ecs-task.ts index cfe84d9d04e49..6c04a5d5fe623 100644 --- a/packages/aws-cdk-lib/aws-events-targets/lib/ecs-task.ts +++ b/packages/aws-cdk-lib/aws-events-targets/lib/ecs-task.ts @@ -1,11 +1,11 @@ +import { Construct } from 'constructs'; +import { ContainerOverride } from './ecs-task-properties'; +import { addToDeadLetterQueueResourcePolicy, bindBaseTargetConfig, singletonEventRole, TargetBaseProps } from './util'; import * as ec2 from '../../aws-ec2'; import * as ecs from '../../aws-ecs'; import * as events from '../../aws-events'; import * as iam from '../../aws-iam'; import * as cdk from '../../core'; -import { Construct } from 'constructs'; -import { ContainerOverride } from './ecs-task-properties'; -import { addToDeadLetterQueueResourcePolicy, bindBaseTargetConfig, singletonEventRole, TargetBaseProps } from './util'; /** * Metadata that you apply to a resource to help categorize and organize the resource. Each tag consists of a key and an optional value, both of which you define. diff --git a/packages/aws-cdk-lib/aws-events-targets/lib/event-bus.ts b/packages/aws-cdk-lib/aws-events-targets/lib/event-bus.ts index 034877bd1d896..72ce2ecdb102f 100644 --- a/packages/aws-cdk-lib/aws-events-targets/lib/event-bus.ts +++ b/packages/aws-cdk-lib/aws-events-targets/lib/event-bus.ts @@ -1,7 +1,7 @@ +import { singletonEventRole, addToDeadLetterQueueResourcePolicy } from './util'; import * as events from '../../aws-events'; import * as iam from '../../aws-iam'; import * as sqs from '../../aws-sqs'; -import { singletonEventRole, addToDeadLetterQueueResourcePolicy } from './util'; /** * Configuration properties of an Event Bus event diff --git a/packages/aws-cdk-lib/aws-events-targets/lib/kinesis-firehose-stream.ts b/packages/aws-cdk-lib/aws-events-targets/lib/kinesis-firehose-stream.ts index 71ddb6ae37f0f..f5c6d64b9039b 100644 --- a/packages/aws-cdk-lib/aws-events-targets/lib/kinesis-firehose-stream.ts +++ b/packages/aws-cdk-lib/aws-events-targets/lib/kinesis-firehose-stream.ts @@ -1,7 +1,7 @@ +import { singletonEventRole } from './util'; import * as events from '../../aws-events'; import * as iam from '../../aws-iam'; import * as firehose from '../../aws-kinesisfirehose'; -import { singletonEventRole } from './util'; /** * Customize the Firehose Stream Event Target diff --git a/packages/aws-cdk-lib/aws-events-targets/lib/kinesis-stream.ts b/packages/aws-cdk-lib/aws-events-targets/lib/kinesis-stream.ts index fcd184044ce72..b0f33fbee5fc8 100644 --- a/packages/aws-cdk-lib/aws-events-targets/lib/kinesis-stream.ts +++ b/packages/aws-cdk-lib/aws-events-targets/lib/kinesis-stream.ts @@ -1,7 +1,7 @@ +import { singletonEventRole } from './util'; import * as events from '../../aws-events'; import * as iam from '../../aws-iam'; import * as kinesis from '../../aws-kinesis'; -import { singletonEventRole } from './util'; /** * Customize the Kinesis Stream Event Target diff --git a/packages/aws-cdk-lib/aws-events-targets/lib/lambda.ts b/packages/aws-cdk-lib/aws-events-targets/lib/lambda.ts index 8d1de3f3e29ce..5490f6e618146 100644 --- a/packages/aws-cdk-lib/aws-events-targets/lib/lambda.ts +++ b/packages/aws-cdk-lib/aws-events-targets/lib/lambda.ts @@ -1,6 +1,6 @@ +import { addLambdaPermission, addToDeadLetterQueueResourcePolicy, TargetBaseProps, bindBaseTargetConfig } from './util'; import * as events from '../../aws-events'; import * as lambda from '../../aws-lambda'; -import { addLambdaPermission, addToDeadLetterQueueResourcePolicy, TargetBaseProps, bindBaseTargetConfig } from './util'; /** * Customize the Lambda Event Target diff --git a/packages/aws-cdk-lib/aws-events-targets/lib/log-group-resource-policy.ts b/packages/aws-cdk-lib/aws-events-targets/lib/log-group-resource-policy.ts index bf923f4fb29aa..531baa6a0efee 100644 --- a/packages/aws-cdk-lib/aws-events-targets/lib/log-group-resource-policy.ts +++ b/packages/aws-cdk-lib/aws-events-targets/lib/log-group-resource-policy.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as iam from '../../aws-iam'; import * as cdk from '../../core'; import * as cr from '../../custom-resources'; -import { Construct } from 'constructs'; /** * Properties to configure a log group resource policy diff --git a/packages/aws-cdk-lib/aws-events-targets/lib/log-group.ts b/packages/aws-cdk-lib/aws-events-targets/lib/log-group.ts index b66b5c597a358..4e8850fdd4fe8 100644 --- a/packages/aws-cdk-lib/aws-events-targets/lib/log-group.ts +++ b/packages/aws-cdk-lib/aws-events-targets/lib/log-group.ts @@ -1,11 +1,11 @@ +import { LogGroupResourcePolicy } from './log-group-resource-policy'; +import { TargetBaseProps, bindBaseTargetConfig } from './util'; import * as events from '../../aws-events'; import { RuleTargetInputProperties, RuleTargetInput, EventField, IRule } from '../../aws-events'; import * as iam from '../../aws-iam'; import * as logs from '../../aws-logs'; import * as cdk from '../../core'; import { ArnFormat, Stack } from '../../core'; -import { LogGroupResourcePolicy } from './log-group-resource-policy'; -import { TargetBaseProps, bindBaseTargetConfig } from './util'; /** * Options used when creating a target input template diff --git a/packages/aws-cdk-lib/aws-events-targets/lib/sns.ts b/packages/aws-cdk-lib/aws-events-targets/lib/sns.ts index de10f44e129d0..7081790f846d6 100644 --- a/packages/aws-cdk-lib/aws-events-targets/lib/sns.ts +++ b/packages/aws-cdk-lib/aws-events-targets/lib/sns.ts @@ -1,7 +1,7 @@ +import { addToDeadLetterQueueResourcePolicy, TargetBaseProps, bindBaseTargetConfig } from './util'; import * as events from '../../aws-events'; import * as iam from '../../aws-iam'; import * as sns from '../../aws-sns'; -import { addToDeadLetterQueueResourcePolicy, TargetBaseProps, bindBaseTargetConfig } from './util'; /** * Customize the SNS Topic Event Target diff --git a/packages/aws-cdk-lib/aws-events-targets/lib/sqs.ts b/packages/aws-cdk-lib/aws-events-targets/lib/sqs.ts index 5957339d39b18..4e05e5e6e68d0 100644 --- a/packages/aws-cdk-lib/aws-events-targets/lib/sqs.ts +++ b/packages/aws-cdk-lib/aws-events-targets/lib/sqs.ts @@ -1,9 +1,9 @@ +import { addToDeadLetterQueueResourcePolicy, TargetBaseProps, bindBaseTargetConfig } from './util'; import * as events from '../../aws-events'; import * as iam from '../../aws-iam'; import * as sqs from '../../aws-sqs'; import { FeatureFlags } from '../../core'; import * as cxapi from '../../cx-api'; -import { addToDeadLetterQueueResourcePolicy, TargetBaseProps, bindBaseTargetConfig } from './util'; /** * Customize the SQS Queue Event Target diff --git a/packages/aws-cdk-lib/aws-events-targets/lib/state-machine.ts b/packages/aws-cdk-lib/aws-events-targets/lib/state-machine.ts index 55e8635542d0d..e1a8fd1af0bc8 100644 --- a/packages/aws-cdk-lib/aws-events-targets/lib/state-machine.ts +++ b/packages/aws-cdk-lib/aws-events-targets/lib/state-machine.ts @@ -1,7 +1,7 @@ +import { addToDeadLetterQueueResourcePolicy, bindBaseTargetConfig, singletonEventRole, TargetBaseProps } from './util'; import * as events from '../../aws-events'; import * as iam from '../../aws-iam'; import * as sfn from '../../aws-stepfunctions'; -import { addToDeadLetterQueueResourcePolicy, bindBaseTargetConfig, singletonEventRole, TargetBaseProps } from './util'; /** * Customize the Step Functions State Machine target diff --git a/packages/aws-cdk-lib/aws-events-targets/lib/util.ts b/packages/aws-cdk-lib/aws-events-targets/lib/util.ts index 41196df1772f6..5e3e74a8b1ef3 100644 --- a/packages/aws-cdk-lib/aws-events-targets/lib/util.ts +++ b/packages/aws-cdk-lib/aws-events-targets/lib/util.ts @@ -1,9 +1,9 @@ +import { Construct, IConstruct, Node } from 'constructs'; import * as events from '../../aws-events'; import * as iam from '../../aws-iam'; import * as lambda from '../../aws-lambda'; import * as sqs from '../../aws-sqs'; import { Annotations, Names, Token, TokenComparison, Duration, PhysicalName } from '../../core'; -import { Construct, IConstruct, Node } from 'constructs'; /** * The generic properties for an RuleTarget diff --git a/packages/aws-cdk-lib/aws-events-targets/test/api-gateway/api-gateway.test.ts b/packages/aws-cdk-lib/aws-events-targets/test/api-gateway/api-gateway.test.ts index fdf00136865eb..2ebeccc5f9c6b 100644 --- a/packages/aws-cdk-lib/aws-events-targets/test/api-gateway/api-gateway.test.ts +++ b/packages/aws-cdk-lib/aws-events-targets/test/api-gateway/api-gateway.test.ts @@ -1,3 +1,4 @@ +import * as constructs from 'constructs'; import { Template } from '../../../assertions'; import * as api from '../../../aws-apigateway'; import * as events from '../../../aws-events'; @@ -5,7 +6,6 @@ import * as iam from '../../../aws-iam'; import * as lambda from '../../../aws-lambda'; import * as sqs from '../../../aws-sqs'; import * as cdk from '../../../core'; -import * as constructs from 'constructs'; import * as targets from '../../lib'; test('use api gateway rest api as an event rule target', () => { diff --git a/packages/aws-cdk-lib/aws-events-targets/test/codepipeline/pipeline.test.ts b/packages/aws-cdk-lib/aws-events-targets/test/codepipeline/pipeline.test.ts index 8683b758d3acc..c2f6f4fdcad10 100644 --- a/packages/aws-cdk-lib/aws-events-targets/test/codepipeline/pipeline.test.ts +++ b/packages/aws-cdk-lib/aws-events-targets/test/codepipeline/pipeline.test.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; import { Template } from '../../../assertions'; import * as codepipeline from '../../../aws-codepipeline'; import * as events from '../../../aws-events'; import * as iam from '../../../aws-iam'; import * as sqs from '../../../aws-sqs'; import { CfnElement, Duration, Stack } from '../../../core'; -import { Construct } from 'constructs'; import * as targets from '../../lib'; describe('CodePipeline event target', () => { diff --git a/packages/aws-cdk-lib/aws-events-targets/test/ecs/event-rule-target.test.ts b/packages/aws-cdk-lib/aws-events-targets/test/ecs/event-rule-target.test.ts index 5f4944bd8014a..3c76a7d5d11fe 100644 --- a/packages/aws-cdk-lib/aws-events-targets/test/ecs/event-rule-target.test.ts +++ b/packages/aws-cdk-lib/aws-events-targets/test/ecs/event-rule-target.test.ts @@ -1,4 +1,5 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Match, Template } from '../../../assertions'; import * as autoscaling from '../../../aws-autoscaling'; import * as ec2 from '../../../aws-ec2'; @@ -6,7 +7,6 @@ import * as ecs from '../../../aws-ecs'; import * as events from '../../../aws-events'; import * as iam from '../../../aws-iam'; import * as sqs from '../../../aws-sqs'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../../core'; import * as targets from '../../lib'; diff --git a/packages/aws-cdk-lib/aws-events-targets/test/lambda/lambda.test.ts b/packages/aws-cdk-lib/aws-events-targets/test/lambda/lambda.test.ts index 85ec98c84a67d..ec010011ba9b0 100644 --- a/packages/aws-cdk-lib/aws-events-targets/test/lambda/lambda.test.ts +++ b/packages/aws-cdk-lib/aws-events-targets/test/lambda/lambda.test.ts @@ -1,9 +1,9 @@ +import * as constructs from 'constructs'; import { Annotations, Template, Match } from '../../../assertions'; import * as events from '../../../aws-events'; import * as lambda from '../../../aws-lambda'; import * as sqs from '../../../aws-sqs'; import * as cdk from '../../../core'; -import * as constructs from 'constructs'; import * as targets from '../../lib'; test('use lambda as an event rule target', () => { diff --git a/packages/aws-cdk-lib/aws-events-targets/test/logs/log-group.test.ts b/packages/aws-cdk-lib/aws-events-targets/test/logs/log-group.test.ts index 41b899d44ea62..b1b8ba789fedf 100644 --- a/packages/aws-cdk-lib/aws-events-targets/test/logs/log-group.test.ts +++ b/packages/aws-cdk-lib/aws-events-targets/test/logs/log-group.test.ts @@ -1,8 +1,8 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from '../../../assertions'; import * as events from '../../../aws-events'; import * as logs from '../../../aws-logs'; import * as sqs from '../../../aws-sqs'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../../core'; import * as targets from '../../lib'; import { LogGroupTargetInput } from '../../lib'; diff --git a/packages/aws-cdk-lib/aws-events/lib/api-destination.ts b/packages/aws-cdk-lib/aws-events/lib/api-destination.ts index 1ef8d3d98118b..00fcf58aa7209 100644 --- a/packages/aws-cdk-lib/aws-events/lib/api-destination.ts +++ b/packages/aws-cdk-lib/aws-events/lib/api-destination.ts @@ -1,7 +1,7 @@ -import { IResource, Resource } from '../../core'; import { Construct } from 'constructs'; import { HttpMethod, IConnection } from './connection'; import { CfnApiDestination } from './events.generated'; +import { IResource, Resource } from '../../core'; /** * The event API Destination properties diff --git a/packages/aws-cdk-lib/aws-events/lib/archive.ts b/packages/aws-cdk-lib/aws-events/lib/archive.ts index 252f7118bdc0f..005b667eaf1e8 100644 --- a/packages/aws-cdk-lib/aws-events/lib/archive.ts +++ b/packages/aws-cdk-lib/aws-events/lib/archive.ts @@ -1,9 +1,9 @@ -import { Duration, Resource } from '../../core'; import { Construct } from 'constructs'; import { IEventBus } from './event-bus'; import { EventPattern } from './event-pattern'; import { CfnArchive } from './events.generated'; import { renderEventPattern } from './util'; +import { Duration, Resource } from '../../core'; /** * The event archive base properties diff --git a/packages/aws-cdk-lib/aws-events/lib/connection.ts b/packages/aws-cdk-lib/aws-events/lib/connection.ts index 8053399455ef2..99b3d27fd3583 100644 --- a/packages/aws-cdk-lib/aws-events/lib/connection.ts +++ b/packages/aws-cdk-lib/aws-events/lib/connection.ts @@ -1,6 +1,6 @@ -import { IResource, Resource, Stack, SecretValue } from '../../core'; import { Construct } from 'constructs'; import { CfnConnection } from './events.generated'; +import { IResource, Resource, Stack, SecretValue } from '../../core'; /** * An API Destination Connection diff --git a/packages/aws-cdk-lib/aws-events/lib/event-bus.ts b/packages/aws-cdk-lib/aws-events/lib/event-bus.ts index b05f6c9ee1e77..0a4d2a7107b66 100644 --- a/packages/aws-cdk-lib/aws-events/lib/event-bus.ts +++ b/packages/aws-cdk-lib/aws-events/lib/event-bus.ts @@ -1,8 +1,8 @@ -import * as iam from '../../aws-iam'; -import { ArnFormat, IResource, Lazy, Names, Resource, Stack, Token } from '../../core'; import { Construct } from 'constructs'; import { Archive, BaseArchiveProps } from './archive'; import { CfnEventBus, CfnEventBusPolicy } from './events.generated'; +import * as iam from '../../aws-iam'; +import { ArnFormat, IResource, Lazy, Names, Resource, Stack, Token } from '../../core'; /** * Interface which all EventBus based classes MUST implement diff --git a/packages/aws-cdk-lib/aws-events/lib/input.ts b/packages/aws-cdk-lib/aws-events/lib/input.ts index 9895f7359db8d..67148a12b1459 100644 --- a/packages/aws-cdk-lib/aws-events/lib/input.ts +++ b/packages/aws-cdk-lib/aws-events/lib/input.ts @@ -1,8 +1,8 @@ +import { IRule } from './rule-ref'; import { captureStackTrace, DefaultTokenResolver, IResolvable, IResolveContext, Lazy, Stack, StringConcat, Token, Tokenization, } from '../../core'; -import { IRule } from './rule-ref'; /** * The input to send to the event target diff --git a/packages/aws-cdk-lib/aws-events/lib/rule.ts b/packages/aws-cdk-lib/aws-events/lib/rule.ts index 68f6a2da27b44..a228ee6ecbbe5 100644 --- a/packages/aws-cdk-lib/aws-events/lib/rule.ts +++ b/packages/aws-cdk-lib/aws-events/lib/rule.ts @@ -1,5 +1,3 @@ -import { IRole, PolicyStatement, Role, ServicePrincipal } from '../../aws-iam'; -import { App, IResource, Lazy, Names, Resource, Stack, Token, TokenComparison, PhysicalName, ArnFormat, Annotations } from '../../core'; import { Node, Construct } from 'constructs'; import { IEventBus } from './event-bus'; import { EventPattern } from './event-pattern'; @@ -9,6 +7,8 @@ import { IRule } from './rule-ref'; import { Schedule } from './schedule'; import { IRuleTarget } from './target'; import { mergeEventPattern, renderEventPattern } from './util'; +import { IRole, PolicyStatement, Role, ServicePrincipal } from '../../aws-iam'; +import { App, IResource, Lazy, Names, Resource, Stack, Token, TokenComparison, PhysicalName, ArnFormat, Annotations } from '../../core'; /** * Properties for defining an EventBridge Rule diff --git a/packages/aws-cdk-lib/aws-events/lib/schedule.ts b/packages/aws-cdk-lib/aws-events/lib/schedule.ts index 21399a620099b..d9e27642fc8e0 100644 --- a/packages/aws-cdk-lib/aws-events/lib/schedule.ts +++ b/packages/aws-cdk-lib/aws-events/lib/schedule.ts @@ -1,5 +1,5 @@ -import { Annotations, Duration } from '../../core'; import { Construct } from 'constructs'; +import { Annotations, Duration } from '../../core'; /** * Schedule for scheduled event rules diff --git a/packages/aws-cdk-lib/aws-events/lib/target.ts b/packages/aws-cdk-lib/aws-events/lib/target.ts index f47b426d250f7..e836bcf75e53d 100644 --- a/packages/aws-cdk-lib/aws-events/lib/target.ts +++ b/packages/aws-cdk-lib/aws-events/lib/target.ts @@ -1,8 +1,8 @@ -import * as iam from '../../aws-iam'; import { IConstruct } from 'constructs'; import { CfnRule } from './events.generated'; import { RuleTargetInput } from './input'; import { IRule } from './rule-ref'; +import * as iam from '../../aws-iam'; /** * An abstract target for EventRules. diff --git a/packages/aws-cdk-lib/aws-events/test/event-bus.test.ts b/packages/aws-cdk-lib/aws-events/test/event-bus.test.ts index 6306094398304..f657aa6cf0565 100644 --- a/packages/aws-cdk-lib/aws-events/test/event-bus.test.ts +++ b/packages/aws-cdk-lib/aws-events/test/event-bus.test.ts @@ -1,7 +1,7 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from '../../assertions'; import * as iam from '../../aws-iam'; import { Effect } from '../../aws-iam'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Aws, CfnResource, Stack, Arn, App, PhysicalName, CfnOutput } from '../../core'; import { EventBus } from '../lib'; diff --git a/packages/aws-cdk-lib/aws-events/test/rule.test.ts b/packages/aws-cdk-lib/aws-events/test/rule.test.ts index 2260ed73a8ae0..537859aa9b4f0 100644 --- a/packages/aws-cdk-lib/aws-events/test/rule.test.ts +++ b/packages/aws-cdk-lib/aws-events/test/rule.test.ts @@ -1,8 +1,8 @@ /* eslint-disable object-curly-newline */ +import { Construct, IConstruct } from 'constructs'; import { Annotations, Match, Template } from '../../assertions'; import * as iam from '../../aws-iam'; import * as cdk from '../../core'; -import { Construct, IConstruct } from 'constructs'; import { EventBus, EventField, IRule, IRuleTarget, RuleTargetConfig, RuleTargetInput, Schedule, Match as m } from '../lib'; import { Rule } from '../lib/rule'; diff --git a/packages/aws-cdk-lib/aws-fsx/lib/lustre-file-system.ts b/packages/aws-cdk-lib/aws-fsx/lib/lustre-file-system.ts index ff7b8f5855d19..48328d80c126b 100644 --- a/packages/aws-cdk-lib/aws-fsx/lib/lustre-file-system.ts +++ b/packages/aws-cdk-lib/aws-fsx/lib/lustre-file-system.ts @@ -1,9 +1,9 @@ -import { Connections, ISecurityGroup, ISubnet, Port, SecurityGroup } from '../../aws-ec2'; -import { Aws, Token } from '../../core'; import { Construct } from 'constructs'; import { FileSystemAttributes, FileSystemBase, FileSystemProps, IFileSystem } from './file-system'; import { CfnFileSystem } from './fsx.generated'; import { LustreMaintenanceTime } from './maintenance-time'; +import { Connections, ISecurityGroup, ISubnet, Port, SecurityGroup } from '../../aws-ec2'; +import { Aws, Token } from '../../core'; /** * The different kinds of file system deployments used by Lustre. diff --git a/packages/aws-cdk-lib/aws-globalaccelerator-endpoints/lib/alb.ts b/packages/aws-cdk-lib/aws-globalaccelerator-endpoints/lib/alb.ts index eea603ac20d61..9bf42a660038f 100644 --- a/packages/aws-cdk-lib/aws-globalaccelerator-endpoints/lib/alb.ts +++ b/packages/aws-cdk-lib/aws-globalaccelerator-endpoints/lib/alb.ts @@ -1,6 +1,6 @@ +import { validateWeight } from './_util'; import * as elbv2 from '../../aws-elasticloadbalancingv2'; import * as ga from '../../aws-globalaccelerator'; -import { validateWeight } from './_util'; /** * Properties for a ApplicationLoadBalancerEndpoint diff --git a/packages/aws-cdk-lib/aws-globalaccelerator-endpoints/lib/eip.ts b/packages/aws-cdk-lib/aws-globalaccelerator-endpoints/lib/eip.ts index 480140e0dbf5f..dd0d06e994490 100644 --- a/packages/aws-cdk-lib/aws-globalaccelerator-endpoints/lib/eip.ts +++ b/packages/aws-cdk-lib/aws-globalaccelerator-endpoints/lib/eip.ts @@ -1,7 +1,7 @@ +import { validateWeight } from './_util'; import * as ec2 from '../../aws-ec2'; import * as ga from '../../aws-globalaccelerator'; import { Stack } from '../../core'; -import { validateWeight } from './_util'; /** * Properties for a NetworkLoadBalancerEndpoint diff --git a/packages/aws-cdk-lib/aws-globalaccelerator-endpoints/lib/instance.ts b/packages/aws-cdk-lib/aws-globalaccelerator-endpoints/lib/instance.ts index 8e592094fe716..c6329d6e1100d 100644 --- a/packages/aws-cdk-lib/aws-globalaccelerator-endpoints/lib/instance.ts +++ b/packages/aws-cdk-lib/aws-globalaccelerator-endpoints/lib/instance.ts @@ -1,6 +1,6 @@ +import { validateWeight } from './_util'; import * as ec2 from '../../aws-ec2'; import * as ga from '../../aws-globalaccelerator'; -import { validateWeight } from './_util'; /** * Properties for a NetworkLoadBalancerEndpoint diff --git a/packages/aws-cdk-lib/aws-globalaccelerator-endpoints/lib/nlb.ts b/packages/aws-cdk-lib/aws-globalaccelerator-endpoints/lib/nlb.ts index 62debb3416ad4..a4c6b59328ffb 100644 --- a/packages/aws-cdk-lib/aws-globalaccelerator-endpoints/lib/nlb.ts +++ b/packages/aws-cdk-lib/aws-globalaccelerator-endpoints/lib/nlb.ts @@ -1,6 +1,6 @@ +import { validateWeight } from './_util'; import * as elbv2 from '../../aws-elasticloadbalancingv2'; import * as ga from '../../aws-globalaccelerator'; -import { validateWeight } from './_util'; /** * Properties for a NetworkLoadBalancerEndpoint diff --git a/packages/aws-cdk-lib/aws-globalaccelerator/lib/_accelerator-security-group.ts b/packages/aws-cdk-lib/aws-globalaccelerator/lib/_accelerator-security-group.ts index 3f5f6df706211..617a6b2d3c479 100644 --- a/packages/aws-cdk-lib/aws-globalaccelerator/lib/_accelerator-security-group.ts +++ b/packages/aws-cdk-lib/aws-globalaccelerator/lib/_accelerator-security-group.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import * as ec2 from '../../aws-ec2'; import { CfnResource } from '../../core'; import { AwsCustomResource, AwsCustomResourcePolicy, PhysicalResourceId } from '../../custom-resources'; -import { Construct } from 'constructs'; import { EndpointGroup } from '../lib'; /** diff --git a/packages/aws-cdk-lib/aws-globalaccelerator/lib/accelerator.ts b/packages/aws-cdk-lib/aws-globalaccelerator/lib/accelerator.ts index fb77efdc48b0f..5058f170e0007 100644 --- a/packages/aws-cdk-lib/aws-globalaccelerator/lib/accelerator.ts +++ b/packages/aws-cdk-lib/aws-globalaccelerator/lib/accelerator.ts @@ -1,7 +1,7 @@ -import * as cdk from '../../core'; import { Construct } from 'constructs'; import * as ga from './globalaccelerator.generated'; import { Listener, ListenerOptions } from './listener'; +import * as cdk from '../../core'; /** * The interface of the Accelerator diff --git a/packages/aws-cdk-lib/aws-globalaccelerator/lib/endpoint-group.ts b/packages/aws-cdk-lib/aws-globalaccelerator/lib/endpoint-group.ts index fa0b90d5901af..afc8e40059518 100644 --- a/packages/aws-cdk-lib/aws-globalaccelerator/lib/endpoint-group.ts +++ b/packages/aws-cdk-lib/aws-globalaccelerator/lib/endpoint-group.ts @@ -1,10 +1,10 @@ -import * as ec2 from '../../aws-ec2'; -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { AcceleratorSecurityGroupPeer } from './_accelerator-security-group'; import { IEndpoint } from './endpoint'; import * as ga from './globalaccelerator.generated'; import { IListener } from './listener'; +import * as ec2 from '../../aws-ec2'; +import * as cdk from '../../core'; /** * The interface of the EndpointGroup diff --git a/packages/aws-cdk-lib/aws-globalaccelerator/lib/listener.ts b/packages/aws-cdk-lib/aws-globalaccelerator/lib/listener.ts index c0ed0a7e3b067..fd8be5d28bc0a 100644 --- a/packages/aws-cdk-lib/aws-globalaccelerator/lib/listener.ts +++ b/packages/aws-cdk-lib/aws-globalaccelerator/lib/listener.ts @@ -1,8 +1,8 @@ -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { IAccelerator } from './accelerator'; import { EndpointGroup, EndpointGroupOptions } from './endpoint-group'; import * as ga from './globalaccelerator.generated'; +import * as cdk from '../../core'; /** * Interface of the Listener diff --git a/packages/aws-cdk-lib/aws-globalaccelerator/test/globalaccelerator-security-group.test.ts b/packages/aws-cdk-lib/aws-globalaccelerator/test/globalaccelerator-security-group.test.ts index 1116627ef5ebb..784866a4b1d08 100644 --- a/packages/aws-cdk-lib/aws-globalaccelerator/test/globalaccelerator-security-group.test.ts +++ b/packages/aws-cdk-lib/aws-globalaccelerator/test/globalaccelerator-security-group.test.ts @@ -1,6 +1,6 @@ +import { testFixture } from './util'; import { Template } from '../../assertions'; import * as ec2 from '../../aws-ec2'; -import { testFixture } from './util'; import * as ga from '../lib'; test('custom resource exists', () => { diff --git a/packages/aws-cdk-lib/aws-globalaccelerator/test/globalaccelerator.test.ts b/packages/aws-cdk-lib/aws-globalaccelerator/test/globalaccelerator.test.ts index 15a8e06387e70..e06a60a1ae8f7 100644 --- a/packages/aws-cdk-lib/aws-globalaccelerator/test/globalaccelerator.test.ts +++ b/packages/aws-cdk-lib/aws-globalaccelerator/test/globalaccelerator.test.ts @@ -1,6 +1,6 @@ +import { testFixture } from './util'; import { Template } from '../../assertions'; import { Duration } from '../../core'; -import { testFixture } from './util'; import * as ga from '../lib'; test('create accelerator', () => { diff --git a/packages/aws-cdk-lib/aws-iam/lib/access-key.ts b/packages/aws-cdk-lib/aws-iam/lib/access-key.ts index f358532848d97..c1efae3912f9d 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/access-key.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/access-key.ts @@ -1,7 +1,7 @@ -import { IResource, Resource, SecretValue } from '../../core'; import { Construct } from 'constructs'; import { CfnAccessKey } from './iam.generated'; import { IUser } from './user'; +import { IResource, Resource, SecretValue } from '../../core'; /** * Valid statuses for an IAM Access Key. diff --git a/packages/aws-cdk-lib/aws-iam/lib/grant.ts b/packages/aws-cdk-lib/aws-iam/lib/grant.ts index 8f0ee01c6304b..451b50d2bde26 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/grant.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/grant.ts @@ -1,7 +1,7 @@ -import * as cdk from '../../core'; import { Dependable, IConstruct, IDependable } from 'constructs'; import { PolicyStatement } from './policy-statement'; import { IGrantable, IPrincipal } from './principals'; +import * as cdk from '../../core'; /** * Basic options for a grant operation diff --git a/packages/aws-cdk-lib/aws-iam/lib/group.ts b/packages/aws-cdk-lib/aws-iam/lib/group.ts index 5b943f353b300..6346d216596ae 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/group.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/group.ts @@ -1,4 +1,3 @@ -import { Annotations, ArnFormat, Lazy, Resource, Stack } from '../../core'; import { Construct } from 'constructs'; import { CfnGroup } from './iam.generated'; import { IIdentity } from './identity-base'; @@ -8,6 +7,7 @@ import { PolicyStatement } from './policy-statement'; import { AddToPrincipalPolicyResult, ArnPrincipal, IPrincipal, PrincipalPolicyFragment } from './principals'; import { AttachedPolicies } from './private/util'; import { IUser } from './user'; +import { Annotations, ArnFormat, Lazy, Resource, Stack } from '../../core'; /** * Represents an IAM Group. diff --git a/packages/aws-cdk-lib/aws-iam/lib/identity-base.ts b/packages/aws-cdk-lib/aws-iam/lib/identity-base.ts index 8861c11f7c995..fd05d70beb026 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/identity-base.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/identity-base.ts @@ -1,7 +1,7 @@ -import { IResource } from '../../core'; import { IManagedPolicy } from './managed-policy'; import { Policy } from './policy'; import { IPrincipal } from './principals'; +import { IResource } from '../../core'; /** * A construct that represents an IAM principal, such as a user, group or role. diff --git a/packages/aws-cdk-lib/aws-iam/lib/lazy-role.ts b/packages/aws-cdk-lib/aws-iam/lib/lazy-role.ts index a6b17652c6312..771bc0a41e92a 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/lazy-role.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/lazy-role.ts @@ -1,4 +1,3 @@ -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { Grant } from './grant'; import { IManagedPolicy } from './managed-policy'; @@ -6,6 +5,7 @@ import { Policy } from './policy'; import { PolicyStatement } from './policy-statement'; import { AddToPrincipalPolicyResult, IPrincipal, PrincipalPolicyFragment } from './principals'; import { IRole, Role, RoleProps } from './role'; +import * as cdk from '../../core'; /** * Properties for defining a LazyRole diff --git a/packages/aws-cdk-lib/aws-iam/lib/managed-policy.ts b/packages/aws-cdk-lib/aws-iam/lib/managed-policy.ts index f61d29cb4c184..3c089262c4cd9 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/managed-policy.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/managed-policy.ts @@ -1,5 +1,3 @@ -import { ArnFormat, Resource, Stack, Arn, Aws } from '../../core'; -import { getCustomizeRolesConfig, PolicySynthesizer } from '../../core/lib/helpers-internal'; import { Construct } from 'constructs'; import { IGroup } from './group'; import { CfnManagedPolicy } from './iam.generated'; @@ -9,6 +7,8 @@ import { AddToPrincipalPolicyResult, IGrantable, IPrincipal, PrincipalPolicyFrag import { undefinedIfEmpty } from './private/util'; import { IRole } from './role'; import { IUser } from './user'; +import { ArnFormat, Resource, Stack, Arn, Aws } from '../../core'; +import { getCustomizeRolesConfig, PolicySynthesizer } from '../../core/lib/helpers-internal'; /** * A managed policy diff --git a/packages/aws-cdk-lib/aws-iam/lib/oidc-provider.ts b/packages/aws-cdk-lib/aws-iam/lib/oidc-provider.ts index 37ad85d7ec1ce..6e3bb1623e8f1 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/oidc-provider.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/oidc-provider.ts @@ -1,4 +1,5 @@ import * as path from 'path'; +import { Construct } from 'constructs'; import { Arn, CustomResource, @@ -8,7 +9,6 @@ import { Resource, Token, } from '../../core'; -import { Construct } from 'constructs'; const RESOURCE_TYPE = 'Custom::AWSCDKOpenIdConnectProvider'; diff --git a/packages/aws-cdk-lib/aws-iam/lib/permissions-boundary.ts b/packages/aws-cdk-lib/aws-iam/lib/permissions-boundary.ts index cc3fb478a7b6d..14961040225dd 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/permissions-boundary.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/permissions-boundary.ts @@ -1,7 +1,7 @@ -import { Aspects, CfnResource } from '../../core'; import { IConstruct } from 'constructs'; import { CfnRole, CfnUser } from './iam.generated'; import { IManagedPolicy } from './managed-policy'; +import { Aspects, CfnResource } from '../../core'; /** * Modify the Permissions Boundaries of Users and Roles in a construct tree diff --git a/packages/aws-cdk-lib/aws-iam/lib/policy-document.ts b/packages/aws-cdk-lib/aws-iam/lib/policy-document.ts index 1873ad0eb2f59..33f4514353b83 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/policy-document.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/policy-document.ts @@ -1,9 +1,9 @@ -import * as cdk from '../../core'; -import * as cxapi from '../../cx-api'; import { IConstruct } from 'constructs'; import { PolicyStatement, deriveEstimateSizeOptions } from './policy-statement'; import { mergeStatements } from './private/merge-statements'; import { PostProcessPolicyDocument } from './private/postprocess-policy-document'; +import * as cdk from '../../core'; +import * as cxapi from '../../cx-api'; /** * Properties for a new PolicyDocument diff --git a/packages/aws-cdk-lib/aws-iam/lib/policy-statement.ts b/packages/aws-cdk-lib/aws-iam/lib/policy-statement.ts index 6c93107b341a8..5a9e6905d2101 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/policy-statement.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/policy-statement.ts @@ -1,4 +1,3 @@ -import * as cdk from '../../core'; import { IConstruct } from 'constructs'; import { Group } from './group'; import { @@ -7,6 +6,7 @@ import { } from './principals'; import { normalizeStatement } from './private/postprocess-policy-document'; import { LITERAL_STRING_KEY, mergePrincipal, sum } from './private/util'; +import * as cdk from '../../core'; const ensureArrayOrUndefined = (field: any) => { if (field === undefined) { diff --git a/packages/aws-cdk-lib/aws-iam/lib/policy.ts b/packages/aws-cdk-lib/aws-iam/lib/policy.ts index ddc5295e163f6..763a7ae42a84e 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/policy.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/policy.ts @@ -1,4 +1,3 @@ -import { IResource, Lazy, Resource } from '../../core'; import { Construct } from 'constructs'; import { IGroup } from './group'; import { CfnPolicy } from './iam.generated'; @@ -8,6 +7,7 @@ import { AddToPrincipalPolicyResult, IGrantable, IPrincipal, PrincipalPolicyFrag import { generatePolicyName, undefinedIfEmpty } from './private/util'; import { IRole } from './role'; import { IUser } from './user'; +import { IResource, Lazy, Resource } from '../../core'; /** * Represents an IAM Policy diff --git a/packages/aws-cdk-lib/aws-iam/lib/principals.ts b/packages/aws-cdk-lib/aws-iam/lib/principals.ts index 3f498932388c4..0f53e3af4748d 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/principals.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/principals.ts @@ -1,6 +1,3 @@ -import * as cdk from '../../core'; -import * as cxapi from '../../cx-api'; -import { Default, FactName, RegionInfo } from '../../region-info'; import { IDependable } from 'constructs'; import { IOpenIdConnectProvider } from './oidc-provider'; import { PolicyDocument } from './policy-document'; @@ -8,6 +5,9 @@ import { Condition, Conditions, PolicyStatement } from './policy-statement'; import { defaultAddPrincipalToAssumeRole } from './private/assume-role-policy'; import { LITERAL_STRING_KEY, mergePrincipal } from './private/util'; import { ISamlProvider } from './saml-provider'; +import * as cdk from '../../core'; +import * as cxapi from '../../cx-api'; +import { Default, FactName, RegionInfo } from '../../region-info'; /** * Any object that has an associated principal that a permission can be granted to diff --git a/packages/aws-cdk-lib/aws-iam/lib/private/immutable-role.ts b/packages/aws-cdk-lib/aws-iam/lib/private/immutable-role.ts index d5603297be653..1528e83485c0c 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/private/immutable-role.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/private/immutable-role.ts @@ -1,5 +1,5 @@ -import { Resource } from '../../../core'; import { Construct, Dependable, DependencyGroup } from 'constructs'; +import { Resource } from '../../../core'; import { Grant } from '../grant'; import { IManagedPolicy } from '../managed-policy'; import { Policy } from '../policy'; diff --git a/packages/aws-cdk-lib/aws-iam/lib/private/imported-role.ts b/packages/aws-cdk-lib/aws-iam/lib/private/imported-role.ts index 886d9b091c2d2..d7bb14da16ccf 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/private/imported-role.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/private/imported-role.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import { FeatureFlags, Names, Resource, Token, TokenComparison, Annotations } from '../../../core'; import { IAM_IMPORTED_ROLE_STACK_SAFE_DEFAULT_POLICY_NAME } from '../../../cx-api'; -import { Construct } from 'constructs'; import { Grant } from '../grant'; import { IManagedPolicy } from '../managed-policy'; import { Policy } from '../policy'; diff --git a/packages/aws-cdk-lib/aws-iam/lib/private/precreated-role.ts b/packages/aws-cdk-lib/aws-iam/lib/private/precreated-role.ts index 437dfd09bd559..3fa24cffbf1d7 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/private/precreated-role.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/private/precreated-role.ts @@ -1,6 +1,6 @@ +import { Construct, Dependable, DependencyGroup } from 'constructs'; import { Resource, Stack } from '../../../core'; import { PolicySynthesizer } from '../../../core/lib/helpers-internal'; -import { Construct, Dependable, DependencyGroup } from 'constructs'; import { Grant } from '../grant'; import { IManagedPolicy } from '../managed-policy'; import { Policy } from '../policy'; diff --git a/packages/aws-cdk-lib/aws-iam/lib/private/util.ts b/packages/aws-cdk-lib/aws-iam/lib/private/util.ts index bdfed870df4c3..bc03bc9b0f2bd 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/private/util.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/private/util.ts @@ -1,5 +1,5 @@ -import { captureStackTrace, DefaultTokenResolver, IPostProcessor, IResolvable, IResolveContext, Lazy, StringConcat, Token, Tokenization } from '../../../core'; import { IConstruct } from 'constructs'; +import { captureStackTrace, DefaultTokenResolver, IPostProcessor, IResolvable, IResolveContext, Lazy, StringConcat, Token, Tokenization } from '../../../core'; import { IPolicy } from '../policy'; const MAX_POLICY_NAME_LEN = 128; diff --git a/packages/aws-cdk-lib/aws-iam/lib/role.ts b/packages/aws-cdk-lib/aws-iam/lib/role.ts index 9a547d2c07e55..d039deda413a0 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/role.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/role.ts @@ -1,5 +1,3 @@ -import { ArnFormat, Duration, Resource, Stack, Token, TokenComparison, Aspects, Annotations } from '../../core'; -import { getCustomizeRolesConfig, getPrecreatedRoleConfig, CUSTOMIZE_ROLES_CONTEXT_KEY, CustomizeRoleConfig } from '../../core/lib/helpers-internal'; import { Construct, IConstruct, DependencyGroup, Node } from 'constructs'; import { Grant } from './grant'; import { CfnRole } from './iam.generated'; @@ -15,6 +13,8 @@ import { ImportedRole } from './private/imported-role'; import { MutatingPolicyDocumentAdapter } from './private/policydoc-adapter'; import { PrecreatedRole } from './private/precreated-role'; import { AttachedPolicies, UniqueStringSet } from './private/util'; +import { ArnFormat, Duration, Resource, Stack, Token, TokenComparison, Aspects, Annotations } from '../../core'; +import { getCustomizeRolesConfig, getPrecreatedRoleConfig, CUSTOMIZE_ROLES_CONTEXT_KEY, CustomizeRoleConfig } from '../../core/lib/helpers-internal'; const MAX_INLINE_SIZE = 10000; const MAX_MANAGEDPOL_SIZE = 6000; diff --git a/packages/aws-cdk-lib/aws-iam/lib/saml-provider.ts b/packages/aws-cdk-lib/aws-iam/lib/saml-provider.ts index de86f7984b27e..a3826b7ed7087 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/saml-provider.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/saml-provider.ts @@ -1,7 +1,7 @@ import * as fs from 'fs'; -import { IResource, Resource, Token } from '../../core'; import { Construct } from 'constructs'; import { CfnSAMLProvider } from './iam.generated'; +import { IResource, Resource, Token } from '../../core'; /** * A SAML provider diff --git a/packages/aws-cdk-lib/aws-iam/lib/unknown-principal.ts b/packages/aws-cdk-lib/aws-iam/lib/unknown-principal.ts index 7d63b450371e8..49bab6a23244f 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/unknown-principal.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/unknown-principal.ts @@ -1,7 +1,7 @@ -import { Annotations, Stack } from '../../core'; import { DependencyGroup, IConstruct, Node } from 'constructs'; import { PolicyStatement } from './policy-statement'; import { AddToPrincipalPolicyResult, IPrincipal, PrincipalPolicyFragment } from './principals'; +import { Annotations, Stack } from '../../core'; /** * Properties for an UnknownPrincipal diff --git a/packages/aws-cdk-lib/aws-iam/lib/user.ts b/packages/aws-cdk-lib/aws-iam/lib/user.ts index e70d9358f1405..1f48f990c8e48 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/user.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/user.ts @@ -1,4 +1,3 @@ -import { Arn, Aws, Lazy, Resource, SecretValue, Stack } from '../../core'; import { Construct } from 'constructs'; import { IGroup } from './group'; import { CfnUser, CfnUserToGroupAddition } from './iam.generated'; @@ -8,6 +7,7 @@ import { Policy } from './policy'; import { PolicyStatement } from './policy-statement'; import { AddToPrincipalPolicyResult, ArnPrincipal, IPrincipal, PrincipalPolicyFragment } from './principals'; import { AttachedPolicies, undefinedIfEmpty } from './private/util'; +import { Arn, Aws, Lazy, Resource, SecretValue, Stack } from '../../core'; /** * Represents an IAM user diff --git a/packages/aws-cdk-lib/aws-iam/lib/util.ts b/packages/aws-cdk-lib/aws-iam/lib/util.ts index 9fa840de64b41..7aa619923e56d 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/util.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/util.ts @@ -1,6 +1,6 @@ -import { captureStackTrace, DefaultTokenResolver, IPostProcessor, IResolvable, IResolveContext, Lazy, StringConcat, Token, Tokenization } from '../../core'; import { IConstruct } from 'constructs'; import { IPolicy } from './policy'; +import { captureStackTrace, DefaultTokenResolver, IPostProcessor, IResolvable, IResolveContext, Lazy, StringConcat, Token, Tokenization } from '../../core'; const MAX_POLICY_NAME_LEN = 128; diff --git a/packages/aws-cdk-lib/aws-iam/lib/utils.ts b/packages/aws-cdk-lib/aws-iam/lib/utils.ts index 971eb0b6dd0d0..41f78bac8197f 100644 --- a/packages/aws-cdk-lib/aws-iam/lib/utils.ts +++ b/packages/aws-cdk-lib/aws-iam/lib/utils.ts @@ -1,6 +1,6 @@ -import { Resource } from '../../core'; import { Construct, IConstruct } from 'constructs'; import { IPrincipal } from './principals'; +import { Resource } from '../../core'; /** * Determines whether the given Principal is a newly created resource managed by the CDK, diff --git a/packages/aws-cdk-lib/aws-iam/test/cross-account.test.ts b/packages/aws-cdk-lib/aws-iam/test/cross-account.test.ts index e15c9def7ddee..e23a873c9a8db 100644 --- a/packages/aws-cdk-lib/aws-iam/test/cross-account.test.ts +++ b/packages/aws-cdk-lib/aws-iam/test/cross-account.test.ts @@ -1,6 +1,6 @@ +import * as constructs from 'constructs'; import { Template } from '../../assertions'; import * as cdk from '../../core'; -import * as constructs from 'constructs'; import * as iam from '../lib'; // Test cross-account grant scenario's for principals diff --git a/packages/aws-cdk-lib/aws-iam/test/example.attaching.lit.ts b/packages/aws-cdk-lib/aws-iam/test/example.attaching.lit.ts index 2ce6dab3e5840..9155ff066d330 100644 --- a/packages/aws-cdk-lib/aws-iam/test/example.attaching.lit.ts +++ b/packages/aws-cdk-lib/aws-iam/test/example.attaching.lit.ts @@ -1,5 +1,5 @@ -import { SecretValue } from '../../core'; import { Construct } from 'constructs'; +import { SecretValue } from '../../core'; import { Group, Policy, User } from '../lib'; export class ExampleConstruct extends Construct { diff --git a/packages/aws-cdk-lib/aws-iam/test/grant.test.ts b/packages/aws-cdk-lib/aws-iam/test/grant.test.ts index e4ecc075612b7..f76711f02f0cc 100644 --- a/packages/aws-cdk-lib/aws-iam/test/grant.test.ts +++ b/packages/aws-cdk-lib/aws-iam/test/grant.test.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import { Template, Match } from '../../assertions'; import { CfnResource, Resource, Stack } from '../../core'; -import { Construct } from 'constructs'; import * as iam from '../lib'; let stack: Stack; diff --git a/packages/aws-cdk-lib/aws-iam/test/immutable-role.test.ts b/packages/aws-cdk-lib/aws-iam/test/immutable-role.test.ts index 1f507dad94093..0162374afe39e 100644 --- a/packages/aws-cdk-lib/aws-iam/test/immutable-role.test.ts +++ b/packages/aws-cdk-lib/aws-iam/test/immutable-role.test.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import { Template, Match } from '../../assertions'; import { Stack } from '../../core'; -import { Construct } from 'constructs'; import * as iam from '../lib'; /* eslint-disable quote-props */ diff --git a/packages/aws-cdk-lib/aws-iam/test/oidc-provider.test.ts b/packages/aws-cdk-lib/aws-iam/test/oidc-provider.test.ts index c1ec4c8cd4f07..970c88dc55438 100644 --- a/packages/aws-cdk-lib/aws-iam/test/oidc-provider.test.ts +++ b/packages/aws-cdk-lib/aws-iam/test/oidc-provider.test.ts @@ -1,6 +1,6 @@ +import * as sinon from 'sinon'; import { Template } from '../../assertions'; import { App, Stack, Token } from '../../core'; -import * as sinon from 'sinon'; import * as iam from '../lib'; import { arrayDiff } from '../lib/oidc-provider/diff'; import { external } from '../lib/oidc-provider/external'; diff --git a/packages/aws-cdk-lib/aws-iam/test/policy-document.test.ts b/packages/aws-cdk-lib/aws-iam/test/policy-document.test.ts index 6d14345113069..12db0c13718d4 100644 --- a/packages/aws-cdk-lib/aws-iam/test/policy-document.test.ts +++ b/packages/aws-cdk-lib/aws-iam/test/policy-document.test.ts @@ -1,5 +1,5 @@ -import { Template } from '../../assertions'; import { testDeprecated } from '@aws-cdk/cdk-build-tools'; +import { Template } from '../../assertions'; import { Lazy, Stack, Token } from '../../core'; import { AccountPrincipal, Anyone, AnyPrincipal, ArnPrincipal, CanonicalUserPrincipal, CompositePrincipal, diff --git a/packages/aws-cdk-lib/aws-iam/test/role.test.ts b/packages/aws-cdk-lib/aws-iam/test/role.test.ts index fd3759e875ada..82791ec8e0af3 100644 --- a/packages/aws-cdk-lib/aws-iam/test/role.test.ts +++ b/packages/aws-cdk-lib/aws-iam/test/role.test.ts @@ -1,7 +1,7 @@ -import { Template, Match, Annotations } from '../../assertions'; import { testDeprecated } from '@aws-cdk/cdk-build-tools'; -import { Duration, Stack, App, CfnResource, RemovalPolicy, Lazy, Stage, DefaultStackSynthesizer, CliCredentialsStackSynthesizer, PERMISSIONS_BOUNDARY_CONTEXT_KEY, PermissionsBoundary } from '../../core'; import { Construct } from 'constructs'; +import { Template, Match, Annotations } from '../../assertions'; +import { Duration, Stack, App, CfnResource, RemovalPolicy, Lazy, Stage, DefaultStackSynthesizer, CliCredentialsStackSynthesizer, PERMISSIONS_BOUNDARY_CONTEXT_KEY, PermissionsBoundary } from '../../core'; import { AnyPrincipal, ArnPrincipal, CompositePrincipal, FederatedPrincipal, ManagedPolicy, PolicyStatement, Role, ServicePrincipal, User, Policy, PolicyDocument, Effect } from '../lib'; describe('isRole() returns', () => { diff --git a/packages/aws-cdk-lib/aws-kinesis/lib/stream.ts b/packages/aws-cdk-lib/aws-kinesis/lib/stream.ts index d600a048f1d9d..a43e613f5a54d 100644 --- a/packages/aws-cdk-lib/aws-kinesis/lib/stream.ts +++ b/packages/aws-cdk-lib/aws-kinesis/lib/stream.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; +import { KinesisMetrics } from './kinesis-fixed-canned-metrics'; +import { CfnStream } from './kinesis.generated'; import * as cloudwatch from '../../aws-cloudwatch'; import * as iam from '../../aws-iam'; import * as kms from '../../aws-kms'; import { ArnFormat, Aws, CfnCondition, Duration, Fn, IResolvable, IResource, Resource, Stack, Token } from '../../core'; -import { Construct } from 'constructs'; -import { KinesisMetrics } from './kinesis-fixed-canned-metrics'; -import { CfnStream } from './kinesis.generated'; const READ_OPERATIONS = [ 'kinesis:DescribeStreamSummary', diff --git a/packages/aws-cdk-lib/aws-kms/lib/key.ts b/packages/aws-cdk-lib/aws-kms/lib/key.ts index 0188dceeca8e8..3b267d79d0c14 100644 --- a/packages/aws-cdk-lib/aws-kms/lib/key.ts +++ b/packages/aws-cdk-lib/aws-kms/lib/key.ts @@ -1,3 +1,8 @@ +import { Construct } from 'constructs'; +import { Alias } from './alias'; +import { KeyLookupOptions } from './key-lookup'; +import { CfnKey } from './kms.generated'; +import * as perms from './private/perms'; import * as iam from '../../aws-iam'; import * as cxschema from '../../cloud-assembly-schema'; import { @@ -15,11 +20,6 @@ import { Token, } from '../../core'; import * as cxapi from '../../cx-api'; -import { Construct } from 'constructs'; -import { Alias } from './alias'; -import { KeyLookupOptions } from './key-lookup'; -import { CfnKey } from './kms.generated'; -import * as perms from './private/perms'; /** * A KMS Key, either managed by this CDK app, or imported. @@ -547,7 +547,7 @@ export class Key extends KeyBase { const keyResourceName = Stack.of(scope).splitArn(keyArn, ArnFormat.SLASH_RESOURCE_NAME).resourceName; if (!keyResourceName) { - throw new Error(`KMS key ARN must be in the format 'arn:aws:kms:::key/', got: '${keyArn}'`); + throw new Error(`KMS key ARN must be in the format 'arn::kms:::key/', got: '${keyArn}'`); } return new Import(keyResourceName, { diff --git a/packages/aws-cdk-lib/aws-kms/test/key.from-lookup.test.ts b/packages/aws-cdk-lib/aws-kms/test/key.from-lookup.test.ts index 4f0a11dc6230a..34af7d0030d9f 100644 --- a/packages/aws-cdk-lib/aws-kms/test/key.from-lookup.test.ts +++ b/packages/aws-cdk-lib/aws-kms/test/key.from-lookup.test.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as cxschema from '../../cloud-assembly-schema'; import { ContextProvider, GetContextValueOptions, GetContextValueResult, Lazy, Stack } from '../../core'; import * as cxapi from '../../cx-api'; -import { Construct } from 'constructs'; import { Key } from '../lib'; test('requires concrete values', () => { diff --git a/packages/aws-cdk-lib/aws-kms/test/key.test.ts b/packages/aws-cdk-lib/aws-kms/test/key.test.ts index 95a02b80cb6ef..e2272278702cb 100644 --- a/packages/aws-cdk-lib/aws-kms/test/key.test.ts +++ b/packages/aws-cdk-lib/aws-kms/test/key.test.ts @@ -1,6 +1,6 @@ +import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import { Match, Template } from '../../assertions'; import * as iam from '../../aws-iam'; -import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../core'; import * as kms from '../lib'; import { KeySpec, KeyUsage } from '../lib'; @@ -570,7 +570,7 @@ describe('imported keys', () => { const stack = new cdk.Stack(); expect(() => { kms.Key.fromKeyArn(stack, 'Imported', 'arn:aws:kms:us-east-1:123456789012:key'); - }).toThrow(/KMS key ARN must be in the format 'arn:aws:kms:::key\/', got: 'arn:aws:kms:us-east-1:123456789012:key'/); + }).toThrow(/KMS key ARN must be in the format 'arn::kms:::key\/', got: 'arn:aws:kms:us-east-1:123456789012:key'/); }); diff --git a/packages/aws-cdk-lib/aws-lambda-destinations/lib/event-bridge.ts b/packages/aws-cdk-lib/aws-lambda-destinations/lib/event-bridge.ts index e67180b7660ab..6b27d23c919e3 100644 --- a/packages/aws-cdk-lib/aws-lambda-destinations/lib/event-bridge.ts +++ b/packages/aws-cdk-lib/aws-lambda-destinations/lib/event-bridge.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as events from '../../aws-events'; import * as lambda from '../../aws-lambda'; import { Stack } from '../../core'; -import { Construct } from 'constructs'; /** * Use an Event Bridge event bus as a Lambda destination. diff --git a/packages/aws-cdk-lib/aws-lambda-destinations/lib/lambda.ts b/packages/aws-cdk-lib/aws-lambda-destinations/lib/lambda.ts index ad24a70dec469..3031533a08376 100644 --- a/packages/aws-cdk-lib/aws-lambda-destinations/lib/lambda.ts +++ b/packages/aws-cdk-lib/aws-lambda-destinations/lib/lambda.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; +import { EventBridgeDestination } from './event-bridge'; import * as events from '../../aws-events'; import * as targets from '../../aws-events-targets'; import * as lambda from '../../aws-lambda'; -import { Construct } from 'constructs'; -import { EventBridgeDestination } from './event-bridge'; /** * Options for a Lambda destination diff --git a/packages/aws-cdk-lib/aws-lambda-destinations/lib/sns.ts b/packages/aws-cdk-lib/aws-lambda-destinations/lib/sns.ts index 1822ef007ec96..9e1dab85fd5b9 100644 --- a/packages/aws-cdk-lib/aws-lambda-destinations/lib/sns.ts +++ b/packages/aws-cdk-lib/aws-lambda-destinations/lib/sns.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as lambda from '../../aws-lambda'; import * as sns from '../../aws-sns'; -import { Construct } from 'constructs'; /** * Use a SNS topic as a Lambda destination diff --git a/packages/aws-cdk-lib/aws-lambda-destinations/lib/sqs.ts b/packages/aws-cdk-lib/aws-lambda-destinations/lib/sqs.ts index 6fd9708de084f..760cad5e68090 100644 --- a/packages/aws-cdk-lib/aws-lambda-destinations/lib/sqs.ts +++ b/packages/aws-cdk-lib/aws-lambda-destinations/lib/sqs.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as lambda from '../../aws-lambda'; import * as sqs from '../../aws-sqs'; -import { Construct } from 'constructs'; /** * Use a SQS queue as a Lambda destination diff --git a/packages/aws-cdk-lib/aws-lambda-event-sources/test/s3.test.ts b/packages/aws-cdk-lib/aws-lambda-event-sources/test/s3.test.ts index 56e6e7af45d72..2e2441c1ea5a4 100644 --- a/packages/aws-cdk-lib/aws-lambda-event-sources/test/s3.test.ts +++ b/packages/aws-cdk-lib/aws-lambda-event-sources/test/s3.test.ts @@ -1,7 +1,7 @@ +import { TestFunction } from './test-function'; import { Template } from '../../assertions'; import * as s3 from '../../aws-s3'; import * as cdk from '../../core'; -import { TestFunction } from './test-function'; import * as sources from '../lib'; /* eslint-disable quote-props */ diff --git a/packages/aws-cdk-lib/aws-lambda-event-sources/test/sns.test.ts b/packages/aws-cdk-lib/aws-lambda-event-sources/test/sns.test.ts index 161e51f5312c6..430d4a336aa35 100644 --- a/packages/aws-cdk-lib/aws-lambda-event-sources/test/sns.test.ts +++ b/packages/aws-cdk-lib/aws-lambda-event-sources/test/sns.test.ts @@ -1,8 +1,8 @@ +import { TestFunction } from './test-function'; import { Template } from '../../assertions'; import * as sns from '../../aws-sns'; import * as sqs from '../../aws-sqs'; import * as cdk from '../../core'; -import { TestFunction } from './test-function'; import * as sources from '../lib'; /* eslint-disable quote-props */ diff --git a/packages/aws-cdk-lib/aws-lambda-event-sources/test/test-function.ts b/packages/aws-cdk-lib/aws-lambda-event-sources/test/test-function.ts index 9cfe52027a261..1a6b0ab62385f 100644 --- a/packages/aws-cdk-lib/aws-lambda-event-sources/test/test-function.ts +++ b/packages/aws-cdk-lib/aws-lambda-event-sources/test/test-function.ts @@ -1,5 +1,5 @@ -import * as lambda from '../../aws-lambda'; import * as constructs from 'constructs'; +import * as lambda from '../../aws-lambda'; export class TestFunction extends lambda.Function { constructor(scope: constructs.Construct, id: string) { diff --git a/packages/aws-cdk-lib/aws-lambda-nodejs/lib/bundling.ts b/packages/aws-cdk-lib/aws-lambda-nodejs/lib/bundling.ts index 345c00df0151e..632858703bbfb 100644 --- a/packages/aws-cdk-lib/aws-lambda-nodejs/lib/bundling.ts +++ b/packages/aws-cdk-lib/aws-lambda-nodejs/lib/bundling.ts @@ -1,11 +1,11 @@ import * as os from 'os'; import * as path from 'path'; -import { Architecture, AssetCode, Code, Runtime } from '../../aws-lambda'; -import * as cdk from '../../core'; import { PackageInstallation } from './package-installation'; import { LockFile, PackageManager } from './package-manager'; import { BundlingOptions, OutputFormat, SourceMapMode } from './types'; import { exec, extractDependencies, findUp, getTsconfigCompilerOptions } from './util'; +import { Architecture, AssetCode, Code, Runtime } from '../../aws-lambda'; +import * as cdk from '../../core'; const ESBUILD_MAJOR_VERSION = '0'; diff --git a/packages/aws-cdk-lib/aws-lambda-nodejs/lib/function.ts b/packages/aws-cdk-lib/aws-lambda-nodejs/lib/function.ts index c159332cc2c21..cfd874108eab6 100644 --- a/packages/aws-cdk-lib/aws-lambda-nodejs/lib/function.ts +++ b/packages/aws-cdk-lib/aws-lambda-nodejs/lib/function.ts @@ -1,12 +1,12 @@ import * as fs from 'fs'; import * as path from 'path'; -import * as lambda from '../../aws-lambda'; -import { Architecture } from '../../aws-lambda'; import { Construct } from 'constructs'; import { Bundling } from './bundling'; import { LockFile } from './package-manager'; import { BundlingOptions } from './types'; import { callsites, findUpMultiple } from './util'; +import { Architecture } from '../../aws-lambda'; +import * as lambda from '../../aws-lambda'; import { builtInCustomResourceNodeRuntime } from '../../custom-resources'; /** @@ -102,7 +102,7 @@ export class NodejsFunction extends lambda.Function { super(scope, id, { ...props, - runtime: props.runtime ?? builtInCustomResourceNodeRuntime(scope), + runtime: props.runtime ?? builtInCustomResourceNodeRuntime(scope), code: Bundling.bundle({ ...props.bundling ?? {}, entry, diff --git a/packages/aws-cdk-lib/aws-lambda-nodejs/test/bundling.test.ts b/packages/aws-cdk-lib/aws-lambda-nodejs/test/bundling.test.ts index 414cc647f2af6..875413dca4c1f 100644 --- a/packages/aws-cdk-lib/aws-lambda-nodejs/test/bundling.test.ts +++ b/packages/aws-cdk-lib/aws-lambda-nodejs/test/bundling.test.ts @@ -2,9 +2,9 @@ import * as child_process from 'child_process'; import * as fs from 'fs'; import * as os from 'os'; import * as path from 'path'; +import { version as delayVersion } from 'delay/package.json'; import { Architecture, Code, Runtime, RuntimeFamily } from '../../aws-lambda'; import { AssetHashType, BundlingFileAccess, DockerImage } from '../../core'; -import { version as delayVersion } from 'delay/package.json'; import { Bundling } from '../lib/bundling'; import { PackageInstallation } from '../lib/package-installation'; import { Charset, LogLevel, OutputFormat, SourceMapMode } from '../lib/types'; diff --git a/packages/aws-cdk-lib/aws-lambda/lib/adot-layers.ts b/packages/aws-cdk-lib/aws-lambda/lib/adot-layers.ts index 2394780009a0a..43e9adfd9a89f 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/adot-layers.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/adot-layers.ts @@ -1,9 +1,9 @@ -import { RegionInfo } from '../../region-info'; import { IConstruct } from 'constructs'; import { Architecture } from './architecture'; import { IFunction } from './function-base'; import { Stack } from '../../core/lib/stack'; import { Token } from '../../core/lib/token'; +import { RegionInfo } from '../../region-info'; import { FactName } from '../../region-info/lib/fact'; /** diff --git a/packages/aws-cdk-lib/aws-lambda/lib/alias.ts b/packages/aws-cdk-lib/aws-lambda/lib/alias.ts index 4a236bcaada62..fbfa249286c99 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/alias.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/alias.ts @@ -1,7 +1,3 @@ -import * as appscaling from '../../aws-applicationautoscaling'; -import * as cloudwatch from '../../aws-cloudwatch'; -import * as iam from '../../aws-iam'; -import { ArnFormat } from '../../core'; import { Construct } from 'constructs'; import { Architecture } from './architecture'; import { EventInvokeConfigOptions } from './event-invoke-config'; @@ -10,6 +6,10 @@ import { extractQualifierFromArn, IVersion } from './lambda-version'; import { CfnAlias } from './lambda.generated'; import { ScalableFunctionAttribute } from './private/scalable-function-attribute'; import { AutoScalingOptions, IScalableFunctionAttribute } from './scalable-attribute-api'; +import * as appscaling from '../../aws-applicationautoscaling'; +import * as cloudwatch from '../../aws-cloudwatch'; +import * as iam from '../../aws-iam'; +import { ArnFormat } from '../../core'; export interface IAlias extends IFunction { /** diff --git a/packages/aws-cdk-lib/aws-lambda/lib/code-signing-config.ts b/packages/aws-cdk-lib/aws-lambda/lib/code-signing-config.ts index d1f2bc8d2a27d..2d3a926723a79 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/code-signing-config.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/code-signing-config.ts @@ -1,7 +1,7 @@ -import { ISigningProfile } from '../../aws-signer'; -import { ArnFormat, IResource, Resource, Stack } from '../../core'; import { Construct } from 'constructs'; import { CfnCodeSigningConfig } from './lambda.generated'; +import { ISigningProfile } from '../../aws-signer'; +import { ArnFormat, IResource, Resource, Stack } from '../../core'; /** * Code signing configuration policy for deployment validation failure. @@ -81,7 +81,7 @@ export class CodeSigningConfig extends Resource implements ICodeSigningConfig { public static fromCodeSigningConfigArn( scope: Construct, id: string, codeSigningConfigArn: string): ICodeSigningConfig { const codeSigningProfileId = Stack.of(scope).splitArn(codeSigningConfigArn, ArnFormat.SLASH_RESOURCE_NAME).resourceName; if (!codeSigningProfileId) { - throw new Error(`Code signing config ARN must be in the format 'arn:aws:lambda:::code-signing-config:', got: '${codeSigningConfigArn}'`); + throw new Error(`Code signing config ARN must be in the format 'arn::lambda:::code-signing-config:', got: '${codeSigningConfigArn}'`); } const assertedCodeSigningProfileId = codeSigningProfileId; class Import extends Resource implements ICodeSigningConfig { diff --git a/packages/aws-cdk-lib/aws-lambda/lib/code.ts b/packages/aws-cdk-lib/aws-lambda/lib/code.ts index 70dd17845a2b6..e7d4974fdb967 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/code.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/code.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; import * as ecr from '../../aws-ecr'; import * as ecr_assets from '../../aws-ecr-assets'; import * as iam from '../../aws-iam'; import * as s3 from '../../aws-s3'; import * as s3_assets from '../../aws-s3-assets'; import * as cdk from '../../core'; -import { Construct } from 'constructs'; /** * Represents the Lambda Handler Code. diff --git a/packages/aws-cdk-lib/aws-lambda/lib/event-invoke-config.ts b/packages/aws-cdk-lib/aws-lambda/lib/event-invoke-config.ts index 84fce4879125b..1393ce6328b1e 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/event-invoke-config.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/event-invoke-config.ts @@ -1,8 +1,8 @@ -import { Duration, Resource } from '../../core'; import { Construct } from 'constructs'; import { DestinationType, IDestination } from './destination'; import { IFunction } from './function-base'; import { CfnEventInvokeConfig } from './lambda.generated'; +import { Duration, Resource } from '../../core'; /** * Options to add an EventInvokeConfig to a function. diff --git a/packages/aws-cdk-lib/aws-lambda/lib/filesystem.ts b/packages/aws-cdk-lib/aws-lambda/lib/filesystem.ts index 5d0652b004ac8..76bf7d0fc8913 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/filesystem.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/filesystem.ts @@ -1,8 +1,8 @@ +import { IDependable } from 'constructs'; import { Connections } from '../../aws-ec2'; import * as efs from '../../aws-efs'; import * as iam from '../../aws-iam'; import { Stack } from '../../core'; -import { IDependable } from 'constructs'; /** * FileSystem configurations for the Lambda function diff --git a/packages/aws-cdk-lib/aws-lambda/lib/function-base.ts b/packages/aws-cdk-lib/aws-lambda/lib/function-base.ts index 9f4ed0251c44d..46788487acf7b 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/function-base.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/function-base.ts @@ -1,8 +1,4 @@ import { createHash } from 'crypto'; -import * as cloudwatch from '../../aws-cloudwatch'; -import * as ec2 from '../../aws-ec2'; -import * as iam from '../../aws-iam'; -import { Annotations, ArnFormat, IResource, Resource, Token } from '../../core'; import { Construct, Node } from 'constructs'; import { AliasOptions } from './alias'; import { Architecture } from './architecture'; @@ -14,6 +10,10 @@ import { IVersion } from './lambda-version'; import { CfnPermission } from './lambda.generated'; import { Permission } from './permission'; import { addAlias, flatMap } from './util'; +import * as cloudwatch from '../../aws-cloudwatch'; +import * as ec2 from '../../aws-ec2'; +import * as iam from '../../aws-iam'; +import { Annotations, ArnFormat, IResource, Resource, Token } from '../../core'; export interface IFunction extends IResource, ec2.IConnectable, iam.IGrantable { diff --git a/packages/aws-cdk-lib/aws-lambda/lib/function-hash.ts b/packages/aws-cdk-lib/aws-lambda/lib/function-hash.ts index 7ad0b8a4ef7c8..f853db60b1d8f 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/function-hash.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/function-hash.ts @@ -1,8 +1,8 @@ +import { Function as LambdaFunction } from './function'; +import { ILayerVersion } from './layers'; import { CfnResource, FeatureFlags, Stack, Token } from '../../core'; import { md5hash } from '../../core/lib/helpers-internal'; import { LAMBDA_RECOGNIZE_LAYER_VERSION, LAMBDA_RECOGNIZE_VERSION_PROPS } from '../../cx-api'; -import { Function as LambdaFunction } from './function'; -import { ILayerVersion } from './layers'; export function calculateFunctionHash(fn: LambdaFunction, additional: string = '') { const stack = Stack.of(fn); diff --git a/packages/aws-cdk-lib/aws-lambda/lib/function-url.ts b/packages/aws-cdk-lib/aws-lambda/lib/function-url.ts index b67595e033194..ef923d3153e0f 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/function-url.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/function-url.ts @@ -1,10 +1,10 @@ -import * as iam from '../../aws-iam'; -import { Duration, IResource, Resource } from '../../core'; import { Construct } from 'constructs'; import { IAlias } from './alias'; import { IFunction } from './function-base'; import { IVersion } from './lambda-version'; import { CfnUrl } from './lambda.generated'; +import * as iam from '../../aws-iam'; +import { Duration, IResource, Resource } from '../../core'; /** * The auth types for a function url diff --git a/packages/aws-cdk-lib/aws-lambda/lib/function.ts b/packages/aws-cdk-lib/aws-lambda/lib/function.ts index 366d81cc65053..d8f3ee4cc245d 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/function.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/function.ts @@ -1,13 +1,3 @@ -import * as cloudwatch from '../../aws-cloudwatch'; -import { IProfilingGroup, ProfilingGroup, ComputePlatform } from '../../aws-codeguruprofiler'; -import * as ec2 from '../../aws-ec2'; -import * as iam from '../../aws-iam'; -import * as kms from '../../aws-kms'; -import * as logs from '../../aws-logs'; -import * as sns from '../../aws-sns'; -import * as sqs from '../../aws-sqs'; -import { Annotations, ArnFormat, CfnResource, Duration, FeatureFlags, Fn, IAspect, Lazy, Names, Size, Stack, Token } from '../../core'; -import { LAMBDA_RECOGNIZE_LAYER_VERSION } from '../../cx-api'; import { Construct, IConstruct } from 'constructs'; import { AdotInstrumentationConfig } from './adot-layers'; import { AliasOptions, Alias } from './alias'; @@ -28,6 +18,16 @@ import { LogRetentionRetryOptions } from './log-retention'; import { Runtime } from './runtime'; import { RuntimeManagementMode } from './runtime-management'; import { addAlias } from './util'; +import * as cloudwatch from '../../aws-cloudwatch'; +import { IProfilingGroup, ProfilingGroup, ComputePlatform } from '../../aws-codeguruprofiler'; +import * as ec2 from '../../aws-ec2'; +import * as iam from '../../aws-iam'; +import * as kms from '../../aws-kms'; +import * as logs from '../../aws-logs'; +import * as sns from '../../aws-sns'; +import * as sqs from '../../aws-sqs'; +import { Annotations, ArnFormat, CfnResource, Duration, FeatureFlags, Fn, IAspect, Lazy, Names, Size, Stack, Token } from '../../core'; +import { LAMBDA_RECOGNIZE_LAYER_VERSION } from '../../cx-api'; /** * X-Ray Tracing Modes (https://docs.aws.amazon.com/lambda/latest/dg/API_TracingConfig.html) diff --git a/packages/aws-cdk-lib/aws-lambda/lib/image-function.ts b/packages/aws-cdk-lib/aws-lambda/lib/image-function.ts index 237bdc535f0ea..0ef06e26c0a0c 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/image-function.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/image-function.ts @@ -1,11 +1,11 @@ -import * as ecr from '../../aws-ecr'; -import { Platform } from '../../aws-ecr-assets'; import { Construct } from 'constructs'; import { Architecture } from './architecture'; import { AssetImageCode, AssetImageCodeProps, EcrImageCode, EcrImageCodeProps, Code } from './code'; import { Function, FunctionOptions } from './function'; import { Handler } from './handler'; import { Runtime } from './runtime'; +import * as ecr from '../../aws-ecr'; +import { Platform } from '../../aws-ecr-assets'; /** * Properties to configure a new DockerImageFunction construct. diff --git a/packages/aws-cdk-lib/aws-lambda/lib/lambda-insights.ts b/packages/aws-cdk-lib/aws-lambda/lib/lambda-insights.ts index 20e1240eec704..7b2e4151b311f 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/lambda-insights.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/lambda-insights.ts @@ -1,8 +1,8 @@ -import { Lazy, Stack, Token } from '../../core'; -import { FactName, RegionInfo } from '../../region-info'; import { Construct, IConstruct } from 'constructs'; import { Architecture } from './architecture'; import { IFunction } from './function-base'; +import { Lazy, Stack, Token } from '../../core'; +import { FactName, RegionInfo } from '../../region-info'; /** diff --git a/packages/aws-cdk-lib/aws-lambda/lib/lambda-version.ts b/packages/aws-cdk-lib/aws-lambda/lib/lambda-version.ts index 20dfc00021752..fb11d0f697ebd 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/lambda-version.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/lambda-version.ts @@ -1,5 +1,3 @@ -import * as cloudwatch from '../../aws-cloudwatch'; -import { Fn, Lazy, RemovalPolicy } from '../../core'; import { Construct } from 'constructs'; import { Alias, AliasOptions } from './alias'; import { Architecture } from './architecture'; @@ -8,6 +6,8 @@ import { Function } from './function'; import { IFunction, QualifiedFunctionBase } from './function-base'; import { CfnVersion } from './lambda.generated'; import { addAlias } from './util'; +import * as cloudwatch from '../../aws-cloudwatch'; +import { Fn, Lazy, RemovalPolicy } from '../../core'; export interface IVersion extends IFunction { /** diff --git a/packages/aws-cdk-lib/aws-lambda/lib/layers.ts b/packages/aws-cdk-lib/aws-lambda/lib/layers.ts index 07d860f377767..8fa00ec929949 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/layers.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/layers.ts @@ -1,9 +1,9 @@ -import { IResource, RemovalPolicy, Resource } from '../../core'; import { Construct } from 'constructs'; import { Architecture } from './architecture'; import { Code } from './code'; import { CfnLayerVersion, CfnLayerVersionPermission } from './lambda.generated'; import { Runtime } from './runtime'; +import { IResource, RemovalPolicy, Resource } from '../../core'; /** * Non runtime options diff --git a/packages/aws-cdk-lib/aws-lambda/lib/log-retention.ts b/packages/aws-cdk-lib/aws-lambda/lib/log-retention.ts index 8652a04abb718..4796ef31ec483 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/log-retention.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/log-retention.ts @@ -1,5 +1,5 @@ -import * as logs from '../../aws-logs'; import { Construct } from 'constructs'; +import * as logs from '../../aws-logs'; /** * Retry options for all AWS API calls. diff --git a/packages/aws-cdk-lib/aws-lambda/lib/permission.ts b/packages/aws-cdk-lib/aws-lambda/lib/permission.ts index 2616cd14569e3..ea11c2d72953b 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/permission.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/permission.ts @@ -1,6 +1,6 @@ -import * as iam from '../../aws-iam'; import { Construct } from 'constructs'; import { FunctionUrlAuthType } from './function-url'; +import * as iam from '../../aws-iam'; /** diff --git a/packages/aws-cdk-lib/aws-lambda/lib/private/scalable-function-attribute.ts b/packages/aws-cdk-lib/aws-lambda/lib/private/scalable-function-attribute.ts index 199669a9db622..3595631e1182e 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/private/scalable-function-attribute.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/private/scalable-function-attribute.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as appscaling from '../../../aws-applicationautoscaling'; import { Token } from '../../../core'; -import { Construct } from 'constructs'; import { IScalableFunctionAttribute, UtilizationScalingOptions } from '../scalable-attribute-api'; /** diff --git a/packages/aws-cdk-lib/aws-lambda/lib/runtime.ts b/packages/aws-cdk-lib/aws-lambda/lib/runtime.ts index f568e2855fe42..a4a900218ff40 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/runtime.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/runtime.ts @@ -136,11 +136,11 @@ export class Runtime { /** * The Python 3.10 runtime (python3.10) */ - public static readonly PYTHON_3_10 = new Runtime('python3.10', RuntimeFamily.PYTHON, { - supportsInlineCode: true, - supportsCodeGuruProfiling: true, - }); - + public static readonly PYTHON_3_10 = new Runtime('python3.10', RuntimeFamily.PYTHON, { + supportsInlineCode: true, + supportsCodeGuruProfiling: true, + }); + /** * The Java 8 runtime (java8) diff --git a/packages/aws-cdk-lib/aws-lambda/lib/scalable-attribute-api.ts b/packages/aws-cdk-lib/aws-lambda/lib/scalable-attribute-api.ts index eab5ed845fac1..2e90679fc017d 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/scalable-attribute-api.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/scalable-attribute-api.ts @@ -1,5 +1,5 @@ -import * as appscaling from '../../aws-applicationautoscaling'; import { IConstruct } from 'constructs'; +import * as appscaling from '../../aws-applicationautoscaling'; /** * Interface for scalable attributes diff --git a/packages/aws-cdk-lib/aws-lambda/lib/singleton-lambda.ts b/packages/aws-cdk-lib/aws-lambda/lib/singleton-lambda.ts index a0c79b39c727c..7c1d0ee0b48de 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/singleton-lambda.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/singleton-lambda.ts @@ -1,7 +1,3 @@ -import * as ec2 from '../../aws-ec2'; -import * as iam from '../../aws-iam'; -import * as logs from '../../aws-logs'; -import * as cdk from '../../core'; import { Construct, IConstruct, IDependable, Node } from 'constructs'; import { Architecture } from './architecture'; import { Function as LambdaFunction, FunctionProps, EnvironmentOptions } from './function'; @@ -10,6 +6,10 @@ import { Version } from './lambda-version'; import { ILayerVersion } from './layers'; import { Permission } from './permission'; import { Runtime } from './runtime'; +import * as ec2 from '../../aws-ec2'; +import * as iam from '../../aws-iam'; +import * as logs from '../../aws-logs'; +import * as cdk from '../../core'; /** * Properties for a newly created singleton Lambda diff --git a/packages/aws-cdk-lib/aws-lambda/test/alias.test.ts b/packages/aws-cdk-lib/aws-lambda/test/alias.test.ts index c638af75d3162..739a756559ec3 100644 --- a/packages/aws-cdk-lib/aws-lambda/test/alias.test.ts +++ b/packages/aws-cdk-lib/aws-lambda/test/alias.test.ts @@ -1,7 +1,7 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Annotations, Match, Template } from '../../assertions'; import * as appscaling from '../../aws-applicationautoscaling'; import * as cloudwatch from '../../aws-cloudwatch'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Lazy, Stack } from '../../core'; import * as lambda from '../lib'; diff --git a/packages/aws-cdk-lib/aws-lambda/test/function-hash.test.ts b/packages/aws-cdk-lib/aws-lambda/test/function-hash.test.ts index c9d3b28936fba..74b496e533f22 100644 --- a/packages/aws-cdk-lib/aws-lambda/test/function-hash.test.ts +++ b/packages/aws-cdk-lib/aws-lambda/test/function-hash.test.ts @@ -1,7 +1,7 @@ import * as path from 'path'; +import { resourceSpecification } from '@aws-cdk/cfnspec'; import { Template } from '../../assertions'; import * as ssm from '../../aws-ssm'; -import { resourceSpecification } from '@aws-cdk/cfnspec'; import { App, CfnOutput, CfnResource, Stack } from '../../core'; import * as cxapi from '../../cx-api'; import * as lambda from '../lib'; diff --git a/packages/aws-cdk-lib/aws-lambda/test/function.test.ts b/packages/aws-cdk-lib/aws-lambda/test/function.test.ts index e1727dfd25b42..bf637ac9c00ac 100644 --- a/packages/aws-cdk-lib/aws-lambda/test/function.test.ts +++ b/packages/aws-cdk-lib/aws-lambda/test/function.test.ts @@ -1,4 +1,7 @@ import * as path from 'path'; +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; +import * as constructs from 'constructs'; +import * as _ from 'lodash'; import { Annotations, Match, Template } from '../../assertions'; import { ProfilingGroup } from '../../aws-codeguruprofiler'; import * as ec2 from '../../aws-ec2'; @@ -10,12 +13,9 @@ import * as s3 from '../../aws-s3'; import * as signer from '../../aws-signer'; import * as sns from '../../aws-sns'; import * as sqs from '../../aws-sqs'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../core'; import { Aspects, Lazy, Size } from '../../core'; import * as cxapi from '../../cx-api'; -import * as constructs from 'constructs'; -import * as _ from 'lodash'; import * as lambda from '../lib'; import { AdotLambdaLayerJavaSdkVersion } from '../lib/adot-layers'; import { calculateFunctionHash } from '../lib/function-hash'; diff --git a/packages/aws-cdk-lib/aws-lambda/test/lambda-version.test.ts b/packages/aws-cdk-lib/aws-lambda/test/lambda-version.test.ts index 2c7ec1294bbcb..3bb09f32477bb 100644 --- a/packages/aws-cdk-lib/aws-lambda/test/lambda-version.test.ts +++ b/packages/aws-cdk-lib/aws-lambda/test/lambda-version.test.ts @@ -1,5 +1,5 @@ -import { Template } from '../../assertions'; import { testDeprecated } from '@aws-cdk/cdk-build-tools'; +import { Template } from '../../assertions'; import * as cdk from '../../core'; import * as lambda from '../lib'; diff --git a/packages/aws-cdk-lib/aws-lambda/test/singleton-lambda.test.ts b/packages/aws-cdk-lib/aws-lambda/test/singleton-lambda.test.ts index b25b64879b0b2..b9d119fbd2a96 100644 --- a/packages/aws-cdk-lib/aws-lambda/test/singleton-lambda.test.ts +++ b/packages/aws-cdk-lib/aws-lambda/test/singleton-lambda.test.ts @@ -1,8 +1,8 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from '../../assertions'; import * as ec2 from '../../aws-ec2'; import * as iam from '../../aws-iam'; import * as s3 from '../../aws-s3'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../core'; import * as lambda from '../lib'; diff --git a/packages/aws-cdk-lib/aws-lambda/test/vpc-lambda.test.ts b/packages/aws-cdk-lib/aws-lambda/test/vpc-lambda.test.ts index 5d27ef1623282..a38d852ac023b 100644 --- a/packages/aws-cdk-lib/aws-lambda/test/vpc-lambda.test.ts +++ b/packages/aws-cdk-lib/aws-lambda/test/vpc-lambda.test.ts @@ -1,6 +1,6 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from '../../assertions'; import * as ec2 from '../../aws-ec2'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../core'; import * as lambda from '../lib'; diff --git a/packages/aws-cdk-lib/aws-logs-destinations/lib/kinesis.ts b/packages/aws-cdk-lib/aws-logs-destinations/lib/kinesis.ts index 87b3083a9eba7..2f9b4fdee590b 100644 --- a/packages/aws-cdk-lib/aws-logs-destinations/lib/kinesis.ts +++ b/packages/aws-cdk-lib/aws-logs-destinations/lib/kinesis.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as iam from '../../aws-iam'; import * as kinesis from '../../aws-kinesis'; import * as logs from '../../aws-logs'; -import { Construct } from 'constructs'; /** * Customize the Kinesis Logs Destination diff --git a/packages/aws-cdk-lib/aws-logs-destinations/lib/lambda.ts b/packages/aws-cdk-lib/aws-logs-destinations/lib/lambda.ts index 5df8024a4a7b6..8ef4dad49d9c6 100644 --- a/packages/aws-cdk-lib/aws-logs-destinations/lib/lambda.ts +++ b/packages/aws-cdk-lib/aws-logs-destinations/lib/lambda.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as iam from '../../aws-iam'; import * as lambda from '../../aws-lambda'; import * as logs from '../../aws-logs'; -import { Construct } from 'constructs'; /** * Options that may be provided to LambdaDestination diff --git a/packages/aws-cdk-lib/aws-logs/lib/cross-account-destination.ts b/packages/aws-cdk-lib/aws-logs/lib/cross-account-destination.ts index fa2df279497da..072525835477c 100644 --- a/packages/aws-cdk-lib/aws-logs/lib/cross-account-destination.ts +++ b/packages/aws-cdk-lib/aws-logs/lib/cross-account-destination.ts @@ -1,10 +1,10 @@ -import * as iam from '../../aws-iam'; -import * as cdk from '../../core'; -import { ArnFormat } from '../../core'; import { Construct } from 'constructs'; import { ILogGroup } from './log-group'; import { CfnDestination } from './logs.generated'; import { ILogSubscriptionDestination, LogSubscriptionDestinationConfig } from './subscription-filter'; +import * as iam from '../../aws-iam'; +import { ArnFormat } from '../../core'; +import * as cdk from '../../core'; /** * Properties for a CrossAccountDestination diff --git a/packages/aws-cdk-lib/aws-logs/lib/data-protection-policy.ts b/packages/aws-cdk-lib/aws-logs/lib/data-protection-policy.ts index 903a8d71a7b1d..c32a88e59e25c 100644 --- a/packages/aws-cdk-lib/aws-logs/lib/data-protection-policy.ts +++ b/packages/aws-cdk-lib/aws-logs/lib/data-protection-policy.ts @@ -1,7 +1,7 @@ -import { Stack } from '../../core'; import { Construct } from 'constructs'; import { ILogGroup } from './log-group'; import { IBucket } from '../../aws-s3'; +import { Stack } from '../../core'; /** * Creates a data protection policy for CloudWatch Logs log groups. */ @@ -11,7 +11,7 @@ export class DataProtectionPolicy { constructor(props: DataProtectionPolicyProps) { if (props.identifiers.length == 0) { - throw new Error("DataIdentifier cannot be empty"); + throw new Error('DataIdentifier cannot be empty'); } this.dataProtectionPolicyProps = props; } @@ -74,7 +74,7 @@ export class DataProtectionPolicy { }, }, ]; - return {name, description, version, statement}; + return { name, description, version, statement }; } } diff --git a/packages/aws-cdk-lib/aws-logs/lib/log-group.ts b/packages/aws-cdk-lib/aws-logs/lib/log-group.ts index 6a9a0452e9e3b..81a130f83d03a 100644 --- a/packages/aws-cdk-lib/aws-logs/lib/log-group.ts +++ b/packages/aws-cdk-lib/aws-logs/lib/log-group.ts @@ -1,7 +1,3 @@ -import * as cloudwatch from '../../aws-cloudwatch'; -import * as iam from '../../aws-iam'; -import * as kms from '../../aws-kms'; -import { Arn, ArnFormat, RemovalPolicy, Resource, Stack, Token } from '../../core'; import { Construct } from 'constructs'; import { DataProtectionPolicy } from './data-protection-policy'; import { LogStream } from './log-stream'; @@ -10,6 +6,10 @@ import { MetricFilter } from './metric-filter'; import { FilterPattern, IFilterPattern } from './pattern'; import { ResourcePolicy } from './policy'; import { ILogSubscriptionDestination, SubscriptionFilter } from './subscription-filter'; +import * as cloudwatch from '../../aws-cloudwatch'; +import * as iam from '../../aws-iam'; +import * as kms from '../../aws-kms'; +import { Arn, ArnFormat, RemovalPolicy, Resource, Stack, Token } from '../../core'; export interface ILogGroup extends iam.IResourceWithPolicy { /** diff --git a/packages/aws-cdk-lib/aws-logs/lib/log-retention.ts b/packages/aws-cdk-lib/aws-logs/lib/log-retention.ts index 2af7d88c7188a..1a5ca3d893c0f 100644 --- a/packages/aws-cdk-lib/aws-logs/lib/log-retention.ts +++ b/packages/aws-cdk-lib/aws-logs/lib/log-retention.ts @@ -1,10 +1,10 @@ import * as path from 'path'; +import { Construct } from 'constructs'; +import { RetentionDays } from './log-group'; import * as iam from '../../aws-iam'; import * as s3_assets from '../../aws-s3-assets'; import * as cdk from '../../core'; import { ArnFormat } from '../../core'; -import { Construct } from 'constructs'; -import { RetentionDays } from './log-group'; import { FactName } from '../../region-info'; /** diff --git a/packages/aws-cdk-lib/aws-logs/lib/log-stream.ts b/packages/aws-cdk-lib/aws-logs/lib/log-stream.ts index 110ccfb08c36d..7696826d14b85 100644 --- a/packages/aws-cdk-lib/aws-logs/lib/log-stream.ts +++ b/packages/aws-cdk-lib/aws-logs/lib/log-stream.ts @@ -1,7 +1,7 @@ -import { IResource, RemovalPolicy, Resource } from '../../core'; import { Construct } from 'constructs'; import { ILogGroup } from './log-group'; import { CfnLogStream } from './logs.generated'; +import { IResource, RemovalPolicy, Resource } from '../../core'; export interface ILogStream extends IResource { /** diff --git a/packages/aws-cdk-lib/aws-logs/lib/metric-filter.ts b/packages/aws-cdk-lib/aws-logs/lib/metric-filter.ts index a567f3e84793c..04a85b0af03e6 100644 --- a/packages/aws-cdk-lib/aws-logs/lib/metric-filter.ts +++ b/packages/aws-cdk-lib/aws-logs/lib/metric-filter.ts @@ -1,8 +1,8 @@ -import { Metric, MetricOptions } from '../../aws-cloudwatch'; -import { Resource } from '../../core'; import { Construct } from 'constructs'; import { ILogGroup, MetricFilterOptions } from './log-group'; import { CfnMetricFilter } from './logs.generated'; +import { Metric, MetricOptions } from '../../aws-cloudwatch'; +import { Resource } from '../../core'; /** * Properties for a MetricFilter diff --git a/packages/aws-cdk-lib/aws-logs/lib/policy.ts b/packages/aws-cdk-lib/aws-logs/lib/policy.ts index a094a4127a84f..0e9515470d54e 100644 --- a/packages/aws-cdk-lib/aws-logs/lib/policy.ts +++ b/packages/aws-cdk-lib/aws-logs/lib/policy.ts @@ -1,7 +1,7 @@ -import { PolicyDocument, PolicyStatement } from '../../aws-iam'; -import { Resource, Lazy, Names } from '../../core'; import { Construct } from 'constructs'; import { CfnResourcePolicy } from './logs.generated'; +import { PolicyDocument, PolicyStatement } from '../../aws-iam'; +import { Resource, Lazy, Names } from '../../core'; /** * Properties to define Cloudwatch log group resource policy diff --git a/packages/aws-cdk-lib/aws-logs/lib/query-definition.ts b/packages/aws-cdk-lib/aws-logs/lib/query-definition.ts index f03f545a73d27..b29a3c8f1bcb0 100644 --- a/packages/aws-cdk-lib/aws-logs/lib/query-definition.ts +++ b/packages/aws-cdk-lib/aws-logs/lib/query-definition.ts @@ -1,7 +1,7 @@ -import { Resource } from '../../core'; import { Construct } from 'constructs'; import { CfnQueryDefinition } from '.'; import { ILogGroup } from './log-group'; +import { Resource } from '../../core'; /** diff --git a/packages/aws-cdk-lib/aws-logs/lib/subscription-filter.ts b/packages/aws-cdk-lib/aws-logs/lib/subscription-filter.ts index 5227478d071c9..5011006fa3133 100644 --- a/packages/aws-cdk-lib/aws-logs/lib/subscription-filter.ts +++ b/packages/aws-cdk-lib/aws-logs/lib/subscription-filter.ts @@ -1,8 +1,8 @@ -import * as iam from '../../aws-iam'; -import { Resource } from '../../core'; import { Construct } from 'constructs'; import { ILogGroup, SubscriptionFilterOptions } from './log-group'; import { CfnSubscriptionFilter } from './logs.generated'; +import * as iam from '../../aws-iam'; +import { Resource } from '../../core'; /** * Interface for classes that can be the destination of a log Subscription diff --git a/packages/aws-cdk-lib/aws-logs/test/log-retention.test.ts b/packages/aws-cdk-lib/aws-logs/test/log-retention.test.ts index bf52dd5f34bb3..373a0e303cdad 100644 --- a/packages/aws-cdk-lib/aws-logs/test/log-retention.test.ts +++ b/packages/aws-cdk-lib/aws-logs/test/log-retention.test.ts @@ -50,7 +50,7 @@ describe('log retention', () => { 'Ref': 'AWS::Region', }, 'value', - ] + ], }, }); diff --git a/packages/aws-cdk-lib/aws-logs/test/loggroup.test.ts b/packages/aws-cdk-lib/aws-logs/test/loggroup.test.ts index 37dd28338e6d0..a1d2fb092fabf 100644 --- a/packages/aws-cdk-lib/aws-logs/test/loggroup.test.ts +++ b/packages/aws-cdk-lib/aws-logs/test/loggroup.test.ts @@ -3,7 +3,7 @@ import * as iam from '../../aws-iam'; import * as kms from '../../aws-kms'; import { Bucket } from '../../aws-s3'; import { CfnParameter, Fn, RemovalPolicy, Stack } from '../../core'; -import { LogGroup, RetentionDays , DataProtectionPolicy, DataIdentifier} from '../lib'; +import { LogGroup, RetentionDays, DataProtectionPolicy, DataIdentifier } from '../lib'; describe('log group', () => { test('set kms key when provided', () => { @@ -600,8 +600,8 @@ describe('log group', () => { // GIVEN const stack = new Stack(); - const auditLogGroup = new LogGroup(stack, 'LogGroupAudit', {logGroupName: 'audit-log-group'}); - const auditS3Bucket = new Bucket(stack, 'BucketAudit', {bucketName: 'audit-bucket'}); + const auditLogGroup = new LogGroup(stack, 'LogGroupAudit', { logGroupName: 'audit-log-group' }); + const auditS3Bucket = new Bucket(stack, 'BucketAudit', { bucketName: 'audit-bucket' }); const auditDeliveryStreamName = 'delivery-stream-name'; const dataProtectionPolicy = new DataProtectionPolicy({ @@ -645,16 +645,16 @@ describe('log group', () => { findingsDestination: { cloudWatchLogs: { logGroup: { - Ref: "LogGroupAudit2C8B7F73" - } + Ref: 'LogGroupAudit2C8B7F73', + }, }, firehose: { deliveryStream: auditDeliveryStreamName, }, s3: { bucket: { - Ref: "BucketAudit1DED3529" - } + Ref: 'BucketAudit1DED3529', + }, }, }, }, diff --git a/packages/aws-cdk-lib/aws-logs/test/query-definition.test.ts b/packages/aws-cdk-lib/aws-logs/test/query-definition.test.ts index 1ff7e49c7e6f5..be2613c7280db 100644 --- a/packages/aws-cdk-lib/aws-logs/test/query-definition.test.ts +++ b/packages/aws-cdk-lib/aws-logs/test/query-definition.test.ts @@ -1,5 +1,5 @@ -import { Template } from '../../assertions'; import { testDeprecated } from '@aws-cdk/cdk-build-tools'; +import { Template } from '../../assertions'; import { Stack } from '../../core'; import { LogGroup, QueryDefinition, QueryString } from '../lib'; diff --git a/packages/aws-cdk-lib/aws-logs/test/subscriptionfilter.test.ts b/packages/aws-cdk-lib/aws-logs/test/subscriptionfilter.test.ts index d3505a415234a..027916f393724 100644 --- a/packages/aws-cdk-lib/aws-logs/test/subscriptionfilter.test.ts +++ b/packages/aws-cdk-lib/aws-logs/test/subscriptionfilter.test.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import { Template } from '../../assertions'; import { Stack } from '../../core'; -import { Construct } from 'constructs'; import { FilterPattern, ILogGroup, ILogSubscriptionDestination, LogGroup, SubscriptionFilter } from '../lib'; describe('subscription filter', () => { diff --git a/packages/aws-cdk-lib/aws-opensearchservice/lib/domain.ts b/packages/aws-cdk-lib/aws-opensearchservice/lib/domain.ts index d37cf8e352860..d7e4a6b5649fb 100644 --- a/packages/aws-cdk-lib/aws-opensearchservice/lib/domain.ts +++ b/packages/aws-cdk-lib/aws-opensearchservice/lib/domain.ts @@ -1,5 +1,11 @@ import { URL } from 'url'; +import { Construct } from 'constructs'; +import { LogGroupResourcePolicy } from './log-group-resource-policy'; +import { OpenSearchAccessPolicy } from './opensearch-access-policy'; +import { CfnDomain } from './opensearchservice.generated'; +import * as perms from './perms'; +import { EngineVersion } from './version'; import * as acm from '../../aws-certificatemanager'; import { Metric, MetricOptions, Statistic } from '../../aws-cloudwatch'; import * as ec2 from '../../aws-ec2'; @@ -9,13 +15,7 @@ import * as logs from '../../aws-logs'; import * as route53 from '../../aws-route53'; import * as secretsmanager from '../../aws-secretsmanager'; import * as cdk from '../../core'; -import { Construct } from 'constructs'; -import { LogGroupResourcePolicy } from './log-group-resource-policy'; -import { OpenSearchAccessPolicy } from './opensearch-access-policy'; -import { CfnDomain } from './opensearchservice.generated'; -import * as perms from './perms'; -import { EngineVersion } from './version'; /** * Configures the capacity of the cluster such as the instance type and the diff --git a/packages/aws-cdk-lib/aws-opensearchservice/lib/log-group-resource-policy.ts b/packages/aws-cdk-lib/aws-opensearchservice/lib/log-group-resource-policy.ts index 5a9058076016d..02efb71afc184 100644 --- a/packages/aws-cdk-lib/aws-opensearchservice/lib/log-group-resource-policy.ts +++ b/packages/aws-cdk-lib/aws-opensearchservice/lib/log-group-resource-policy.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as iam from '../../aws-iam'; import * as cr from '../../custom-resources'; -import { Construct } from 'constructs'; /** * Construction properties for LogGroupResourcePolicy diff --git a/packages/aws-cdk-lib/aws-opensearchservice/lib/opensearch-access-policy.ts b/packages/aws-cdk-lib/aws-opensearchservice/lib/opensearch-access-policy.ts index ae95e3cd32255..eca4d4b229621 100644 --- a/packages/aws-cdk-lib/aws-opensearchservice/lib/opensearch-access-policy.ts +++ b/packages/aws-cdk-lib/aws-opensearchservice/lib/opensearch-access-policy.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as iam from '../../aws-iam'; import * as cdk from '../../core'; import * as cr from '../../custom-resources'; -import { Construct } from 'constructs'; /** * Construction properties for OpenSearchAccessPolicy diff --git a/packages/aws-cdk-lib/aws-opensearchservice/test/domain.test.ts b/packages/aws-cdk-lib/aws-opensearchservice/test/domain.test.ts index ae722165aad24..995dae3035ee1 100644 --- a/packages/aws-cdk-lib/aws-opensearchservice/test/domain.test.ts +++ b/packages/aws-cdk-lib/aws-opensearchservice/test/domain.test.ts @@ -1,4 +1,5 @@ /* eslint-disable jest/expect-expect */ +import each from 'jest-each'; import { Match, Template } from '../../assertions'; import * as acm from '../../aws-certificatemanager'; import { Metric, Statistic } from '../../aws-cloudwatch'; @@ -8,7 +9,6 @@ import * as kms from '../../aws-kms'; import * as logs from '../../aws-logs'; import * as route53 from '../../aws-route53'; import { App, Stack, Duration, SecretValue, CfnParameter, Token } from '../../core'; -import each from 'jest-each'; import { Domain, EngineVersion } from '../lib'; let app: App; diff --git a/packages/aws-cdk-lib/aws-proton/.jsiirc.json b/packages/aws-cdk-lib/aws-proton/.jsiirc.json new file mode 100644 index 0000000000000..c85aea0ed7b07 --- /dev/null +++ b/packages/aws-cdk-lib/aws-proton/.jsiirc.json @@ -0,0 +1,13 @@ +{ + "targets": { + "java": { + "package": "services.proton" + }, + "dotnet": { + "package": "Amazon.CDK.AWS.Proton" + }, + "python": { + "module": "aws_cdk.aws_proton" + } + } +} diff --git a/packages/aws-cdk-lib/aws-proton/index.ts b/packages/aws-cdk-lib/aws-proton/index.ts new file mode 100644 index 0000000000000..f41a696fd204d --- /dev/null +++ b/packages/aws-cdk-lib/aws-proton/index.ts @@ -0,0 +1 @@ +export * from './lib'; diff --git a/packages/aws-cdk-lib/aws-proton/lib/index.ts b/packages/aws-cdk-lib/aws-proton/lib/index.ts new file mode 100644 index 0000000000000..11b76a45a2d5d --- /dev/null +++ b/packages/aws-cdk-lib/aws-proton/lib/index.ts @@ -0,0 +1,2 @@ +// AWS::Proton Cloudformation Resources +export * from './proton.generated'; diff --git a/packages/aws-cdk-lib/aws-rds/lib/cluster-engine.ts b/packages/aws-cdk-lib/aws-rds/lib/cluster-engine.ts index dc8e7102f9d06..7de6192db6255 100644 --- a/packages/aws-cdk-lib/aws-rds/lib/cluster-engine.ts +++ b/packages/aws-cdk-lib/aws-rds/lib/cluster-engine.ts @@ -1,9 +1,9 @@ -import * as iam from '../../aws-iam'; -import * as secretsmanager from '../../aws-secretsmanager'; import { Construct } from 'constructs'; import { IEngine } from './engine'; import { EngineVersion } from './engine-version'; import { IParameterGroup, ParameterGroup } from './parameter-group'; +import * as iam from '../../aws-iam'; +import * as secretsmanager from '../../aws-secretsmanager'; /** * The extra options passed to the `IClusterEngine.bindToCluster` method. diff --git a/packages/aws-cdk-lib/aws-rds/lib/cluster-ref.ts b/packages/aws-cdk-lib/aws-rds/lib/cluster-ref.ts index 8829ebac968d3..426062964ec6f 100644 --- a/packages/aws-cdk-lib/aws-rds/lib/cluster-ref.ts +++ b/packages/aws-cdk-lib/aws-rds/lib/cluster-ref.ts @@ -1,9 +1,9 @@ -import * as ec2 from '../../aws-ec2'; -import * as secretsmanager from '../../aws-secretsmanager'; -import { IResource } from '../../core'; import { IClusterEngine } from './cluster-engine'; import { Endpoint } from './endpoint'; import { DatabaseProxy, DatabaseProxyOptions } from './proxy'; +import * as ec2 from '../../aws-ec2'; +import * as secretsmanager from '../../aws-secretsmanager'; +import { IResource } from '../../core'; /** * Create a clustered database with a given number of instances. diff --git a/packages/aws-cdk-lib/aws-rds/lib/cluster.ts b/packages/aws-cdk-lib/aws-rds/lib/cluster.ts index 59528f6d8892b..d9f207c6ac4bc 100644 --- a/packages/aws-cdk-lib/aws-rds/lib/cluster.ts +++ b/packages/aws-cdk-lib/aws-rds/lib/cluster.ts @@ -1,11 +1,3 @@ -import * as ec2 from '../../aws-ec2'; -import { IRole, ManagedPolicy, Role, ServicePrincipal } from '../../aws-iam'; -import * as kms from '../../aws-kms'; -import * as logs from '../../aws-logs'; -import * as s3 from '../../aws-s3'; -import * as secretsmanager from '../../aws-secretsmanager'; -import { Annotations, Duration, FeatureFlags, RemovalPolicy, Resource, Token } from '../../core'; -import * as cxapi from '../../cx-api'; import { Construct } from 'constructs'; import { IClusterEngine } from './cluster-engine'; import { DatabaseClusterAttributes, IDatabaseCluster } from './cluster-ref'; @@ -18,6 +10,14 @@ import { BackupProps, Credentials, InstanceProps, PerformanceInsightRetention, R import { DatabaseProxy, DatabaseProxyOptions, ProxyTarget } from './proxy'; import { CfnDBCluster, CfnDBClusterProps, CfnDBInstance } from './rds.generated'; import { ISubnetGroup, SubnetGroup } from './subnet-group'; +import * as ec2 from '../../aws-ec2'; +import { IRole, ManagedPolicy, Role, ServicePrincipal } from '../../aws-iam'; +import * as kms from '../../aws-kms'; +import * as logs from '../../aws-logs'; +import * as s3 from '../../aws-s3'; +import * as secretsmanager from '../../aws-secretsmanager'; +import { Annotations, Duration, FeatureFlags, RemovalPolicy, Resource, Token } from '../../core'; +import * as cxapi from '../../cx-api'; /** * Common properties for a new database cluster or cluster from snapshot. diff --git a/packages/aws-cdk-lib/aws-rds/lib/database-secret.ts b/packages/aws-cdk-lib/aws-rds/lib/database-secret.ts index 6d3c3cc1b0b3f..d19c458f490ad 100644 --- a/packages/aws-cdk-lib/aws-rds/lib/database-secret.ts +++ b/packages/aws-cdk-lib/aws-rds/lib/database-secret.ts @@ -1,9 +1,9 @@ +import { Construct } from 'constructs'; +import { DEFAULT_PASSWORD_EXCLUDE_CHARS } from './private/util'; import * as kms from '../../aws-kms'; import * as secretsmanager from '../../aws-secretsmanager'; import { Aws, Names } from '../../core'; import { md5hash } from '../../core/lib/helpers-internal'; -import { Construct } from 'constructs'; -import { DEFAULT_PASSWORD_EXCLUDE_CHARS } from './private/util'; /** * Construction properties for a DatabaseSecret. diff --git a/packages/aws-cdk-lib/aws-rds/lib/instance-engine.ts b/packages/aws-cdk-lib/aws-rds/lib/instance-engine.ts index e12833906324d..dfa3b36fff9fd 100644 --- a/packages/aws-cdk-lib/aws-rds/lib/instance-engine.ts +++ b/packages/aws-cdk-lib/aws-rds/lib/instance-engine.ts @@ -1,9 +1,9 @@ -import * as iam from '../../aws-iam'; -import * as secretsmanager from '../../aws-secretsmanager'; import { Construct } from 'constructs'; import { IEngine } from './engine'; import { EngineVersion } from './engine-version'; import { IOptionGroup, OptionGroup } from './option-group'; +import * as iam from '../../aws-iam'; +import * as secretsmanager from '../../aws-secretsmanager'; /** * The options passed to `IInstanceEngine.bind`. diff --git a/packages/aws-cdk-lib/aws-rds/lib/instance.ts b/packages/aws-cdk-lib/aws-rds/lib/instance.ts index 4c7192a9c1230..30fb386be3ae9 100644 --- a/packages/aws-cdk-lib/aws-rds/lib/instance.ts +++ b/packages/aws-cdk-lib/aws-rds/lib/instance.ts @@ -1,12 +1,3 @@ -import * as ec2 from '../../aws-ec2'; -import * as events from '../../aws-events'; -import * as iam from '../../aws-iam'; -import * as kms from '../../aws-kms'; -import * as logs from '../../aws-logs'; -import * as s3 from '../../aws-s3'; -import * as secretsmanager from '../../aws-secretsmanager'; -import { ArnComponents, ArnFormat, Duration, FeatureFlags, IResource, Lazy, RemovalPolicy, Resource, Stack, Token, Tokenization } from '../../core'; -import * as cxapi from '../../cx-api'; import { Construct } from 'constructs'; import { DatabaseSecret } from './database-secret'; import { Endpoint } from './endpoint'; @@ -18,6 +9,15 @@ import { Credentials, PerformanceInsightRetention, RotationMultiUserOptions, Rot import { DatabaseProxy, DatabaseProxyOptions, ProxyTarget } from './proxy'; import { CfnDBInstance, CfnDBInstanceProps } from './rds.generated'; import { ISubnetGroup, SubnetGroup } from './subnet-group'; +import * as ec2 from '../../aws-ec2'; +import * as events from '../../aws-events'; +import * as iam from '../../aws-iam'; +import * as kms from '../../aws-kms'; +import * as logs from '../../aws-logs'; +import * as s3 from '../../aws-s3'; +import * as secretsmanager from '../../aws-secretsmanager'; +import { ArnComponents, ArnFormat, Duration, FeatureFlags, IResource, Lazy, RemovalPolicy, Resource, Stack, Token, Tokenization } from '../../core'; +import * as cxapi from '../../cx-api'; /** * A database instance diff --git a/packages/aws-cdk-lib/aws-rds/lib/option-group.ts b/packages/aws-cdk-lib/aws-rds/lib/option-group.ts index 701477ccfb4d2..8b4ca531e804a 100644 --- a/packages/aws-cdk-lib/aws-rds/lib/option-group.ts +++ b/packages/aws-cdk-lib/aws-rds/lib/option-group.ts @@ -1,8 +1,8 @@ -import * as ec2 from '../../aws-ec2'; -import { IResource, Lazy, Resource } from '../../core'; import { Construct } from 'constructs'; import { IInstanceEngine } from './instance-engine'; import { CfnOptionGroup } from './rds.generated'; +import * as ec2 from '../../aws-ec2'; +import { IResource, Lazy, Resource } from '../../core'; /** * An option group diff --git a/packages/aws-cdk-lib/aws-rds/lib/parameter-group.ts b/packages/aws-cdk-lib/aws-rds/lib/parameter-group.ts index 764eb1ca995c5..17a5e44f95816 100644 --- a/packages/aws-cdk-lib/aws-rds/lib/parameter-group.ts +++ b/packages/aws-cdk-lib/aws-rds/lib/parameter-group.ts @@ -1,7 +1,7 @@ -import { IResource, Lazy, Resource } from '../../core'; import { Construct } from 'constructs'; import { IEngine } from './engine'; import { CfnDBClusterParameterGroup, CfnDBParameterGroup } from './rds.generated'; +import { IResource, Lazy, Resource } from '../../core'; /** * Options for `IParameterGroup.bindToCluster`. diff --git a/packages/aws-cdk-lib/aws-rds/lib/private/util.ts b/packages/aws-cdk-lib/aws-rds/lib/private/util.ts index f8662fdde3714..b1b8f89dd8ad9 100644 --- a/packages/aws-cdk-lib/aws-rds/lib/private/util.ts +++ b/packages/aws-cdk-lib/aws-rds/lib/private/util.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import * as ec2 from '../../../aws-ec2'; import * as iam from '../../../aws-iam'; import * as s3 from '../../../aws-s3'; import { RemovalPolicy } from '../../../core'; -import { Construct } from 'constructs'; import { DatabaseSecret } from '../database-secret'; import { IEngine } from '../engine'; import { CommonRotationUserOptions, Credentials } from '../props'; diff --git a/packages/aws-cdk-lib/aws-rds/lib/props.ts b/packages/aws-cdk-lib/aws-rds/lib/props.ts index 9be9f37ea9768..76cd204416b8a 100644 --- a/packages/aws-cdk-lib/aws-rds/lib/props.ts +++ b/packages/aws-cdk-lib/aws-rds/lib/props.ts @@ -1,8 +1,8 @@ +import { IParameterGroup } from './parameter-group'; import * as ec2 from '../../aws-ec2'; import * as kms from '../../aws-kms'; import * as secretsmanager from '../../aws-secretsmanager'; import { Duration, SecretValue } from '../../core'; -import { IParameterGroup } from './parameter-group'; /** * Instance properties for database instances diff --git a/packages/aws-cdk-lib/aws-rds/lib/proxy.ts b/packages/aws-cdk-lib/aws-rds/lib/proxy.ts index b49f994e92494..63f8b483b908e 100644 --- a/packages/aws-cdk-lib/aws-rds/lib/proxy.ts +++ b/packages/aws-cdk-lib/aws-rds/lib/proxy.ts @@ -1,14 +1,14 @@ -import * as ec2 from '../../aws-ec2'; -import * as iam from '../../aws-iam'; -import * as secretsmanager from '../../aws-secretsmanager'; -import * as cdk from '../../core'; -import * as cxapi from '../../cx-api'; import { Construct } from 'constructs'; import { IDatabaseCluster } from './cluster-ref'; import { IEngine } from './engine'; import { IDatabaseInstance } from './instance'; import { engineDescription } from './private/util'; import { CfnDBProxy, CfnDBProxyTargetGroup } from './rds.generated'; +import * as ec2 from '../../aws-ec2'; +import * as iam from '../../aws-iam'; +import * as secretsmanager from '../../aws-secretsmanager'; +import * as cdk from '../../core'; +import * as cxapi from '../../cx-api'; /** * SessionPinningFilter diff --git a/packages/aws-cdk-lib/aws-rds/lib/serverless-cluster.ts b/packages/aws-cdk-lib/aws-rds/lib/serverless-cluster.ts index b7ebd199c8bc6..1317f9454c8e8 100644 --- a/packages/aws-cdk-lib/aws-rds/lib/serverless-cluster.ts +++ b/packages/aws-cdk-lib/aws-rds/lib/serverless-cluster.ts @@ -1,9 +1,3 @@ -import * as ec2 from '../../aws-ec2'; -import * as iam from '../../aws-iam'; -import * as kms from '../../aws-kms'; -import * as secretsmanager from '../../aws-secretsmanager'; -import { Resource, Duration, Token, Annotations, RemovalPolicy, IResource, Stack, Lazy, FeatureFlags, ArnFormat } from '../../core'; -import * as cxapi from '../../cx-api'; import { Construct } from 'constructs'; import { IClusterEngine } from './cluster-engine'; import { DatabaseSecret } from './database-secret'; @@ -14,6 +8,12 @@ import { applyDefaultRotationOptions, defaultDeletionProtection, renderCredentia import { Credentials, RotationMultiUserOptions, RotationSingleUserOptions, SnapshotCredentials } from './props'; import { CfnDBCluster, CfnDBClusterProps } from './rds.generated'; import { ISubnetGroup, SubnetGroup } from './subnet-group'; +import * as ec2 from '../../aws-ec2'; +import * as iam from '../../aws-iam'; +import * as kms from '../../aws-kms'; +import * as secretsmanager from '../../aws-secretsmanager'; +import { Resource, Duration, Token, Annotations, RemovalPolicy, IResource, Stack, Lazy, FeatureFlags, ArnFormat } from '../../core'; +import * as cxapi from '../../cx-api'; /** * Interface representing a serverless database cluster. diff --git a/packages/aws-cdk-lib/aws-rds/lib/subnet-group.ts b/packages/aws-cdk-lib/aws-rds/lib/subnet-group.ts index 215509090d6a2..472152b940a88 100644 --- a/packages/aws-cdk-lib/aws-rds/lib/subnet-group.ts +++ b/packages/aws-cdk-lib/aws-rds/lib/subnet-group.ts @@ -1,7 +1,7 @@ -import * as ec2 from '../../aws-ec2'; -import { IResource, RemovalPolicy, Resource, Token } from '../../core'; import { Construct } from 'constructs'; import { CfnDBSubnetGroup } from './rds.generated'; +import * as ec2 from '../../aws-ec2'; +import { IResource, RemovalPolicy, Resource, Token } from '../../core'; /** * Interface for a subnet group. diff --git a/packages/aws-cdk-lib/aws-rds/test/snapshot-handler/index.ts b/packages/aws-cdk-lib/aws-rds/test/snapshot-handler/index.ts index 604e58bc99c55..421827b511f70 100644 --- a/packages/aws-cdk-lib/aws-rds/test/snapshot-handler/index.ts +++ b/packages/aws-cdk-lib/aws-rds/test/snapshot-handler/index.ts @@ -1,6 +1,6 @@ /* eslint-disable no-console */ -import * as AWSCDKAsyncCustomResource from '../../../custom-resources/lib/provider-framework/types'; import { RDS } from 'aws-sdk'; // eslint-disable-line import/no-extraneous-dependencies +import * as AWSCDKAsyncCustomResource from '../../../custom-resources/lib/provider-framework/types'; export async function onEventHandler(event: AWSCDKAsyncCustomResource.OnEventRequest): Promise { console.log('Event: %j', event); diff --git a/packages/aws-cdk-lib/aws-route53-patterns/lib/website-redirect.ts b/packages/aws-cdk-lib/aws-route53-patterns/lib/website-redirect.ts index c75242d9d1e4c..aedd43a9f5117 100644 --- a/packages/aws-cdk-lib/aws-route53-patterns/lib/website-redirect.ts +++ b/packages/aws-cdk-lib/aws-route53-patterns/lib/website-redirect.ts @@ -1,3 +1,4 @@ +import { Construct } from 'constructs'; import { DnsValidatedCertificate, ICertificate, Certificate, CertificateValidation } from '../../aws-certificatemanager'; import { CloudFrontWebDistribution, OriginProtocolPolicy, PriceClass, ViewerCertificate, ViewerProtocolPolicy } from '../../aws-cloudfront'; import { ARecord, AaaaRecord, IHostedZone, RecordTarget } from '../../aws-route53'; @@ -6,7 +7,6 @@ import { BlockPublicAccess, Bucket, RedirectProtocol } from '../../aws-s3'; import { ArnFormat, RemovalPolicy, Stack, Token, FeatureFlags } from '../../core'; import { md5hash } from '../../core/lib/helpers-internal'; import { ROUTE53_PATTERNS_USE_CERTIFICATE } from '../../cx-api'; -import { Construct } from 'constructs'; /** * Properties to configure an HTTPS Redirect diff --git a/packages/aws-cdk-lib/aws-route53-patterns/test/bucket-website-target.test.ts b/packages/aws-cdk-lib/aws-route53-patterns/test/bucket-website-target.test.ts index 1b37792b06666..0cb56a8353210 100644 --- a/packages/aws-cdk-lib/aws-route53-patterns/test/bucket-website-target.test.ts +++ b/packages/aws-cdk-lib/aws-route53-patterns/test/bucket-website-target.test.ts @@ -1,7 +1,7 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from '../../assertions'; import { Certificate } from '../../aws-certificatemanager'; import { HostedZone } from '../../aws-route53'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { App, Stack } from '../../core'; import { ROUTE53_PATTERNS_USE_CERTIFICATE } from '../../cx-api'; import { HttpsRedirect } from '../lib'; diff --git a/packages/aws-cdk-lib/aws-route53-targets/lib/cloudfront-target.ts b/packages/aws-cdk-lib/aws-route53-targets/lib/cloudfront-target.ts index b50dd2d41c2bd..bf7006fb8cfef 100644 --- a/packages/aws-cdk-lib/aws-route53-targets/lib/cloudfront-target.ts +++ b/packages/aws-cdk-lib/aws-route53-targets/lib/cloudfront-target.ts @@ -1,7 +1,7 @@ +import { IConstruct } from 'constructs'; import * as cloudfront from '../../aws-cloudfront'; import * as route53 from '../../aws-route53'; import { Aws, CfnMapping, Stack } from '../../core'; -import { IConstruct } from 'constructs'; /** * Use a CloudFront Distribution as an alias record target diff --git a/packages/aws-cdk-lib/aws-route53-targets/lib/userpool-domain.ts b/packages/aws-cdk-lib/aws-route53-targets/lib/userpool-domain.ts index 36c3bfe529184..a081716831d5e 100644 --- a/packages/aws-cdk-lib/aws-route53-targets/lib/userpool-domain.ts +++ b/packages/aws-cdk-lib/aws-route53-targets/lib/userpool-domain.ts @@ -1,6 +1,6 @@ +import { CloudFrontTarget } from './cloudfront-target'; import { UserPoolDomain } from '../../aws-cognito'; import { AliasRecordTargetConfig, IAliasRecordTarget, IHostedZone, IRecordSet } from '../../aws-route53'; -import { CloudFrontTarget } from './cloudfront-target'; /** * Use a user pool domain as an alias record target diff --git a/packages/aws-cdk-lib/aws-route53/lib/hosted-zone.ts b/packages/aws-cdk-lib/aws-route53/lib/hosted-zone.ts index 4ee4e92bc517f..a7355945db403 100644 --- a/packages/aws-cdk-lib/aws-route53/lib/hosted-zone.ts +++ b/packages/aws-cdk-lib/aws-route53/lib/hosted-zone.ts @@ -1,13 +1,13 @@ -import * as ec2 from '../../aws-ec2'; -import * as iam from '../../aws-iam'; -import * as cxschema from '../../cloud-assembly-schema'; -import { ContextProvider, Duration, Lazy, Resource, Stack } from '../../core'; import { Construct } from 'constructs'; import { HostedZoneProviderProps } from './hosted-zone-provider'; import { HostedZoneAttributes, IHostedZone, PublicHostedZoneAttributes } from './hosted-zone-ref'; import { CaaAmazonRecord, ZoneDelegationRecord } from './record-set'; import { CfnHostedZone } from './route53.generated'; import { makeHostedZoneArn, validateZoneName } from './util'; +import * as ec2 from '../../aws-ec2'; +import * as iam from '../../aws-iam'; +import * as cxschema from '../../cloud-assembly-schema'; +import { ContextProvider, Duration, Lazy, Resource, Stack } from '../../core'; /** * Common properties to create a Route 53 hosted zone diff --git a/packages/aws-cdk-lib/aws-route53/lib/record-set.ts b/packages/aws-cdk-lib/aws-route53/lib/record-set.ts index 29fcf8d19065d..5fd9b8afd7dc4 100644 --- a/packages/aws-cdk-lib/aws-route53/lib/record-set.ts +++ b/packages/aws-cdk-lib/aws-route53/lib/record-set.ts @@ -1,11 +1,11 @@ import * as path from 'path'; -import * as iam from '../../aws-iam'; -import { builtInCustomResourceProviderNodeRuntime, CustomResource, CustomResourceProvider, Duration, IResource, RemovalPolicy, Resource, Token } from '../../core'; import { Construct } from 'constructs'; import { IAliasRecordTarget } from './alias-record-target'; import { IHostedZone } from './hosted-zone-ref'; import { CfnRecordSet } from './route53.generated'; import { determineFullyQualifiedDomainName } from './util'; +import * as iam from '../../aws-iam'; +import { builtInCustomResourceProviderNodeRuntime, CustomResource, CustomResourceProvider, Duration, IResource, RemovalPolicy, Resource, Token } from '../../core'; const CROSS_ACCOUNT_ZONE_DELEGATION_RESOURCE_TYPE = 'Custom::CrossAccountZoneDelegation'; const DELETE_EXISTING_RECORD_SET_RESOURCE_TYPE = 'Custom::DeleteExistingRecordSet'; diff --git a/packages/aws-cdk-lib/aws-route53/lib/util.ts b/packages/aws-cdk-lib/aws-route53/lib/util.ts index d43778e9b9b00..09f1146a60247 100644 --- a/packages/aws-cdk-lib/aws-route53/lib/util.ts +++ b/packages/aws-cdk-lib/aws-route53/lib/util.ts @@ -1,6 +1,6 @@ -import { Stack } from '../../core'; import { Construct } from 'constructs'; import { IHostedZone } from './hosted-zone-ref'; +import { Stack } from '../../core'; /** * Validates a zone name is valid by Route53 specifc naming rules, diff --git a/packages/aws-cdk-lib/aws-route53/lib/vpc-endpoint-service-domain-name.ts b/packages/aws-cdk-lib/aws-route53/lib/vpc-endpoint-service-domain-name.ts index 35010fee7e7c7..2dc10b43bbdce 100644 --- a/packages/aws-cdk-lib/aws-route53/lib/vpc-endpoint-service-domain-name.ts +++ b/packages/aws-cdk-lib/aws-route53/lib/vpc-endpoint-service-domain-name.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import { IVpcEndpointService } from '../../aws-ec2'; import { Fn, Names, Stack } from '../../core'; import { md5hash } from '../../core/lib/helpers-internal'; import { AwsCustomResource, AwsCustomResourcePolicy, PhysicalResourceId } from '../../custom-resources'; -import { Construct } from 'constructs'; import { IPublicHostedZone, TxtRecord } from '../lib'; /** diff --git a/packages/aws-cdk-lib/aws-route53/test/hosted-zone.test.ts b/packages/aws-cdk-lib/aws-route53/test/hosted-zone.test.ts index 7738914302828..70b3bc76e0161 100644 --- a/packages/aws-cdk-lib/aws-route53/test/hosted-zone.test.ts +++ b/packages/aws-cdk-lib/aws-route53/test/hosted-zone.test.ts @@ -1,7 +1,7 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Match, Template } from '../../assertions'; import * as ec2 from '../../aws-ec2'; import * as iam from '../../aws-iam'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../core'; import { HostedZone, PrivateHostedZone, PublicHostedZone } from '../lib'; diff --git a/packages/aws-cdk-lib/aws-route53/test/record-set.test.ts b/packages/aws-cdk-lib/aws-route53/test/record-set.test.ts index d52dae6f48c1d..075b6eb2a81ce 100644 --- a/packages/aws-cdk-lib/aws-route53/test/record-set.test.ts +++ b/packages/aws-cdk-lib/aws-route53/test/record-set.test.ts @@ -1,6 +1,6 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from '../../assertions'; import * as iam from '../../aws-iam'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Duration, RemovalPolicy, Stack } from '../../core'; import * as route53 from '../lib'; diff --git a/packages/aws-cdk-lib/aws-s3-assets/lib/asset.ts b/packages/aws-cdk-lib/aws-s3-assets/lib/asset.ts index 0019e72d694ca..a5b5f58e38d12 100644 --- a/packages/aws-cdk-lib/aws-s3-assets/lib/asset.ts +++ b/packages/aws-cdk-lib/aws-s3-assets/lib/asset.ts @@ -1,12 +1,12 @@ import * as path from 'path'; +import { Construct } from 'constructs'; +import { toSymlinkFollow } from './compat'; import { CopyOptions } from '../../assets'; import * as iam from '../../aws-iam'; import * as kms from '../../aws-kms'; import * as s3 from '../../aws-s3'; import * as cdk from '../../core'; import * as cxapi from '../../cx-api'; -import { Construct } from 'constructs'; -import { toSymlinkFollow } from './compat'; export interface AssetOptions extends CopyOptions, cdk.FileCopyOptions, cdk.AssetOptions { /** diff --git a/packages/aws-cdk-lib/aws-s3-assets/test/integ.assets.bundling.lit.ts b/packages/aws-cdk-lib/aws-s3-assets/test/integ.assets.bundling.lit.ts index 7d4c74c65a449..4c4a1d748bfaa 100644 --- a/packages/aws-cdk-lib/aws-s3-assets/test/integ.assets.bundling.lit.ts +++ b/packages/aws-cdk-lib/aws-s3-assets/test/integ.assets.bundling.lit.ts @@ -1,7 +1,7 @@ import * as path from 'path'; +import { Construct } from 'constructs'; import * as iam from '../../aws-iam'; import { App, DockerImage, Stack, StackProps } from '../../core'; -import { Construct } from 'constructs'; import * as assets from '../lib'; class TestStack extends Stack { diff --git a/packages/aws-cdk-lib/aws-s3-deployment/lib/bucket-deployment.ts b/packages/aws-cdk-lib/aws-s3-deployment/lib/bucket-deployment.ts index 2c675085703a6..eb79ba01b458e 100644 --- a/packages/aws-cdk-lib/aws-s3-deployment/lib/bucket-deployment.ts +++ b/packages/aws-cdk-lib/aws-s3-deployment/lib/bucket-deployment.ts @@ -1,4 +1,7 @@ import * as path from 'path'; +import { kebab as toKebabCase } from 'case'; +import { Construct } from 'constructs'; +import { ISource, SourceConfig } from './source'; import * as cloudfront from '../../aws-cloudfront'; import * as ec2 from '../../aws-ec2'; import * as efs from '../../aws-efs'; @@ -8,9 +11,6 @@ import * as logs from '../../aws-logs'; import * as s3 from '../../aws-s3'; import * as cdk from '../../core'; import { AwsCliLayer } from '../../lambda-layer-awscli'; -import { kebab as toKebabCase } from 'case'; -import { Construct } from 'constructs'; -import { ISource, SourceConfig } from './source'; // tag key has a limit of 128 characters const CUSTOM_RESOURCE_OWNER_TAG = 'aws-cdk:cr-owned'; diff --git a/packages/aws-cdk-lib/aws-s3-deployment/lib/render-data.ts b/packages/aws-cdk-lib/aws-s3-deployment/lib/render-data.ts index 61ba5aebd4fe8..0ea0b47cc1c38 100644 --- a/packages/aws-cdk-lib/aws-s3-deployment/lib/render-data.ts +++ b/packages/aws-cdk-lib/aws-s3-deployment/lib/render-data.ts @@ -1,5 +1,5 @@ -import { Stack } from '../../core'; import { Construct } from 'constructs'; +import { Stack } from '../../core'; export interface Content { readonly text: string; diff --git a/packages/aws-cdk-lib/aws-s3-deployment/lib/source.ts b/packages/aws-cdk-lib/aws-s3-deployment/lib/source.ts index 2de9e02f88cb0..e47a3af8df892 100644 --- a/packages/aws-cdk-lib/aws-s3-deployment/lib/source.ts +++ b/packages/aws-cdk-lib/aws-s3-deployment/lib/source.ts @@ -1,11 +1,11 @@ import * as fs from 'fs'; import { join, dirname } from 'path'; +import { Construct } from 'constructs'; +import { renderData } from './render-data'; import * as iam from '../../aws-iam'; import * as s3 from '../../aws-s3'; import * as s3_assets from '../../aws-s3-assets'; import { FileSystem, Stack } from '../../core'; -import { Construct } from 'constructs'; -import { renderData } from './render-data'; /** * Source information. diff --git a/packages/aws-cdk-lib/aws-s3-deployment/test/bucket-deployment.test.ts b/packages/aws-cdk-lib/aws-s3-deployment/test/bucket-deployment.test.ts index 530ba4be7973f..71a2df5a90b26 100644 --- a/packages/aws-cdk-lib/aws-s3-deployment/test/bucket-deployment.test.ts +++ b/packages/aws-cdk-lib/aws-s3-deployment/test/bucket-deployment.test.ts @@ -1,5 +1,6 @@ import { readdirSync, readFileSync, existsSync } from 'fs'; import * as path from 'path'; +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Match, Template } from '../../assertions'; import * as cloudfront from '../../aws-cloudfront'; import * as ec2 from '../../aws-ec2'; @@ -7,7 +8,6 @@ import * as iam from '../../aws-iam'; import * as logs from '../../aws-logs'; import * as s3 from '../../aws-s3'; import * as sns from '../../aws-sns'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../core'; import * as cxapi from '../../cx-api'; import * as s3deploy from '../lib'; diff --git a/packages/aws-cdk-lib/aws-s3-notifications/lib/lambda.ts b/packages/aws-cdk-lib/aws-s3-notifications/lib/lambda.ts index fb74dcc9dcee4..e6159ff8c22aa 100644 --- a/packages/aws-cdk-lib/aws-s3-notifications/lib/lambda.ts +++ b/packages/aws-cdk-lib/aws-s3-notifications/lib/lambda.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import * as iam from '../../aws-iam'; import * as lambda from '../../aws-lambda'; import * as s3 from '../../aws-s3'; import { CfnResource, Names, Stack } from '../../core'; -import { Construct } from 'constructs'; /** * Use a Lambda function as a bucket notification destination diff --git a/packages/aws-cdk-lib/aws-s3-notifications/lib/sns.ts b/packages/aws-cdk-lib/aws-s3-notifications/lib/sns.ts index ca23855fd5e6a..02e4e563c0c51 100644 --- a/packages/aws-cdk-lib/aws-s3-notifications/lib/sns.ts +++ b/packages/aws-cdk-lib/aws-s3-notifications/lib/sns.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as iam from '../../aws-iam'; import * as s3 from '../../aws-s3'; import * as sns from '../../aws-sns'; -import { Construct } from 'constructs'; /** * Use an SNS topic as a bucket notification destination diff --git a/packages/aws-cdk-lib/aws-s3-notifications/lib/sqs.ts b/packages/aws-cdk-lib/aws-s3-notifications/lib/sqs.ts index 8ca96566537ce..4206d067e6ecc 100644 --- a/packages/aws-cdk-lib/aws-s3-notifications/lib/sqs.ts +++ b/packages/aws-cdk-lib/aws-s3-notifications/lib/sqs.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import * as iam from '../../aws-iam'; import * as s3 from '../../aws-s3'; import * as sqs from '../../aws-sqs'; import { Annotations } from '../../core'; -import { Construct } from 'constructs'; /** * Use an SQS queue as a bucket notification destination diff --git a/packages/aws-cdk-lib/aws-s3/lib/bucket-policy.ts b/packages/aws-cdk-lib/aws-s3/lib/bucket-policy.ts index f4053c8c30a1c..f9875c7a48ae9 100644 --- a/packages/aws-cdk-lib/aws-s3/lib/bucket-policy.ts +++ b/packages/aws-cdk-lib/aws-s3/lib/bucket-policy.ts @@ -1,9 +1,9 @@ -import { PolicyDocument } from '../../aws-iam'; -import { RemovalPolicy, Resource, Token, Tokenization } from '../../core'; -import { CfnReference } from '../../core/lib/private/cfn-reference'; import { Construct } from 'constructs'; import { Bucket, IBucket } from './bucket'; import { CfnBucket, CfnBucketPolicy } from './s3.generated'; +import { PolicyDocument } from '../../aws-iam'; +import { RemovalPolicy, Resource, Token, Tokenization } from '../../core'; +import { CfnReference } from '../../core/lib/private/cfn-reference'; export interface BucketPolicyProps { /** diff --git a/packages/aws-cdk-lib/aws-s3/lib/notifications-resource/notifications-resource-handler.ts b/packages/aws-cdk-lib/aws-s3/lib/notifications-resource/notifications-resource-handler.ts index 200a13f482512..c97d155a0c068 100644 --- a/packages/aws-cdk-lib/aws-s3/lib/notifications-resource/notifications-resource-handler.ts +++ b/packages/aws-cdk-lib/aws-s3/lib/notifications-resource/notifications-resource-handler.ts @@ -1,8 +1,8 @@ import * as fs from 'fs'; import * as path from 'path'; +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; export class NotificationsResourceHandlerProps { role?: iam.IRole; diff --git a/packages/aws-cdk-lib/aws-s3/lib/notifications-resource/notifications-resource.ts b/packages/aws-cdk-lib/aws-s3/lib/notifications-resource/notifications-resource.ts index b93bde18e4cd7..0d5c741c17438 100644 --- a/packages/aws-cdk-lib/aws-s3/lib/notifications-resource/notifications-resource.ts +++ b/packages/aws-cdk-lib/aws-s3/lib/notifications-resource/notifications-resource.ts @@ -1,7 +1,7 @@ -import * as iam from '../../../aws-iam'; -import * as cdk from '../../../core'; import { Construct } from 'constructs'; import { NotificationsResourceHandler } from './notifications-resource-handler'; +import * as iam from '../../../aws-iam'; +import * as cdk from '../../../core'; import { Bucket, IBucket, EventType, NotificationKeyFilter } from '../bucket'; import { BucketNotificationDestinationType, IBucketNotificationDestination } from '../destination'; diff --git a/packages/aws-cdk-lib/aws-s3/lib/util.ts b/packages/aws-cdk-lib/aws-s3/lib/util.ts index a4f676e5159ae..5110df2f76fa1 100644 --- a/packages/aws-cdk-lib/aws-s3/lib/util.ts +++ b/packages/aws-cdk-lib/aws-s3/lib/util.ts @@ -1,6 +1,6 @@ -import * as cdk from '../../core'; import { IConstruct } from 'constructs'; import { BucketAttributes } from './bucket'; +import * as cdk from '../../core'; export function parseBucketArn(construct: IConstruct, props: BucketAttributes): string { diff --git a/packages/aws-cdk-lib/aws-s3/test/aspect.test.ts b/packages/aws-cdk-lib/aws-s3/test/aspect.test.ts index aa136a9ee1bca..bd70052987497 100644 --- a/packages/aws-cdk-lib/aws-s3/test/aspect.test.ts +++ b/packages/aws-cdk-lib/aws-s3/test/aspect.test.ts @@ -1,6 +1,6 @@ +import { IConstruct } from 'constructs'; import { Annotations } from '../../assertions'; import * as cdk from '../../core'; -import { IConstruct } from 'constructs'; import * as s3 from '../lib'; describe('aspect', () => { diff --git a/packages/aws-cdk-lib/aws-secretsmanager/lib/policy.ts b/packages/aws-cdk-lib/aws-secretsmanager/lib/policy.ts index 168ddd0096d57..3c372466f9ad6 100644 --- a/packages/aws-cdk-lib/aws-secretsmanager/lib/policy.ts +++ b/packages/aws-cdk-lib/aws-secretsmanager/lib/policy.ts @@ -1,8 +1,8 @@ -import * as iam from '../../aws-iam'; -import { Resource } from '../../core'; import { Construct } from 'constructs'; import { ISecret } from './secret'; import { CfnResourcePolicy } from './secretsmanager.generated'; +import * as iam from '../../aws-iam'; +import { Resource } from '../../core'; /** * Construction properties for a ResourcePolicy diff --git a/packages/aws-cdk-lib/aws-secretsmanager/lib/rotation-schedule.ts b/packages/aws-cdk-lib/aws-secretsmanager/lib/rotation-schedule.ts index ec12478e55093..11a0e17ab3d0d 100644 --- a/packages/aws-cdk-lib/aws-secretsmanager/lib/rotation-schedule.ts +++ b/packages/aws-cdk-lib/aws-secretsmanager/lib/rotation-schedule.ts @@ -1,11 +1,11 @@ +import { Construct } from 'constructs'; +import { ISecret, Secret } from './secret'; +import { CfnRotationSchedule } from './secretsmanager.generated'; import * as ec2 from '../../aws-ec2'; import * as iam from '../../aws-iam'; import * as kms from '../../aws-kms'; import * as lambda from '../../aws-lambda'; import { Duration, Resource, Stack } from '../../core'; -import { Construct } from 'constructs'; -import { ISecret, Secret } from './secret'; -import { CfnRotationSchedule } from './secretsmanager.generated'; /** * The default set of characters we exclude from generated passwords for database users. diff --git a/packages/aws-cdk-lib/aws-secretsmanager/lib/secret-rotation.ts b/packages/aws-cdk-lib/aws-secretsmanager/lib/secret-rotation.ts index a7cc04093608a..a84dcdcfe13b2 100644 --- a/packages/aws-cdk-lib/aws-secretsmanager/lib/secret-rotation.ts +++ b/packages/aws-cdk-lib/aws-secretsmanager/lib/secret-rotation.ts @@ -1,9 +1,9 @@ +import { Construct } from 'constructs'; +import { ISecret } from './secret'; import * as ec2 from '../../aws-ec2'; import * as lambda from '../../aws-lambda'; import * as serverless from '../../aws-sam'; import { Duration, Names, Stack, Token, CfnMapping, Aws, RemovalPolicy } from '../../core'; -import { Construct } from 'constructs'; -import { ISecret } from './secret'; /** * Options for a SecretRotationApplication @@ -130,6 +130,8 @@ export class SecretRotationApplication { private readonly applicationName: string; constructor(applicationId: string, semanticVersion: string, options?: SecretRotationApplicationOptions) { + // partitions are handled explicitly via applicationArnForPartition() + // eslint-disable-next-line @aws-cdk/no-literal-partition this.applicationId = `arn:aws:serverlessrepo:us-east-1:297356227824:applications/${applicationId}`; this.semanticVersion = semanticVersion; this.applicationName = applicationId; diff --git a/packages/aws-cdk-lib/aws-secretsmanager/lib/secret.ts b/packages/aws-cdk-lib/aws-secretsmanager/lib/secret.ts index fba056ed26b82..9a5ab700556ec 100644 --- a/packages/aws-cdk-lib/aws-secretsmanager/lib/secret.ts +++ b/packages/aws-cdk-lib/aws-secretsmanager/lib/secret.ts @@ -1,11 +1,11 @@ -import * as iam from '../../aws-iam'; -import * as kms from '../../aws-kms'; -import { ArnFormat, FeatureFlags, Fn, IResource, Lazy, RemovalPolicy, Resource, ResourceProps, SecretValue, Stack, Token, TokenComparison } from '../../core'; -import * as cxapi from '../../cx-api'; import { IConstruct, Construct } from 'constructs'; import { ResourcePolicy } from './policy'; import { RotationSchedule, RotationScheduleOptions } from './rotation-schedule'; import * as secretsmanager from './secretsmanager.generated'; +import * as iam from '../../aws-iam'; +import * as kms from '../../aws-kms'; +import { ArnFormat, FeatureFlags, Fn, IResource, Lazy, RemovalPolicy, Resource, ResourceProps, SecretValue, Stack, Token, TokenComparison } from '../../core'; +import * as cxapi from '../../cx-api'; const SECRET_SYMBOL = Symbol.for('@aws-cdk/secretsmanager.Secret'); diff --git a/packages/aws-cdk-lib/aws-secretsmanager/test/secret.test.ts b/packages/aws-cdk-lib/aws-secretsmanager/test/secret.test.ts index 823be63ae9ad9..18849d76aff72 100644 --- a/packages/aws-cdk-lib/aws-secretsmanager/test/secret.test.ts +++ b/packages/aws-cdk-lib/aws-secretsmanager/test/secret.test.ts @@ -1,8 +1,8 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Match, Template } from '../../assertions'; import * as iam from '../../aws-iam'; import * as kms from '../../aws-kms'; import * as lambda from '../../aws-lambda'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../core'; import * as secretsmanager from '../lib'; diff --git a/packages/aws-cdk-lib/aws-servicecatalog/lib/cloudformation-template.ts b/packages/aws-cdk-lib/aws-servicecatalog/lib/cloudformation-template.ts index 5ad6fe28cdb02..2eb3de45da9a3 100644 --- a/packages/aws-cdk-lib/aws-servicecatalog/lib/cloudformation-template.ts +++ b/packages/aws-cdk-lib/aws-servicecatalog/lib/cloudformation-template.ts @@ -1,8 +1,8 @@ -import { IBucket } from '../../aws-s3'; -import * as s3_assets from '../../aws-s3-assets'; import { Construct } from 'constructs'; import { hashValues } from './private/util'; import { ProductStack } from './product-stack'; +import { IBucket } from '../../aws-s3'; +import * as s3_assets from '../../aws-s3-assets'; /** * Represents the Product Provisioning Artifact Template. diff --git a/packages/aws-cdk-lib/aws-servicecatalog/lib/constraints.ts b/packages/aws-cdk-lib/aws-servicecatalog/lib/constraints.ts index e22a835e95154..774cec4285b20 100644 --- a/packages/aws-cdk-lib/aws-servicecatalog/lib/constraints.ts +++ b/packages/aws-cdk-lib/aws-servicecatalog/lib/constraints.ts @@ -1,6 +1,6 @@ +import { MessageLanguage } from './common'; import * as iam from '../../aws-iam'; import * as cdk from '../../core'; -import { MessageLanguage } from './common'; /** * Properties for governance mechanisms and constraints. diff --git a/packages/aws-cdk-lib/aws-servicecatalog/lib/portfolio.ts b/packages/aws-cdk-lib/aws-servicecatalog/lib/portfolio.ts index 06730303e4e18..b662039cc2199 100644 --- a/packages/aws-cdk-lib/aws-servicecatalog/lib/portfolio.ts +++ b/packages/aws-cdk-lib/aws-servicecatalog/lib/portfolio.ts @@ -1,7 +1,3 @@ -import * as iam from '../../aws-iam'; -import { IBucket } from '../../aws-s3'; -import * as sns from '../../aws-sns'; -import * as cdk from '../../core'; import { Construct, IConstruct } from 'constructs'; import { MessageLanguage } from './common'; import { @@ -14,6 +10,10 @@ import { InputValidator } from './private/validation'; import { IProduct } from './product'; import { CfnPortfolio, CfnPortfolioPrincipalAssociation, CfnPortfolioShare } from './servicecatalog.generated'; import { TagOptions } from './tag-options'; +import * as iam from '../../aws-iam'; +import { IBucket } from '../../aws-s3'; +import * as sns from '../../aws-sns'; +import * as cdk from '../../core'; /** * Options for portfolio share. diff --git a/packages/aws-cdk-lib/aws-servicecatalog/lib/private/association-manager.ts b/packages/aws-cdk-lib/aws-servicecatalog/lib/private/association-manager.ts index 8719c3d52226c..19318af0062db 100644 --- a/packages/aws-cdk-lib/aws-servicecatalog/lib/private/association-manager.ts +++ b/packages/aws-cdk-lib/aws-servicecatalog/lib/private/association-manager.ts @@ -1,8 +1,8 @@ +import { hashValues } from './util'; +import { InputValidator } from './validation'; import * as iam from '../../../aws-iam'; import * as sns from '../../../aws-sns'; import * as cdk from '../../../core'; -import { hashValues } from './util'; -import { InputValidator } from './validation'; import { CloudFormationRuleConstraintOptions, CommonConstraintOptions, StackSetsConstraintOptions, TagUpdateConstraintOptions, TemplateRule, TemplateRuleAssertion, diff --git a/packages/aws-cdk-lib/aws-servicecatalog/lib/product-stack-history.ts b/packages/aws-cdk-lib/aws-servicecatalog/lib/product-stack-history.ts index 0ec589e8bf8c7..327d6a8d189ea 100644 --- a/packages/aws-cdk-lib/aws-servicecatalog/lib/product-stack-history.ts +++ b/packages/aws-cdk-lib/aws-servicecatalog/lib/product-stack-history.ts @@ -1,11 +1,11 @@ import * as fs from 'fs'; import * as path from 'path'; -import { Names } from '../../core'; import { Construct } from 'constructs'; import { CloudFormationTemplate } from './cloudformation-template'; import { DEFAULT_PRODUCT_STACK_SNAPSHOT_DIRECTORY } from './common'; import { CloudFormationProductVersion } from './product'; import { ProductStack } from './product-stack'; +import { Names } from '../../core'; /** * Properties for a ProductStackHistory. diff --git a/packages/aws-cdk-lib/aws-servicecatalog/lib/product-stack.ts b/packages/aws-cdk-lib/aws-servicecatalog/lib/product-stack.ts index 6ec299427d5be..2f44246f7fcd1 100644 --- a/packages/aws-cdk-lib/aws-servicecatalog/lib/product-stack.ts +++ b/packages/aws-cdk-lib/aws-servicecatalog/lib/product-stack.ts @@ -1,11 +1,11 @@ import * as crypto from 'crypto'; import * as fs from 'fs'; import * as path from 'path'; -import { IBucket } from '../../aws-s3'; -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { ProductStackSynthesizer } from './private/product-stack-synthesizer'; import { ProductStackHistory } from './product-stack-history'; +import { IBucket } from '../../aws-s3'; +import * as cdk from '../../core'; /** * Product stack props. diff --git a/packages/aws-cdk-lib/aws-servicecatalog/lib/product.ts b/packages/aws-cdk-lib/aws-servicecatalog/lib/product.ts index f48becbc2294b..4ceaab07975fc 100644 --- a/packages/aws-cdk-lib/aws-servicecatalog/lib/product.ts +++ b/packages/aws-cdk-lib/aws-servicecatalog/lib/product.ts @@ -1,5 +1,3 @@ -import { IBucket } from '../../aws-s3'; -import { ArnFormat, IResource, Resource, Stack } from '../../core'; import { Construct } from 'constructs'; import { CloudFormationTemplate } from './cloudformation-template'; import { MessageLanguage } from './common'; @@ -7,6 +5,8 @@ import { AssociationManager } from './private/association-manager'; import { InputValidator } from './private/validation'; import { CfnCloudFormationProduct } from './servicecatalog.generated'; import { TagOptions } from './tag-options'; +import { IBucket } from '../../aws-s3'; +import { ArnFormat, IResource, Resource, Stack } from '../../core'; /** * A Service Catalog product, currently only supports type CloudFormationProduct diff --git a/packages/aws-cdk-lib/aws-servicecatalog/lib/tag-options.ts b/packages/aws-cdk-lib/aws-servicecatalog/lib/tag-options.ts index 5ef0a5d619707..456dbc3a42a8e 100644 --- a/packages/aws-cdk-lib/aws-servicecatalog/lib/tag-options.ts +++ b/packages/aws-cdk-lib/aws-servicecatalog/lib/tag-options.ts @@ -1,8 +1,8 @@ -import * as cdk from '../../core'; import { Construct } from 'constructs'; import { hashValues } from './private/util'; import { InputValidator } from './private/validation'; import { CfnTagOption } from './servicecatalog.generated'; +import * as cdk from '../../core'; /** * Properties for TagOptions. diff --git a/packages/aws-cdk-lib/aws-servicecatalog/test/product-stack.test.ts b/packages/aws-cdk-lib/aws-servicecatalog/test/product-stack.test.ts index be0ed52d5b470..60d24e527c629 100644 --- a/packages/aws-cdk-lib/aws-servicecatalog/test/product-stack.test.ts +++ b/packages/aws-cdk-lib/aws-servicecatalog/test/product-stack.test.ts @@ -1,12 +1,12 @@ import * as fs from 'fs'; import * as path from 'path'; +import { Construct } from 'constructs'; import { Template } from '../../assertions'; import * as lambda from '../../aws-lambda'; import * as s3 from '../../aws-s3'; import * as s3_assets from '../../aws-s3-assets'; import * as sns from '../../aws-sns'; import * as cdk from '../../core'; -import { Construct } from 'constructs'; import * as servicecatalog from '../lib'; /* eslint-disable quote-props */ diff --git a/packages/aws-cdk-lib/aws-servicediscovery/lib/alias-target-instance.ts b/packages/aws-cdk-lib/aws-servicediscovery/lib/alias-target-instance.ts index defd9c6e324cf..018d6740db923 100644 --- a/packages/aws-cdk-lib/aws-servicediscovery/lib/alias-target-instance.ts +++ b/packages/aws-cdk-lib/aws-servicediscovery/lib/alias-target-instance.ts @@ -1,9 +1,9 @@ -import { Names } from '../../core'; import { Construct } from 'constructs'; import { BaseInstanceProps, InstanceBase } from './instance'; import { NamespaceType } from './namespace'; import { DnsRecordType, IService, RoutingPolicy } from './service'; import { CfnInstance } from './servicediscovery.generated'; +import { Names } from '../../core'; /* * Properties for an AliasTargetInstance diff --git a/packages/aws-cdk-lib/aws-servicediscovery/lib/http-namespace.ts b/packages/aws-cdk-lib/aws-servicediscovery/lib/http-namespace.ts index 845ada96911b8..bbda008139095 100644 --- a/packages/aws-cdk-lib/aws-servicediscovery/lib/http-namespace.ts +++ b/packages/aws-cdk-lib/aws-servicediscovery/lib/http-namespace.ts @@ -1,8 +1,8 @@ -import { Resource } from '../../core'; import { Construct } from 'constructs'; import { BaseNamespaceProps, INamespace, NamespaceType } from './namespace'; import { BaseServiceProps, Service } from './service'; import { CfnHttpNamespace } from './servicediscovery.generated'; +import { Resource } from '../../core'; export interface HttpNamespaceProps extends BaseNamespaceProps {} export interface IHttpNamespace extends INamespace { } diff --git a/packages/aws-cdk-lib/aws-servicediscovery/lib/instance.ts b/packages/aws-cdk-lib/aws-servicediscovery/lib/instance.ts index f5e933fa5b0c8..4edc619be2c5d 100644 --- a/packages/aws-cdk-lib/aws-servicediscovery/lib/instance.ts +++ b/packages/aws-cdk-lib/aws-servicediscovery/lib/instance.ts @@ -1,5 +1,5 @@ -import { IResource, Names, Resource } from '../../core'; import { IService } from './service'; +import { IResource, Names, Resource } from '../../core'; export interface IInstance extends IResource { /** diff --git a/packages/aws-cdk-lib/aws-servicediscovery/lib/private-dns-namespace.ts b/packages/aws-cdk-lib/aws-servicediscovery/lib/private-dns-namespace.ts index 75994718985e9..72c3ac2e75c97 100644 --- a/packages/aws-cdk-lib/aws-servicediscovery/lib/private-dns-namespace.ts +++ b/packages/aws-cdk-lib/aws-servicediscovery/lib/private-dns-namespace.ts @@ -1,9 +1,9 @@ -import * as ec2 from '../../aws-ec2'; -import { Resource } from '../../core'; import { Construct } from 'constructs'; import { BaseNamespaceProps, INamespace, NamespaceType } from './namespace'; import { DnsServiceProps, Service } from './service'; import { CfnPrivateDnsNamespace } from './servicediscovery.generated'; +import * as ec2 from '../../aws-ec2'; +import { Resource } from '../../core'; export interface PrivateDnsNamespaceProps extends BaseNamespaceProps { /** diff --git a/packages/aws-cdk-lib/aws-servicediscovery/lib/public-dns-namespace.ts b/packages/aws-cdk-lib/aws-servicediscovery/lib/public-dns-namespace.ts index fb9dcfa42ad75..d58848fc4320d 100644 --- a/packages/aws-cdk-lib/aws-servicediscovery/lib/public-dns-namespace.ts +++ b/packages/aws-cdk-lib/aws-servicediscovery/lib/public-dns-namespace.ts @@ -1,8 +1,8 @@ -import { Resource } from '../../core'; import { Construct } from 'constructs'; import { BaseNamespaceProps, INamespace, NamespaceType } from './namespace'; import { DnsServiceProps, Service } from './service'; import { CfnPublicDnsNamespace } from './servicediscovery.generated'; +import { Resource } from '../../core'; export interface PublicDnsNamespaceProps extends BaseNamespaceProps {} export interface IPublicDnsNamespace extends INamespace { } diff --git a/packages/aws-cdk-lib/aws-servicediscovery/lib/service.ts b/packages/aws-cdk-lib/aws-servicediscovery/lib/service.ts index 22cfd0b814343..08314a52ebafc 100644 --- a/packages/aws-cdk-lib/aws-servicediscovery/lib/service.ts +++ b/packages/aws-cdk-lib/aws-servicediscovery/lib/service.ts @@ -1,5 +1,3 @@ -import * as elbv2 from '../../aws-elasticloadbalancingv2'; -import { Duration, IResource, Resource } from '../../core'; import { Construct } from 'constructs'; import { AliasTargetInstance } from './alias-target-instance'; import { CnameInstance, CnameInstanceBaseProps } from './cname-instance'; @@ -9,6 +7,8 @@ import { INamespace, NamespaceType } from './namespace'; import { NonIpInstance, NonIpInstanceBaseProps } from './non-ip-instance'; import { defaultDiscoveryType } from './private/utils'; import { CfnService } from './servicediscovery.generated'; +import * as elbv2 from '../../aws-elasticloadbalancingv2'; +import { Duration, IResource, Resource } from '../../core'; export interface IService extends IResource { /** diff --git a/packages/aws-cdk-lib/aws-ses/lib/configuration-set-event-destination.ts b/packages/aws-cdk-lib/aws-ses/lib/configuration-set-event-destination.ts index abd14481f65cc..ab70df37f66cb 100644 --- a/packages/aws-cdk-lib/aws-ses/lib/configuration-set-event-destination.ts +++ b/packages/aws-cdk-lib/aws-ses/lib/configuration-set-event-destination.ts @@ -1,9 +1,9 @@ -import * as iam from '../../aws-iam'; -import * as sns from '../../aws-sns'; -import { IResource, Resource } from '../../core'; import { Construct } from 'constructs'; import { IConfigurationSet } from './configuration-set'; import { CfnConfigurationSetEventDestination } from './ses.generated'; +import * as iam from '../../aws-iam'; +import * as sns from '../../aws-sns'; +import { Aws, IResource, Resource } from '../../core'; /** * A configuration set event destination @@ -267,7 +267,7 @@ export class ConfigurationSetEventDestination extends Resource implements IConfi conditions: { StringEquals: { 'AWS:SourceAccount': this.env.account, - 'AWS:SourceArn': `arn:aws:ses:${this.env.region}:${this.env.account}:configuration-set/${props.configurationSet.configurationSetName}`, + 'AWS:SourceArn': `arn:${Aws.PARTITION}:ses:${this.env.region}:${this.env.account}:configuration-set/${props.configurationSet.configurationSetName}`, }, }, })); diff --git a/packages/aws-cdk-lib/aws-ses/lib/configuration-set.ts b/packages/aws-cdk-lib/aws-ses/lib/configuration-set.ts index c7d533c0fd76c..cccc1aab27c8b 100644 --- a/packages/aws-cdk-lib/aws-ses/lib/configuration-set.ts +++ b/packages/aws-cdk-lib/aws-ses/lib/configuration-set.ts @@ -1,9 +1,9 @@ -import { IResource, Resource } from '../../core'; import { Construct } from 'constructs'; import { ConfigurationSetEventDestination, ConfigurationSetEventDestinationOptions } from './configuration-set-event-destination'; import { IDedicatedIpPool } from './dedicated-ip-pool'; import { undefinedIfNoKeys } from './private/utils'; import { CfnConfigurationSet } from './ses.generated'; +import { IResource, Resource } from '../../core'; /** * A configuration set diff --git a/packages/aws-cdk-lib/aws-ses/lib/dedicated-ip-pool.ts b/packages/aws-cdk-lib/aws-ses/lib/dedicated-ip-pool.ts index 4a7feae90fab3..67f83475f08e1 100644 --- a/packages/aws-cdk-lib/aws-ses/lib/dedicated-ip-pool.ts +++ b/packages/aws-cdk-lib/aws-ses/lib/dedicated-ip-pool.ts @@ -1,6 +1,6 @@ -import { IResource, Resource } from '../../core'; import { Construct } from 'constructs'; import { CfnDedicatedIpPool } from './ses.generated'; +import { IResource, Resource } from '../../core'; /** * A dedicated IP pool diff --git a/packages/aws-cdk-lib/aws-ses/lib/email-identity.ts b/packages/aws-cdk-lib/aws-ses/lib/email-identity.ts index 1a8e0ae582fed..f8907dc4d8e01 100644 --- a/packages/aws-cdk-lib/aws-ses/lib/email-identity.ts +++ b/packages/aws-cdk-lib/aws-ses/lib/email-identity.ts @@ -1,10 +1,10 @@ -import * as route53 from '../../aws-route53'; -import { IPublicHostedZone } from '../../aws-route53'; -import { IResource, Lazy, Resource, SecretValue, Stack } from '../../core'; import { Construct } from 'constructs'; import { IConfigurationSet } from './configuration-set'; import { undefinedIfNoKeys } from './private/utils'; import { CfnEmailIdentity } from './ses.generated'; +import { IPublicHostedZone } from '../../aws-route53'; +import * as route53 from '../../aws-route53'; +import { IResource, Lazy, Resource, SecretValue, Stack } from '../../core'; /** * An email identity diff --git a/packages/aws-cdk-lib/aws-ses/lib/receipt-filter.ts b/packages/aws-cdk-lib/aws-ses/lib/receipt-filter.ts index b369998febda7..90696c1c85bc2 100644 --- a/packages/aws-cdk-lib/aws-ses/lib/receipt-filter.ts +++ b/packages/aws-cdk-lib/aws-ses/lib/receipt-filter.ts @@ -1,6 +1,6 @@ -import { Resource } from '../../core'; import { Construct } from 'constructs'; import { CfnReceiptFilter } from './ses.generated'; +import { Resource } from '../../core'; /** * The policy for the receipt filter. diff --git a/packages/aws-cdk-lib/aws-ses/lib/receipt-rule-set.ts b/packages/aws-cdk-lib/aws-ses/lib/receipt-rule-set.ts index a100f6278dd17..17448dffcb753 100644 --- a/packages/aws-cdk-lib/aws-ses/lib/receipt-rule-set.ts +++ b/packages/aws-cdk-lib/aws-ses/lib/receipt-rule-set.ts @@ -1,7 +1,7 @@ -import { IResource, Resource } from '../../core'; import { Construct } from 'constructs'; import { DropSpamReceiptRule, ReceiptRule, ReceiptRuleOptions } from './receipt-rule'; import { CfnReceiptRuleSet } from './ses.generated'; +import { IResource, Resource } from '../../core'; /** * A receipt rule set. diff --git a/packages/aws-cdk-lib/aws-ses/lib/receipt-rule.ts b/packages/aws-cdk-lib/aws-ses/lib/receipt-rule.ts index aefcf7ed159dc..b8e973e5d21d3 100644 --- a/packages/aws-cdk-lib/aws-ses/lib/receipt-rule.ts +++ b/packages/aws-cdk-lib/aws-ses/lib/receipt-rule.ts @@ -1,11 +1,11 @@ import * as path from 'path'; -import * as iam from '../../aws-iam'; -import * as lambda from '../../aws-lambda'; -import { Aws, IResource, Lazy, Resource } from '../../core'; import { Construct } from 'constructs'; import { IReceiptRuleAction } from './receipt-rule-action'; import { IReceiptRuleSet } from './receipt-rule-set'; import { CfnReceiptRule } from './ses.generated'; +import * as iam from '../../aws-iam'; +import * as lambda from '../../aws-lambda'; +import { Aws, IResource, Lazy, Resource } from '../../core'; /** * A receipt rule. diff --git a/packages/aws-cdk-lib/aws-ses/lib/vdm-attributes.ts b/packages/aws-cdk-lib/aws-ses/lib/vdm-attributes.ts index 7da38136f2d27..0b75b15f3a062 100644 --- a/packages/aws-cdk-lib/aws-ses/lib/vdm-attributes.ts +++ b/packages/aws-cdk-lib/aws-ses/lib/vdm-attributes.ts @@ -1,6 +1,6 @@ -import { IResource, Resource } from '../../core'; import { Construct } from 'constructs'; import { CfnVdmAttributes } from './ses.generated'; +import { IResource, Resource } from '../../core'; /** * Virtual Deliverablity Manager (VDM) attributes diff --git a/packages/aws-cdk-lib/aws-ses/test/configuration-set-event-destination.test.ts b/packages/aws-cdk-lib/aws-ses/test/configuration-set-event-destination.test.ts index 461ac9322e1d1..48e78355c159d 100644 --- a/packages/aws-cdk-lib/aws-ses/test/configuration-set-event-destination.test.ts +++ b/packages/aws-cdk-lib/aws-ses/test/configuration-set-event-destination.test.ts @@ -47,7 +47,9 @@ test('sns destination', () => { 'AWS:SourceAccount': { Ref: 'AWS::AccountId' }, 'AWS:SourceArn': { 'Fn::Join': ['', [ - 'arn:aws:ses:', + 'arn:', + { Ref: 'AWS::Partition' }, + ':ses:', { Ref: 'AWS::Region' }, ':', { Ref: 'AWS::AccountId' }, diff --git a/packages/aws-cdk-lib/aws-signer/lib/signing-profile.ts b/packages/aws-cdk-lib/aws-signer/lib/signing-profile.ts index d1ae339b3fd1d..8637f242f5a36 100644 --- a/packages/aws-cdk-lib/aws-signer/lib/signing-profile.ts +++ b/packages/aws-cdk-lib/aws-signer/lib/signing-profile.ts @@ -1,6 +1,6 @@ -import { Duration, IResource, Resource, Stack } from '../../core'; import { Construct } from 'constructs'; import { CfnSigningProfile } from './signer.generated'; +import { Duration, IResource, Resource, Stack } from '../../core'; /** * Platforms that are allowed with signing config. diff --git a/packages/aws-cdk-lib/aws-sns-subscriptions/lib/email.ts b/packages/aws-cdk-lib/aws-sns-subscriptions/lib/email.ts index fc6ce5d5a52e9..27ae72e164614 100644 --- a/packages/aws-cdk-lib/aws-sns-subscriptions/lib/email.ts +++ b/packages/aws-cdk-lib/aws-sns-subscriptions/lib/email.ts @@ -1,5 +1,5 @@ -import * as sns from '../../aws-sns'; import { SubscriptionProps } from './subscription'; +import * as sns from '../../aws-sns'; /** * Options for email subscriptions. diff --git a/packages/aws-cdk-lib/aws-sns-subscriptions/lib/lambda.ts b/packages/aws-cdk-lib/aws-sns-subscriptions/lib/lambda.ts index 36f6f647ac578..58adb3d253a08 100644 --- a/packages/aws-cdk-lib/aws-sns-subscriptions/lib/lambda.ts +++ b/packages/aws-cdk-lib/aws-sns-subscriptions/lib/lambda.ts @@ -1,9 +1,9 @@ +import { Construct } from 'constructs'; +import { SubscriptionProps } from './subscription'; import * as iam from '../../aws-iam'; import * as lambda from '../../aws-lambda'; import * as sns from '../../aws-sns'; import { ArnFormat, Names, Stack, Token } from '../../core'; -import { Construct } from 'constructs'; -import { SubscriptionProps } from './subscription'; /** * Properties for a Lambda subscription diff --git a/packages/aws-cdk-lib/aws-sns-subscriptions/lib/sms.ts b/packages/aws-cdk-lib/aws-sns-subscriptions/lib/sms.ts index 180b26e7246fa..060713a27b0e2 100644 --- a/packages/aws-cdk-lib/aws-sns-subscriptions/lib/sms.ts +++ b/packages/aws-cdk-lib/aws-sns-subscriptions/lib/sms.ts @@ -1,5 +1,5 @@ -import * as sns from '../../aws-sns'; import { SubscriptionProps } from './subscription'; +import * as sns from '../../aws-sns'; /** * Options for SMS subscriptions. diff --git a/packages/aws-cdk-lib/aws-sns-subscriptions/lib/sqs.ts b/packages/aws-cdk-lib/aws-sns-subscriptions/lib/sqs.ts index 0509d3ff425b0..a27bbbb9c810b 100644 --- a/packages/aws-cdk-lib/aws-sns-subscriptions/lib/sqs.ts +++ b/packages/aws-cdk-lib/aws-sns-subscriptions/lib/sqs.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; +import { SubscriptionProps } from './subscription'; import * as iam from '../../aws-iam'; import * as sns from '../../aws-sns'; import * as sqs from '../../aws-sqs'; import { ArnFormat, FeatureFlags, Names, Stack, Token } from '../../core'; import * as cxapi from '../../cx-api'; -import { Construct } from 'constructs'; -import { SubscriptionProps } from './subscription'; /** * Properties for an SQS subscription diff --git a/packages/aws-cdk-lib/aws-sns-subscriptions/lib/url.ts b/packages/aws-cdk-lib/aws-sns-subscriptions/lib/url.ts index edbab8f8495f9..3eb582c1a8b7a 100644 --- a/packages/aws-cdk-lib/aws-sns-subscriptions/lib/url.ts +++ b/packages/aws-cdk-lib/aws-sns-subscriptions/lib/url.ts @@ -1,6 +1,6 @@ +import { SubscriptionProps } from './subscription'; import * as sns from '../../aws-sns'; import { Token } from '../../core'; -import { SubscriptionProps } from './subscription'; /** * Options for URL subscriptions. diff --git a/packages/aws-cdk-lib/aws-sns/lib/policy.ts b/packages/aws-cdk-lib/aws-sns/lib/policy.ts index b921b2ba56a95..56b555397a93b 100644 --- a/packages/aws-cdk-lib/aws-sns/lib/policy.ts +++ b/packages/aws-cdk-lib/aws-sns/lib/policy.ts @@ -1,8 +1,8 @@ -import { PolicyDocument } from '../../aws-iam'; -import { Resource } from '../../core'; import { Construct } from 'constructs'; import { CfnTopicPolicy } from './sns.generated'; import { ITopic } from './topic-base'; +import { PolicyDocument } from '../../aws-iam'; +import { Resource } from '../../core'; /** * Properties to associate SNS topics with a policy diff --git a/packages/aws-cdk-lib/aws-sns/lib/subscription.ts b/packages/aws-cdk-lib/aws-sns/lib/subscription.ts index 7450e87a42550..7701a5dd75def 100644 --- a/packages/aws-cdk-lib/aws-sns/lib/subscription.ts +++ b/packages/aws-cdk-lib/aws-sns/lib/subscription.ts @@ -1,10 +1,10 @@ -import { PolicyStatement, ServicePrincipal } from '../../aws-iam'; -import { IQueue } from '../../aws-sqs'; -import { Resource } from '../../core'; import { Construct } from 'constructs'; import { CfnSubscription } from './sns.generated'; import { SubscriptionFilter } from './subscription-filter'; import { ITopic } from './topic-base'; +import { PolicyStatement, ServicePrincipal } from '../../aws-iam'; +import { IQueue } from '../../aws-sqs'; +import { Resource } from '../../core'; /** * Options for creating a new subscription diff --git a/packages/aws-cdk-lib/aws-sns/lib/topic-base.ts b/packages/aws-cdk-lib/aws-sns/lib/topic-base.ts index 262190441bb9b..d7a4fb808c5c2 100644 --- a/packages/aws-cdk-lib/aws-sns/lib/topic-base.ts +++ b/packages/aws-cdk-lib/aws-sns/lib/topic-base.ts @@ -1,11 +1,11 @@ -import * as notifications from '../../aws-codestarnotifications'; -import * as iam from '../../aws-iam'; -import { IResource, Resource, ResourceProps, Token } from '../../core'; import * as constructs from 'constructs'; import { Construct } from 'constructs'; import { TopicPolicy } from './policy'; import { ITopicSubscription } from './subscriber'; import { Subscription } from './subscription'; +import * as notifications from '../../aws-codestarnotifications'; +import * as iam from '../../aws-iam'; +import { IResource, Resource, ResourceProps, Token } from '../../core'; /** * Represents an SNS topic diff --git a/packages/aws-cdk-lib/aws-sns/lib/topic.ts b/packages/aws-cdk-lib/aws-sns/lib/topic.ts index f76af6269aa3a..d8d585844e986 100644 --- a/packages/aws-cdk-lib/aws-sns/lib/topic.ts +++ b/packages/aws-cdk-lib/aws-sns/lib/topic.ts @@ -1,8 +1,8 @@ -import { IKey } from '../../aws-kms'; -import { ArnFormat, Names, Stack } from '../../core'; import { Construct } from 'constructs'; import { CfnTopic } from './sns.generated'; import { ITopic, TopicBase } from './topic-base'; +import { IKey } from '../../aws-kms'; +import { ArnFormat, Names, Stack } from '../../core'; /** * Properties for a new SNS topic diff --git a/packages/aws-cdk-lib/aws-sqs/lib/policy.ts b/packages/aws-cdk-lib/aws-sqs/lib/policy.ts index 1ceeeaa23a424..2a427c0522c19 100644 --- a/packages/aws-cdk-lib/aws-sqs/lib/policy.ts +++ b/packages/aws-cdk-lib/aws-sqs/lib/policy.ts @@ -1,8 +1,8 @@ -import { PolicyDocument } from '../../aws-iam'; -import { Resource } from '../../core'; import { Construct } from 'constructs'; import { IQueue } from './queue-base'; import { CfnQueuePolicy } from './sqs.generated'; +import { PolicyDocument } from '../../aws-iam'; +import { Resource } from '../../core'; /** * Properties to associate SQS queues with a policy diff --git a/packages/aws-cdk-lib/aws-sqs/lib/queue-base.ts b/packages/aws-cdk-lib/aws-sqs/lib/queue-base.ts index 2a80fcc574262..f7f6466ae6c32 100644 --- a/packages/aws-cdk-lib/aws-sqs/lib/queue-base.ts +++ b/packages/aws-cdk-lib/aws-sqs/lib/queue-base.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; +import { QueuePolicy } from './policy'; import * as iam from '../../aws-iam'; import * as kms from '../../aws-kms'; import { IResource, Resource, ResourceProps } from '../../core'; -import { Construct } from 'constructs'; -import { QueuePolicy } from './policy'; /** * Represents an SQS queue diff --git a/packages/aws-cdk-lib/aws-sqs/lib/queue.ts b/packages/aws-cdk-lib/aws-sqs/lib/queue.ts index 305865a43938e..719b5246b3e89 100644 --- a/packages/aws-cdk-lib/aws-sqs/lib/queue.ts +++ b/packages/aws-cdk-lib/aws-sqs/lib/queue.ts @@ -1,10 +1,10 @@ -import * as iam from '../../aws-iam'; -import * as kms from '../../aws-kms'; -import { Duration, RemovalPolicy, Stack, Token, ArnFormat } from '../../core'; import { Construct } from 'constructs'; import { IQueue, QueueAttributes, QueueBase } from './queue-base'; import { CfnQueue } from './sqs.generated'; import { validateProps } from './validate-props'; +import * as iam from '../../aws-iam'; +import * as kms from '../../aws-kms'; +import { Duration, RemovalPolicy, Stack, Token, ArnFormat } from '../../core'; /** * Properties for creating a new Queue diff --git a/packages/aws-cdk-lib/aws-sqs/lib/validate-props.ts b/packages/aws-cdk-lib/aws-sqs/lib/validate-props.ts index b8f813cabafcb..770955b9d03e4 100644 --- a/packages/aws-cdk-lib/aws-sqs/lib/validate-props.ts +++ b/packages/aws-cdk-lib/aws-sqs/lib/validate-props.ts @@ -1,5 +1,5 @@ -import { Token } from '../../core'; import { QueueProps } from './index'; +import { Token } from '../../core'; export function validateProps(props: QueueProps) { validateRange('delivery delay', props.deliveryDelay && props.deliveryDelay.toSeconds(), 0, 900, 'seconds'); diff --git a/packages/aws-cdk-lib/aws-ssm/lib/parameter.ts b/packages/aws-cdk-lib/aws-ssm/lib/parameter.ts index aa521e2262d76..abbc4dc836d10 100644 --- a/packages/aws-cdk-lib/aws-ssm/lib/parameter.ts +++ b/packages/aws-cdk-lib/aws-ssm/lib/parameter.ts @@ -1,3 +1,6 @@ +import { Construct } from 'constructs'; +import * as ssm from './ssm.generated'; +import { arnForParameterName, AUTOGEN_MARKER } from './util'; import * as iam from '../../aws-iam'; import * as kms from '../../aws-kms'; import * as cxschema from '../../cloud-assembly-schema'; @@ -6,9 +9,6 @@ import { ContextProvider, Fn, IResource, Resource, Stack, Token, Tokenization, } from '../../core'; -import { Construct } from 'constructs'; -import * as ssm from './ssm.generated'; -import { arnForParameterName, AUTOGEN_MARKER } from './util'; /** * An SSM Parameter reference. diff --git a/packages/aws-cdk-lib/aws-ssm/lib/util.ts b/packages/aws-cdk-lib/aws-ssm/lib/util.ts index 4b2a3f421dfb7..5c9dfbfc01154 100644 --- a/packages/aws-cdk-lib/aws-ssm/lib/util.ts +++ b/packages/aws-cdk-lib/aws-ssm/lib/util.ts @@ -1,5 +1,5 @@ -import { ArnFormat, Stack, Token } from '../../core'; import { IConstruct } from 'constructs'; +import { ArnFormat, Stack, Token } from '../../core'; export const AUTOGEN_MARKER = '$$autogen$$'; diff --git a/packages/aws-cdk-lib/aws-ssm/test/parameter.test.ts b/packages/aws-cdk-lib/aws-ssm/test/parameter.test.ts index aac8f1608dd2c..be0b07ba7538d 100644 --- a/packages/aws-cdk-lib/aws-ssm/test/parameter.test.ts +++ b/packages/aws-cdk-lib/aws-ssm/test/parameter.test.ts @@ -1,9 +1,9 @@ /* eslint-disable max-len */ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from '../../assertions'; import * as iam from '../../aws-iam'; import * as kms from '../../aws-kms'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../core'; import * as cxapi from '../../cx-api'; import * as ssm from '../lib'; diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/apigateway/base.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/apigateway/base.ts index fc702d5fb9078..f8f1912c9ef46 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/apigateway/base.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/apigateway/base.ts @@ -1,7 +1,7 @@ -import * as iam from '../../../aws-iam'; -import * as sfn from '../../../aws-stepfunctions'; import { Construct } from 'constructs'; import { AuthType, CallApiGatewayEndpointBaseProps } from './base-types'; +import * as iam from '../../../aws-iam'; +import * as sfn from '../../../aws-stepfunctions'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/apigateway/call-http-api.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/apigateway/call-http-api.ts index a5a8a92b0a220..e5595d21c44c1 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/apigateway/call-http-api.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/apigateway/call-http-api.ts @@ -1,9 +1,9 @@ -import * as iam from '../../../aws-iam'; -import * as sfn from '../../../aws-stepfunctions'; -import * as cdk from '../../../core'; import { Construct } from 'constructs'; import { CallApiGatewayEndpointBase } from './base'; import { CallApiGatewayEndpointBaseProps } from './base-types'; +import * as iam from '../../../aws-iam'; +import * as sfn from '../../../aws-stepfunctions'; +import * as cdk from '../../../core'; /** * Properties for calling an HTTP API Endpoint diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/apigateway/call-rest-api.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/apigateway/call-rest-api.ts index 12166183c9962..c3703205a34c9 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/apigateway/call-rest-api.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/apigateway/call-rest-api.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; +import { CallApiGatewayEndpointBase } from './base'; +import { CallApiGatewayEndpointBaseProps } from './base-types'; import * as apigateway from '../../../aws-apigateway'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; -import { CallApiGatewayEndpointBase } from './base'; -import { CallApiGatewayEndpointBaseProps } from './base-types'; /** * Properties for calling an REST API Endpoint diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/athena/get-query-execution.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/athena/get-query-execution.ts index 50bc392d3cf21..c62dc377299d6 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/athena/get-query-execution.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/athena/get-query-execution.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; -import { Construct } from 'constructs'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/athena/get-query-results.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/athena/get-query-results.ts index c32638ba1f0cd..01dbb7a57f31d 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/athena/get-query-results.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/athena/get-query-results.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; -import { Construct } from 'constructs'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/athena/start-query-execution.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/athena/start-query-execution.ts index f2fad24358155..df129c2fd1bdd 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/athena/start-query-execution.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/athena/start-query-execution.ts @@ -1,9 +1,9 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as kms from '../../../aws-kms'; import * as s3 from '../../../aws-s3'; import * as sfn from '../../../aws-stepfunctions'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/athena/stop-query-execution.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/athena/stop-query-execution.ts index 0399bd89e4b41..25c1f03e7146a 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/athena/stop-query-execution.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/athena/stop-query-execution.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; -import { Construct } from 'constructs'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/aws-sdk/call-aws-service.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/aws-sdk/call-aws-service.ts index 516a745c8f669..556c0becdac08 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/aws-sdk/call-aws-service.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/aws-sdk/call-aws-service.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import { Token } from '../../../core'; -import { Construct } from 'constructs'; import { integrationResourceArn } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/batch/submit-job.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/batch/submit-job.ts index 5990f047d4cca..64f245978c183 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/batch/submit-job.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/batch/submit-job.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import * as ec2 from '../../../aws-ec2'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import { Size, Stack, withResolved } from '../../../core'; -import { Construct } from 'constructs'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/codebuild/start-build.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/codebuild/start-build.ts index f11785ac6818f..69dab7453169b 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/codebuild/start-build.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/codebuild/start-build.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import * as codebuild from '../../../aws-codebuild'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/databrew/start-job-run.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/databrew/start-job-run.ts index 5d0441f0342f1..56ab733dc6db2 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/databrew/start-job-run.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/databrew/start-job-run.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/dynamodb/delete-item.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/dynamodb/delete-item.ts index c386e4ef3f287..918cec73473fb 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/dynamodb/delete-item.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/dynamodb/delete-item.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; +import { DynamoMethod, getDynamoResourceArn, transformAttributeValueMap } from './private/utils'; +import { DynamoAttributeValue, DynamoConsumedCapacity, DynamoItemCollectionMetrics, DynamoReturnValues } from './shared-types'; import * as ddb from '../../../aws-dynamodb'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import { Stack } from '../../../core'; -import { Construct } from 'constructs'; -import { DynamoMethod, getDynamoResourceArn, transformAttributeValueMap } from './private/utils'; -import { DynamoAttributeValue, DynamoConsumedCapacity, DynamoItemCollectionMetrics, DynamoReturnValues } from './shared-types'; /** * Properties for DynamoDeleteItem Task diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/dynamodb/get-item.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/dynamodb/get-item.ts index b249dbbb01596..23346bccf6e81 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/dynamodb/get-item.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/dynamodb/get-item.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; +import { DynamoMethod, getDynamoResourceArn, transformAttributeValueMap } from './private/utils'; +import { DynamoAttributeValue, DynamoConsumedCapacity, DynamoProjectionExpression } from './shared-types'; import * as ddb from '../../../aws-dynamodb'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import { Stack } from '../../../core'; -import { Construct } from 'constructs'; -import { DynamoMethod, getDynamoResourceArn, transformAttributeValueMap } from './private/utils'; -import { DynamoAttributeValue, DynamoConsumedCapacity, DynamoProjectionExpression } from './shared-types'; /** * Properties for DynamoGetItem Task diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/dynamodb/put-item.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/dynamodb/put-item.ts index 35189f8bb47ff..85faabb2b87ca 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/dynamodb/put-item.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/dynamodb/put-item.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; +import { DynamoMethod, getDynamoResourceArn, transformAttributeValueMap } from './private/utils'; +import { DynamoAttributeValue, DynamoConsumedCapacity, DynamoItemCollectionMetrics, DynamoReturnValues } from './shared-types'; import * as ddb from '../../../aws-dynamodb'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import { Stack } from '../../../core'; -import { Construct } from 'constructs'; -import { DynamoMethod, getDynamoResourceArn, transformAttributeValueMap } from './private/utils'; -import { DynamoAttributeValue, DynamoConsumedCapacity, DynamoItemCollectionMetrics, DynamoReturnValues } from './shared-types'; /** * Properties for DynamoPutItem Task diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/dynamodb/update-item.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/dynamodb/update-item.ts index 2101264466cb2..7a3e8b7b91c35 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/dynamodb/update-item.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/dynamodb/update-item.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; +import { DynamoMethod, getDynamoResourceArn, transformAttributeValueMap } from './private/utils'; +import { DynamoAttributeValue, DynamoConsumedCapacity, DynamoItemCollectionMetrics, DynamoReturnValues } from './shared-types'; import * as ddb from '../../../aws-dynamodb'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import { Stack } from '../../../core'; -import { Construct } from 'constructs'; -import { DynamoMethod, getDynamoResourceArn, transformAttributeValueMap } from './private/utils'; -import { DynamoAttributeValue, DynamoConsumedCapacity, DynamoItemCollectionMetrics, DynamoReturnValues } from './shared-types'; /** * Properties for DynamoUpdateItem Task diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/ecs/run-ecs-ec2-task.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/ecs/run-ecs-ec2-task.ts index ed2653d51718b..c37e9273a947d 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/ecs/run-ecs-ec2-task.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/ecs/run-ecs-ec2-task.ts @@ -1,6 +1,6 @@ +import { CommonEcsRunTaskProps, EcsRunTaskBase } from './run-ecs-task-base'; import * as ec2 from '../../../aws-ec2'; import * as ecs from '../../../aws-ecs'; -import { CommonEcsRunTaskProps, EcsRunTaskBase } from './run-ecs-task-base'; /** * Properties to run an ECS task on EC2 in StepFunctionsan ECS diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/ecs/run-ecs-fargate-task.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/ecs/run-ecs-fargate-task.ts index 333c166af9931..13d2c5192c638 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/ecs/run-ecs-fargate-task.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/ecs/run-ecs-fargate-task.ts @@ -1,6 +1,6 @@ +import { CommonEcsRunTaskProps, EcsRunTaskBase } from './run-ecs-task-base'; import * as ec2 from '../../../aws-ec2'; import * as ecs from '../../../aws-ecs'; -import { CommonEcsRunTaskProps, EcsRunTaskBase } from './run-ecs-task-base'; /** * Properties to define an ECS service diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/ecs/run-ecs-task-base.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/ecs/run-ecs-task-base.ts index 6a56d7fbf53e6..a23b5c26eff6e 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/ecs/run-ecs-task-base.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/ecs/run-ecs-task-base.ts @@ -1,9 +1,9 @@ +import { ContainerOverride } from './run-ecs-task-base-types'; import * as ec2 from '../../../aws-ec2'; import * as ecs from '../../../aws-ecs'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import * as cdk from '../../../core'; -import { ContainerOverride } from './run-ecs-task-base-types'; import { getResourceArn } from '../resource-arn-suffix'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/ecs/run-task.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/ecs/run-task.ts index 1cb06fb28f151..62a7ad06be2ba 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/ecs/run-task.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/ecs/run-task.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; +import { ContainerOverride } from '..'; import * as ec2 from '../../../aws-ec2'; import * as ecs from '../../../aws-ecs'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; -import { ContainerOverride } from '..'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/eks/call.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/eks/call.ts index dac3bb18054ef..fa3d423160046 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/eks/call.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/eks/call.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as eks from '../../../aws-eks'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; -import { Construct } from 'constructs'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-add-step.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-add-step.ts index e6f58151e54f7..b7373d0b95d9b 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-add-step.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-add-step.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import { Stack } from '../../../core'; -import { Construct } from 'constructs'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-cancel-step.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-cancel-step.ts index c764f12afc4d0..796fd2253fb94 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-cancel-step.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-cancel-step.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import { Stack } from '../../../core'; -import { Construct } from 'constructs'; import { integrationResourceArn } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-create-cluster.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-create-cluster.ts index 135d0ab8e1784..f7be2329b7a8d 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-create-cluster.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-create-cluster.ts @@ -1,7 +1,3 @@ -import * as iam from '../../../aws-iam'; -import * as sfn from '../../../aws-stepfunctions'; -import * as cdk from '../../../core'; -import { ENABLE_EMR_SERVICE_POLICY_V2 } from '../../../cx-api'; import { Construct } from 'constructs'; import { ApplicationConfigPropertyToJson, @@ -10,6 +6,10 @@ import { InstancesConfigPropertyToJson, KerberosAttributesPropertyToJson, } from './private/cluster-utils'; +import * as iam from '../../../aws-iam'; +import * as sfn from '../../../aws-stepfunctions'; +import * as cdk from '../../../core'; +import { ENABLE_EMR_SERVICE_POLICY_V2 } from '../../../cx-api'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-modify-instance-fleet-by-name.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-modify-instance-fleet-by-name.ts index 4f8bbff885b53..5ea9e00e6bca4 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-modify-instance-fleet-by-name.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-modify-instance-fleet-by-name.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import { Stack } from '../../../core'; -import { Construct } from 'constructs'; import { integrationResourceArn } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-modify-instance-group-by-name.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-modify-instance-group-by-name.ts index 448e065206247..73a01e1592709 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-modify-instance-group-by-name.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-modify-instance-group-by-name.ts @@ -1,9 +1,9 @@ -import * as iam from '../../../aws-iam'; -import * as sfn from '../../../aws-stepfunctions'; -import { Duration, Stack } from '../../../core'; import { Construct } from 'constructs'; import { EmrCreateCluster } from './emr-create-cluster'; import { InstanceGroupModifyConfigPropertyToJson } from './private/cluster-utils'; +import * as iam from '../../../aws-iam'; +import * as sfn from '../../../aws-stepfunctions'; +import { Duration, Stack } from '../../../core'; import { integrationResourceArn } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-set-cluster-termination-protection.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-set-cluster-termination-protection.ts index 57f6efa08f2fb..2614f7b5ea9c8 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-set-cluster-termination-protection.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-set-cluster-termination-protection.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import { Stack } from '../../../core'; -import { Construct } from 'constructs'; import { integrationResourceArn } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-terminate-cluster.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-terminate-cluster.ts index f1995d1645033..f53c62bb2b0e5 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-terminate-cluster.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-terminate-cluster.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import { Stack } from '../../../core'; -import { Construct } from 'constructs'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emrcontainers/create-virtual-cluster.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emrcontainers/create-virtual-cluster.ts index 21ea3e8d729a7..c91320641104e 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emrcontainers/create-virtual-cluster.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emrcontainers/create-virtual-cluster.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import * as eks from '../../../aws-eks'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import { Stack } from '../../../core'; -import { Construct } from 'constructs'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emrcontainers/delete-virtual-cluster.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emrcontainers/delete-virtual-cluster.ts index bffc37c3bdfc9..4b7a3352b0842 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emrcontainers/delete-virtual-cluster.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emrcontainers/delete-virtual-cluster.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emrcontainers/start-job-run.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emrcontainers/start-job-run.ts index 10953ab2c24a9..9a9abddbde7ad 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emrcontainers/start-job-run.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emrcontainers/start-job-run.ts @@ -1,4 +1,5 @@ import * as path from 'path'; +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as lambda from '../../../aws-lambda'; import * as logs from '../../../aws-logs'; @@ -8,7 +9,6 @@ import { TaskInput } from '../../../aws-stepfunctions'; import * as cdk from '../../../core'; import * as cr from '../../../custom-resources'; import * as awscli from '../../../lambda-layer-awscli'; -import { Construct } from 'constructs'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/eventbridge/put-events.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/eventbridge/put-events.ts index fddd807862646..cb0f08bb9a311 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/eventbridge/put-events.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/eventbridge/put-events.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import * as events from '../../../aws-events'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/glue/start-job-run.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/glue/start-job-run.ts index 25aadfa2ccd22..bb97be3a94b49 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/glue/start-job-run.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/glue/start-job-run.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import { Duration, Stack } from '../../../core'; -import { Construct } from 'constructs'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/lambda/invoke.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/lambda/invoke.ts index d3554031b0d2d..7b49cfdedddd7 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/lambda/invoke.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/lambda/invoke.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as lambda from '../../../aws-lambda'; import * as sfn from '../../../aws-stepfunctions'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/base-types.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/base-types.ts index 611b1b70f2a0f..7abaea9b6b0e6 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/base-types.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/base-types.ts @@ -1,3 +1,4 @@ +import { Construct } from 'constructs'; import * as ec2 from '../../../aws-ec2'; import * as ecr from '../../../aws-ecr'; import { DockerImageAsset, DockerImageAssetProps } from '../../../aws-ecr-assets'; @@ -6,7 +7,6 @@ import * as kms from '../../../aws-kms'; import * as s3 from '../../../aws-s3'; import * as sfn from '../../../aws-stepfunctions'; import { Duration, Size } from '../../../core'; -import { Construct } from 'constructs'; /** * Task to train a machine learning model using Amazon SageMaker diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/create-endpoint-config.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/create-endpoint-config.ts index 41efd2e283e9e..7767f8981e58c 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/create-endpoint-config.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/create-endpoint-config.ts @@ -1,9 +1,9 @@ +import { Construct } from 'constructs'; +import { ProductionVariant } from './base-types'; import * as iam from '../../../aws-iam'; import * as kms from '../../../aws-kms'; import * as sfn from '../../../aws-stepfunctions'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; -import { ProductionVariant } from './base-types'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/create-endpoint.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/create-endpoint.ts index 8171c6f2f1eca..e95228ea92913 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/create-endpoint.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/create-endpoint.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/create-model.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/create-model.ts index 181724c6f6712..936cf0bd29bb9 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/create-model.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/create-model.ts @@ -1,9 +1,9 @@ +import { Construct } from 'constructs'; +import { IContainerDefinition } from './base-types'; import * as ec2 from '../../../aws-ec2'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; -import { IContainerDefinition } from './base-types'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/create-training-job.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/create-training-job.ts index a0d5c3d51f2d9..f04842249e24b 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/create-training-job.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/create-training-job.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; +import { AlgorithmSpecification, Channel, InputMode, OutputDataConfig, ResourceConfig, S3DataType, StoppingCondition, VpcConfig } from './base-types'; +import { renderEnvironment, renderTags } from './private/utils'; import * as ec2 from '../../../aws-ec2'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import { Duration, Lazy, Size, Stack } from '../../../core'; -import { Construct } from 'constructs'; -import { AlgorithmSpecification, Channel, InputMode, OutputDataConfig, ResourceConfig, S3DataType, StoppingCondition, VpcConfig } from './base-types'; -import { renderEnvironment, renderTags } from './private/utils'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/create-transform-job.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/create-transform-job.ts index 0ac6fbceb122e..9503c6e432339 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/create-transform-job.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/create-transform-job.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; +import { BatchStrategy, ModelClientOptions, S3DataType, TransformInput, TransformOutput, TransformResources } from './base-types'; +import { renderEnvironment, renderTags } from './private/utils'; import * as ec2 from '../../../aws-ec2'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import { Size, Stack, Token } from '../../../core'; -import { Construct } from 'constructs'; -import { BatchStrategy, ModelClientOptions, S3DataType, TransformInput, TransformOutput, TransformResources } from './base-types'; -import { renderEnvironment, renderTags } from './private/utils'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/update-endpoint.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/update-endpoint.ts index efa2307725e7b..d19d54e30bb22 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/update-endpoint.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sagemaker/update-endpoint.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sns/publish.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sns/publish.ts index 23ee5cf8c3ef7..4f25f7d81cb3a 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sns/publish.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sns/publish.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as sns from '../../../aws-sns'; import * as sfn from '../../../aws-stepfunctions'; import { Token } from '../../../core'; -import { Construct } from 'constructs'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sqs/send-message.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sqs/send-message.ts index 4720447d50be2..38903d1789739 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sqs/send-message.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/sqs/send-message.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as sqs from '../../../aws-sqs'; import * as sfn from '../../../aws-stepfunctions'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/start-execution.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/start-execution.ts index e455cdc890fea..33a4a1f63edd9 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/start-execution.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/start-execution.ts @@ -1,7 +1,7 @@ +import { getResourceArn } from './resource-arn-suffix'; import * as iam from '../../aws-iam'; import * as sfn from '../../aws-stepfunctions'; import { ArnFormat, Stack } from '../../core'; -import { getResourceArn } from './resource-arn-suffix'; /** * Properties for StartExecution diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/stepfunctions/invoke-activity.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/stepfunctions/invoke-activity.ts index 08ab3c3e3f696..0c9a1dd5f0f1e 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/stepfunctions/invoke-activity.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/stepfunctions/invoke-activity.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; -import { Construct } from 'constructs'; /** * Properties for invoking an Activity worker diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/stepfunctions/start-execution.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/stepfunctions/start-execution.ts index 67992982a699f..76735e06e5913 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/stepfunctions/start-execution.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/stepfunctions/start-execution.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as iam from '../../../aws-iam'; import * as sfn from '../../../aws-stepfunctions'; import { ArnFormat, Stack } from '../../../core'; -import { Construct } from 'constructs'; import { integrationResourceArn, validatePatternSupported } from '../private/task-utils'; /** diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/ecs/ecs-tasks.test.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/ecs/ecs-tasks.test.ts index ab2548b9d8605..5aea07ea8766c 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/ecs/ecs-tasks.test.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/ecs/ecs-tasks.test.ts @@ -1,9 +1,9 @@ +import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from '../../../assertions'; import * as autoscaling from '../../../aws-autoscaling'; import * as ec2 from '../../../aws-ec2'; import * as ecs from '../../../aws-ecs'; import * as sfn from '../../../aws-stepfunctions'; -import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import { Stack } from '../../../core'; import * as tasks from '../../lib'; diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/evaluate-expression.test.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/evaluate-expression.test.ts index e2c0f313fbdd5..4d3f87124cbd5 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/evaluate-expression.test.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/evaluate-expression.test.ts @@ -38,7 +38,7 @@ test('Eval with Node.js', () => { Runtime: { 'Fn::FindInMap': [ 'DefaultCrNodeVersionMap', - { 'Ref': 'AWS::Region' }, + { Ref: 'AWS::Region' }, 'value', ], }, diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/glue/run-glue-job-task.test.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/glue/run-glue-job-task.test.ts index 816b789377031..eb46ac79eba49 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/glue/run-glue-job-task.test.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/glue/run-glue-job-task.test.ts @@ -1,6 +1,6 @@ +import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import { Match, Template } from '../../../assertions'; import * as sfn from '../../../aws-stepfunctions'; -import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import { Duration, Stack } from '../../../core'; import * as tasks from '../../lib'; diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/invoke-activity.test.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/invoke-activity.test.ts index 8b9cb3db630af..7945ae85ac32a 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/invoke-activity.test.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/invoke-activity.test.ts @@ -1,6 +1,6 @@ +import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from '../../assertions'; import * as sfn from '../../aws-stepfunctions'; -import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import { Stack } from '../../core'; import * as tasks from '../lib'; diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/lambda/invoke-function.test.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/lambda/invoke-function.test.ts index d11e8dc1ff1ac..c13b0e43f87c8 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/lambda/invoke-function.test.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/lambda/invoke-function.test.ts @@ -1,7 +1,7 @@ +import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from '../../../assertions'; import * as lambda from '../../../aws-lambda'; import * as sfn from '../../../aws-stepfunctions'; -import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import { Stack } from '../../../core'; import * as tasks from '../../lib'; diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/lambda/invoke.test.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/lambda/invoke.test.ts index c9b98ced49238..8ce5416a10468 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/lambda/invoke.test.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/lambda/invoke.test.ts @@ -1,6 +1,6 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as lambda from '../../../aws-lambda'; import * as sfn from '../../../aws-stepfunctions'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Stack } from '../../../core'; import { LambdaInvocationType, LambdaInvoke } from '../../lib'; diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/lambda/run-lambda-task.test.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/lambda/run-lambda-task.test.ts index 8ea42bd4540d0..d6ffda2a684b9 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/lambda/run-lambda-task.test.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/lambda/run-lambda-task.test.ts @@ -1,6 +1,6 @@ +import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import * as lambda from '../../../aws-lambda'; import * as sfn from '../../../aws-stepfunctions'; -import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import { Stack } from '../../../core'; import * as tasks from '../../lib'; diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/sns/publish-to-topic.test.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/sns/publish-to-topic.test.ts index 9faefdf38891d..e41d2d5b0a007 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/sns/publish-to-topic.test.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/sns/publish-to-topic.test.ts @@ -1,6 +1,6 @@ +import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import * as sns from '../../../aws-sns'; import * as sfn from '../../../aws-stepfunctions'; -import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../../core'; import * as tasks from '../../lib'; diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/sqs/send-to-queue.test.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/sqs/send-to-queue.test.ts index 7c5ad9f25aa83..18cc38ba95cef 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/sqs/send-to-queue.test.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/sqs/send-to-queue.test.ts @@ -1,6 +1,6 @@ +import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import * as sqs from '../../../aws-sqs'; import * as sfn from '../../../aws-stepfunctions'; -import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../../core'; import * as tasks from '../../lib'; diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/start-execution.test.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/start-execution.test.ts index 14d6e89f64eb9..5006a253013a3 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/start-execution.test.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/start-execution.test.ts @@ -1,6 +1,6 @@ +import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from '../../assertions'; import * as sfn from '../../aws-stepfunctions'; -import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import { Stack } from '../../core'; import * as tasks from '../lib'; diff --git a/packages/aws-cdk-lib/aws-stepfunctions/lib/activity.ts b/packages/aws-cdk-lib/aws-stepfunctions/lib/activity.ts index 4edc810941d10..f3cc8b38b88f6 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/lib/activity.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/lib/activity.ts @@ -1,9 +1,9 @@ -import * as cloudwatch from '../../aws-cloudwatch'; -import * as iam from '../../aws-iam'; -import { ArnFormat, IResource, Lazy, Names, Resource, Stack } from '../../core'; import { Construct } from 'constructs'; import { StatesMetrics } from './stepfunctions-canned-metrics.generated'; import { CfnActivity } from './stepfunctions.generated'; +import * as cloudwatch from '../../aws-cloudwatch'; +import * as iam from '../../aws-iam'; +import { ArnFormat, IResource, Lazy, Names, Resource, Stack } from '../../core'; /** * Properties for defining a new Step Functions Activity diff --git a/packages/aws-cdk-lib/aws-stepfunctions/lib/fields.ts b/packages/aws-cdk-lib/aws-stepfunctions/lib/fields.ts index 48a44949cee71..baafcfa54d964 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/lib/fields.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/lib/fields.ts @@ -1,5 +1,5 @@ -import { Token, IResolvable, JsonNull } from '../../core'; import { findReferencedPaths, jsonPathString, JsonPathToken, renderObject, renderInExpression, jsonPathFromAny } from './private/json-path'; +import { Token, IResolvable, JsonNull } from '../../core'; /** * Extract a field from the State Machine data or context diff --git a/packages/aws-cdk-lib/aws-stepfunctions/lib/private/json-path.ts b/packages/aws-cdk-lib/aws-stepfunctions/lib/private/json-path.ts index f54697d74d52b..484ccc1552c1e 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/lib/private/json-path.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/lib/private/json-path.ts @@ -1,5 +1,5 @@ -import { captureStackTrace, IResolvable, IResolveContext, Token, Tokenization } from '../../../core'; import { IntrinsicParser, IntrinsicExpression } from './intrinstics'; +import { captureStackTrace, IResolvable, IResolveContext, Token, Tokenization } from '../../../core'; const JSON_PATH_TOKEN_SYMBOL = Symbol.for('@aws-cdk/aws-stepfunctions.JsonPathToken'); diff --git a/packages/aws-cdk-lib/aws-stepfunctions/lib/state-graph.ts b/packages/aws-cdk-lib/aws-stepfunctions/lib/state-graph.ts index b308c97b9b966..7eb3f275e9856 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/lib/state-graph.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/lib/state-graph.ts @@ -1,6 +1,6 @@ +import { State } from './states/state'; import * as iam from '../../aws-iam'; import { Duration } from '../../core'; -import { State } from './states/state'; /** * A collection of connected states diff --git a/packages/aws-cdk-lib/aws-stepfunctions/lib/state-machine.ts b/packages/aws-cdk-lib/aws-stepfunctions/lib/state-machine.ts index a0710832d197a..b017d4fb59758 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/lib/state-machine.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/lib/state-machine.ts @@ -1,12 +1,12 @@ -import * as cloudwatch from '../../aws-cloudwatch'; -import * as iam from '../../aws-iam'; -import * as logs from '../../aws-logs'; -import { Arn, ArnFormat, Duration, IResource, RemovalPolicy, Resource, Stack, Token } from '../../core'; import { Construct } from 'constructs'; import { StateGraph } from './state-graph'; import { StatesMetrics } from './stepfunctions-canned-metrics.generated'; import { CfnStateMachine } from './stepfunctions.generated'; import { IChainable } from './types'; +import * as cloudwatch from '../../aws-cloudwatch'; +import * as iam from '../../aws-iam'; +import * as logs from '../../aws-logs'; +import { Arn, ArnFormat, Duration, IResource, RemovalPolicy, Resource, Stack, Token } from '../../core'; /** * Two types of state machines are available in AWS Step Functions: EXPRESS AND STANDARD. diff --git a/packages/aws-cdk-lib/aws-stepfunctions/lib/states/map.ts b/packages/aws-cdk-lib/aws-stepfunctions/lib/states/map.ts index 017195d51ee93..4777b0d3fddbd 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/lib/states/map.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/lib/states/map.ts @@ -1,7 +1,7 @@ -import { Token } from '../../../core'; import { Construct } from 'constructs'; import { StateType } from './private/state-type'; import { renderJsonPath, State } from './state'; +import { Token } from '../../../core'; import { Chain } from '../chain'; import { FieldUtils } from '../fields'; import { StateGraph } from '../state-graph'; diff --git a/packages/aws-cdk-lib/aws-stepfunctions/lib/states/state.ts b/packages/aws-cdk-lib/aws-stepfunctions/lib/states/state.ts index 99240e45ba3d7..f5d8abe8ea2bf 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/lib/states/state.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/lib/states/state.ts @@ -1,5 +1,5 @@ -import { Token } from '../../../core'; import { IConstruct, Construct, Node } from 'constructs'; +import { Token } from '../../../core'; import { Condition } from '../condition'; import { FieldUtils } from '../fields'; import { StateGraph } from '../state-graph'; diff --git a/packages/aws-cdk-lib/aws-stepfunctions/lib/states/task-base.ts b/packages/aws-cdk-lib/aws-stepfunctions/lib/states/task-base.ts index b207ad4d3197f..f9a8e1e9f3a57 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/lib/states/task-base.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/lib/states/task-base.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; +import { renderJsonPath, State } from './state'; import * as cloudwatch from '../../../aws-cloudwatch'; import * as iam from '../../../aws-iam'; import * as cdk from '../../../core'; -import { Construct } from 'constructs'; -import { renderJsonPath, State } from './state'; import { Chain } from '../chain'; import { FieldUtils } from '../fields'; import { StateGraph } from '../state-graph'; diff --git a/packages/aws-cdk-lib/aws-stepfunctions/lib/states/task.ts b/packages/aws-cdk-lib/aws-stepfunctions/lib/states/task.ts index 41a6f7d62716f..7d50ba3556c3e 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/lib/states/task.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/lib/states/task.ts @@ -1,8 +1,8 @@ -import * as cloudwatch from '../../../aws-cloudwatch'; -import * as cdk from '../../../core'; import { Construct } from 'constructs'; import { StateType } from './private/state-type'; import { renderJsonPath, State } from './state'; +import * as cloudwatch from '../../../aws-cloudwatch'; +import * as cdk from '../../../core'; import { Chain } from '../chain'; import { FieldUtils } from '../fields'; import { StateGraph } from '../state-graph'; diff --git a/packages/aws-cdk-lib/aws-stepfunctions/lib/states/wait.ts b/packages/aws-cdk-lib/aws-stepfunctions/lib/states/wait.ts index ec6d2e7731eb0..9a33c498f5357 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/lib/states/wait.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/lib/states/wait.ts @@ -1,7 +1,7 @@ -import * as cdk from '../../../core'; import { Construct } from 'constructs'; import { StateType } from './private/state-type'; import { State } from './state'; +import * as cdk from '../../../core'; import { Chain } from '../chain'; import { IChainable, INextable } from '../types'; diff --git a/packages/aws-cdk-lib/aws-stepfunctions/lib/step-functions-task.ts b/packages/aws-cdk-lib/aws-stepfunctions/lib/step-functions-task.ts index 59e19404e1046..7ce4b0512bc5f 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/lib/step-functions-task.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/lib/step-functions-task.ts @@ -1,7 +1,7 @@ +import { Task } from './states/task'; import * as cloudwatch from '../../aws-cloudwatch'; import * as iam from '../../aws-iam'; import { Duration } from '../../core'; -import { Task } from './states/task'; /** * Interface for resources that can be used as tasks diff --git a/packages/aws-cdk-lib/aws-stepfunctions/lib/task-credentials.ts b/packages/aws-cdk-lib/aws-stepfunctions/lib/task-credentials.ts index 8ce9b071bf66e..c2f1dc974135c 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/lib/task-credentials.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/lib/task-credentials.ts @@ -1,5 +1,5 @@ -import * as iam from '../../aws-iam'; import { JsonPath } from './fields'; +import * as iam from '../../aws-iam'; /** * Specifies a target role assumed by the State Machine's execution role for invoking the task's resource. diff --git a/packages/aws-cdk-lib/aws-stepfunctions/lib/types.ts b/packages/aws-cdk-lib/aws-stepfunctions/lib/types.ts index 884b7c1ac30fb..3a496ab4cf20e 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/lib/types.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/lib/types.ts @@ -1,6 +1,6 @@ -import { Duration } from '../../core'; import { Chain } from './chain'; import { State } from './states/state'; +import { Duration } from '../../core'; /** * Interface for states that can have 'next' states diff --git a/packages/aws-cdk-lib/aws-stepfunctions/test/custom-state.test.ts b/packages/aws-cdk-lib/aws-stepfunctions/test/custom-state.test.ts index 90823e9f6ec01..daa069b15e37d 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/test/custom-state.test.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/test/custom-state.test.ts @@ -1,5 +1,5 @@ -import * as cdk from '../../core'; import { render } from './private/render-util'; +import * as cdk from '../../core'; import * as sfn from '../lib'; describe('Custom State', () => { diff --git a/packages/aws-cdk-lib/aws-stepfunctions/test/fake-task.ts b/packages/aws-cdk-lib/aws-stepfunctions/test/fake-task.ts index 841307d62bcf1..f97ff13c21fde 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/test/fake-task.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/test/fake-task.ts @@ -1,5 +1,5 @@ -import * as iam from '../../aws-iam'; import * as constructs from 'constructs'; +import * as iam from '../../aws-iam'; import * as sfn from '../lib'; export interface FakeTaskProps extends sfn.TaskStateBaseProps { diff --git a/packages/aws-cdk-lib/aws-stepfunctions/test/private/fake-task.ts b/packages/aws-cdk-lib/aws-stepfunctions/test/private/fake-task.ts index 1faf6cdaf6a4d..20b4a38e391fc 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/test/private/fake-task.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/test/private/fake-task.ts @@ -1,5 +1,5 @@ -import * as iam from '../../../aws-iam'; import * as constructs from 'constructs'; +import * as iam from '../../../aws-iam'; import * as sfn from '../../lib'; export interface FakeTaskProps extends sfn.TaskStateBaseProps { diff --git a/packages/aws-cdk-lib/aws-stepfunctions/test/state-machine-fragment.test.ts b/packages/aws-cdk-lib/aws-stepfunctions/test/state-machine-fragment.test.ts index 45d12b4a39b4a..b3438a1693ff2 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/test/state-machine-fragment.test.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/test/state-machine-fragment.test.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import { Match, Template } from '../../assertions'; import * as cdk from '../../core'; -import { Construct } from 'constructs'; import * as stepfunctions from '../lib'; describe('State Machine Fragment', () => { diff --git a/packages/aws-cdk-lib/aws-stepfunctions/test/state-machine-resources.test.ts b/packages/aws-cdk-lib/aws-stepfunctions/test/state-machine-resources.test.ts index e4127b032ab3c..fb231ad43041a 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/test/state-machine-resources.test.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/test/state-machine-resources.test.ts @@ -1,9 +1,9 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; +import { Construct } from 'constructs'; import { Match, Template } from '../../assertions'; import * as cloudwatch from '../../aws-cloudwatch'; import * as iam from '../../aws-iam'; -import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import * as cdk from '../../core'; -import { Construct } from 'constructs'; import * as stepfunctions from '../lib'; describe('State Machine Resources', () => { diff --git a/packages/aws-cdk-lib/aws-stepfunctions/test/state-machine.test.ts b/packages/aws-cdk-lib/aws-stepfunctions/test/state-machine.test.ts index afdb8b19e4fb3..87e8f09947839 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/test/state-machine.test.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/test/state-machine.test.ts @@ -1,9 +1,9 @@ +import { FakeTask } from './private/fake-task'; import { Template } from '../../assertions'; import * as iam from '../../aws-iam'; import * as logs from '../../aws-logs'; import * as s3 from '../../aws-s3'; import * as cdk from '../../core'; -import { FakeTask } from './private/fake-task'; import * as sfn from '../lib'; describe('State Machine', () => { diff --git a/packages/aws-cdk-lib/aws-stepfunctions/test/state.test.ts b/packages/aws-cdk-lib/aws-stepfunctions/test/state.test.ts index c42801e77b484..faaa2d8bf5115 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/test/state.test.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/test/state.test.ts @@ -1,6 +1,6 @@ +import { FakeTask } from './fake-task'; import * as assert from '../../assertions'; import * as cdk from '../../core'; -import { FakeTask } from './fake-task'; import { JsonPath, StateMachine } from '../lib'; test('JsonPath.DISCARD can be used to discard a state\'s output', () => { diff --git a/packages/aws-cdk-lib/aws-stepfunctions/test/states-language.test.ts b/packages/aws-cdk-lib/aws-stepfunctions/test/states-language.test.ts index f69c07a98aa72..5908518508ec7 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/test/states-language.test.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/test/states-language.test.ts @@ -1,6 +1,6 @@ +import { Construct } from 'constructs'; import * as iam from '../../aws-iam'; import * as cdk from '../../core'; -import { Construct } from 'constructs'; import * as stepfunctions from '../lib'; describe('States Language', () => { diff --git a/packages/aws-cdk-lib/aws-stepfunctions/test/task-base.test.ts b/packages/aws-cdk-lib/aws-stepfunctions/test/task-base.test.ts index 7b7bc31f087e6..f06156f68355d 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/test/task-base.test.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/test/task-base.test.ts @@ -1,9 +1,9 @@ -import { Metric } from '../../aws-cloudwatch'; -import * as iam from '../../aws-iam'; import { testDeprecated } from '@aws-cdk/cdk-build-tools'; -import * as cdk from '../../core'; import { FakeTask } from './private/fake-task'; import { renderGraph } from './private/render-util'; +import { Metric } from '../../aws-cloudwatch'; +import * as iam from '../../aws-iam'; +import * as cdk from '../../core'; import * as sfn from '../lib'; describe('Task base', () => { diff --git a/packages/aws-cdk-lib/aws-stepfunctions/test/task.test.ts b/packages/aws-cdk-lib/aws-stepfunctions/test/task.test.ts index 462c1bae7670a..3c71d54b84292 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/test/task.test.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/test/task.test.ts @@ -1,5 +1,5 @@ -import { Metric } from '../../aws-cloudwatch'; import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; +import { Metric } from '../../aws-cloudwatch'; import * as cdk from '../../core'; import * as sfn from '../lib'; diff --git a/packages/aws-cdk-lib/aws-stepfunctions/test/wait.test.ts b/packages/aws-cdk-lib/aws-stepfunctions/test/wait.test.ts index 7f0eda233013e..cb24ed19c0037 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/test/wait.test.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/test/wait.test.ts @@ -1,5 +1,5 @@ -import * as cdk from '../../core'; import { render } from './private/render-util'; +import * as cdk from '../../core'; import { Pass, Wait, WaitTime } from '../lib'; describe('Wait State', () => { diff --git a/packages/aws-cdk-lib/cloudformation-include/lib/cfn-include.ts b/packages/aws-cdk-lib/cloudformation-include/lib/cfn-include.ts index 7bc02b04e3ede..19dcdaeca533a 100644 --- a/packages/aws-cdk-lib/cloudformation-include/lib/cfn-include.ts +++ b/packages/aws-cdk-lib/cloudformation-include/lib/cfn-include.ts @@ -1,8 +1,8 @@ -import * as core from '../../core'; -import * as cfn_parse from '../../core/lib/helpers-internal'; import { Construct } from 'constructs'; import * as cfn_type_to_l1_mapping from './cfn-type-to-l1-mapping'; import * as futils from './file-utils'; +import * as core from '../../core'; +import * as cfn_parse from '../../core/lib/helpers-internal'; /** * Construction properties of `CfnInclude`. diff --git a/packages/aws-cdk-lib/cloudformation-include/test/invalid-templates.test.ts b/packages/aws-cdk-lib/cloudformation-include/test/invalid-templates.test.ts index 66c5b9bbf803c..984a394adaa05 100644 --- a/packages/aws-cdk-lib/cloudformation-include/test/invalid-templates.test.ts +++ b/packages/aws-cdk-lib/cloudformation-include/test/invalid-templates.test.ts @@ -1,8 +1,8 @@ import * as path from 'path'; +import * as constructs from 'constructs'; import { Template } from '../../assertions'; import * as core from '../../core'; import * as cxapi from '../../cx-api'; -import * as constructs from 'constructs'; import * as inc from '../lib'; describe('CDK Include', () => { diff --git a/packages/aws-cdk-lib/cloudformation-include/test/serverless-transform.test.ts b/packages/aws-cdk-lib/cloudformation-include/test/serverless-transform.test.ts index 07e32fe0246e6..d74bfd4b09f74 100644 --- a/packages/aws-cdk-lib/cloudformation-include/test/serverless-transform.test.ts +++ b/packages/aws-cdk-lib/cloudformation-include/test/serverless-transform.test.ts @@ -1,8 +1,8 @@ import * as path from 'path'; +import * as constructs from 'constructs'; import { Template } from '../../assertions'; import * as core from '../../core'; import * as cxapi from '../../cx-api'; -import * as constructs from 'constructs'; import * as inc from '../lib'; import * as futils from '../lib/file-utils'; diff --git a/packages/aws-cdk-lib/cloudformation-include/test/valid-templates.test.ts b/packages/aws-cdk-lib/cloudformation-include/test/valid-templates.test.ts index ff0e8b99f1f6f..3ed846172ac11 100644 --- a/packages/aws-cdk-lib/cloudformation-include/test/valid-templates.test.ts +++ b/packages/aws-cdk-lib/cloudformation-include/test/valid-templates.test.ts @@ -1,10 +1,10 @@ import * as path from 'path'; +import * as constructs from 'constructs'; import { Template } from '../../assertions'; import * as iam from '../../aws-iam'; import * as s3 from '../../aws-s3'; import * as ssm from '../../aws-ssm'; import * as core from '../../core'; -import * as constructs from 'constructs'; import * as inc from '../lib'; import * as futils from '../lib/file-utils'; diff --git a/packages/aws-cdk-lib/cloudformation-include/test/yaml-templates.test.ts b/packages/aws-cdk-lib/cloudformation-include/test/yaml-templates.test.ts index 7497ebaf1ca92..2357586ffc770 100644 --- a/packages/aws-cdk-lib/cloudformation-include/test/yaml-templates.test.ts +++ b/packages/aws-cdk-lib/cloudformation-include/test/yaml-templates.test.ts @@ -1,8 +1,8 @@ import * as path from 'path'; +import * as constructs from 'constructs'; import { Template } from '../../assertions'; import * as cloudwatch from '../../aws-cloudwatch'; import * as core from '../../core'; -import * as constructs from 'constructs'; import * as inc from '../lib'; import * as futils from '../lib/file-utils'; diff --git a/packages/aws-cdk-lib/core/lib/annotations.ts b/packages/aws-cdk-lib/core/lib/annotations.ts index 6192a71e39d1e..45ce2f1b8fd06 100644 --- a/packages/aws-cdk-lib/core/lib/annotations.ts +++ b/packages/aws-cdk-lib/core/lib/annotations.ts @@ -1,6 +1,6 @@ +import { IConstruct } from 'constructs'; import * as cxschema from '../../cloud-assembly-schema'; import * as cxapi from '../../cx-api'; -import { IConstruct } from 'constructs'; /** * Includes API for attaching annotations such as warning messages to constructs. diff --git a/packages/aws-cdk-lib/core/lib/app.ts b/packages/aws-cdk-lib/core/lib/app.ts index ae41727bf7d24..d24ec829f00df 100644 --- a/packages/aws-cdk-lib/core/lib/app.ts +++ b/packages/aws-cdk-lib/core/lib/app.ts @@ -1,4 +1,3 @@ -import * as cxapi from '../../cx-api'; import { Construct } from 'constructs'; import * as fs from 'fs-extra'; import { PRIVATE_CONTEXT_DEFAULT_STACK_SYNTHESIZER } from './private/private-context'; @@ -6,6 +5,7 @@ import { addCustomSynthesis, ICustomSynthesis } from './private/synthesis'; import { IReusableStackSynthesizer } from './stack-synthesizers'; import { Stage } from './stage'; import { IPolicyValidationPluginBeta1 } from './validation/validation'; +import * as cxapi from '../../cx-api'; const APP_SYMBOL = Symbol.for('@aws-cdk/core.App'); diff --git a/packages/aws-cdk-lib/core/lib/arn.ts b/packages/aws-cdk-lib/core/lib/arn.ts index 2f6cb68e2dc95..445221f3e0ddb 100644 --- a/packages/aws-cdk-lib/core/lib/arn.ts +++ b/packages/aws-cdk-lib/core/lib/arn.ts @@ -15,6 +15,7 @@ export enum ArnFormat { * even if it contains slashes, * like in 'arn:aws:s3:::bucket/object.zip'. */ + // eslint-disable-next-line @aws-cdk/no-literal-partition NO_RESOURCE_NAME = 'arn:aws:service:region:account:resource', /** @@ -25,6 +26,7 @@ export enum ArnFormat { * even if it contains slashes, * like in 'arn:aws:apigateway:region:account:resource:/test/mydemoresource/*'. */ + // eslint-disable-next-line @aws-cdk/no-literal-partition COLON_RESOURCE_NAME = 'arn:aws:service:region:account:resource:resourceName', /** @@ -35,6 +37,7 @@ export enum ArnFormat { * even if it contains colons, * like in 'arn:aws:cognito-sync:region:account:identitypool/us-east-1:1a1a1a1a-ffff-1111-9999-12345678:bla'. */ + // eslint-disable-next-line @aws-cdk/no-literal-partition SLASH_RESOURCE_NAME = 'arn:aws:service:region:account:resource/resourceName', /** @@ -44,6 +47,7 @@ export enum ArnFormat { * Like in: 'arn:aws:service:region:account:/resource/resourceName'. * Note that the leading slash is _not_ included in the parsed 'resource' part. */ + // eslint-disable-next-line @aws-cdk/no-literal-partition SLASH_RESOURCE_SLASH_RESOURCE_NAME = 'arn:aws:service:region:account:/resource/resourceName', } diff --git a/packages/aws-cdk-lib/core/lib/asset-staging.ts b/packages/aws-cdk-lib/core/lib/asset-staging.ts index a018f371e54a3..3e6001d5e99a1 100644 --- a/packages/aws-cdk-lib/core/lib/asset-staging.ts +++ b/packages/aws-cdk-lib/core/lib/asset-staging.ts @@ -1,6 +1,5 @@ import * as crypto from 'crypto'; import * as path from 'path'; -import * as cxapi from '../../cx-api'; import { Construct } from 'constructs'; import * as fs from 'fs-extra'; import { AssetHashType, AssetOptions, FileAssetPackaging } from './assets'; @@ -12,6 +11,7 @@ import { AssetBundlingVolumeCopy, AssetBundlingBindMount } from './private/asset import { Cache } from './private/cache'; import { Stack } from './stack'; import { Stage } from './stage'; +import * as cxapi from '../../cx-api'; const ARCHIVE_EXTENSIONS = ['.tar.gz', '.zip', '.jar', '.tar', '.tgz']; diff --git a/packages/aws-cdk-lib/core/lib/cfn-element.ts b/packages/aws-cdk-lib/core/lib/cfn-element.ts index 4780ec17dd9a2..142efb19c04b9 100644 --- a/packages/aws-cdk-lib/core/lib/cfn-element.ts +++ b/packages/aws-cdk-lib/core/lib/cfn-element.ts @@ -1,8 +1,9 @@ -import * as cxschema from '../../cloud-assembly-schema'; -import * as cxapi from '../../cx-api'; +/* eslint-disable import/order */ import { Construct, Node } from 'constructs'; import { debugModeEnabled } from './debug'; import { Lazy } from './lazy'; +import * as cxschema from '../../cloud-assembly-schema'; +import * as cxapi from '../../cx-api'; const CFN_ELEMENT_SYMBOL = Symbol.for('@aws-cdk/core.CfnElement'); @@ -203,7 +204,8 @@ function notTooLong(x: string) { return x.slice(0, 47) + '...' + x.slice(-47); } + +// These imports have to be at the end to prevent circular imports import { CfnReference } from './private/cfn-reference'; import { Stack } from './stack'; import { Token } from './token'; - diff --git a/packages/aws-cdk-lib/core/lib/cfn-resource.ts b/packages/aws-cdk-lib/core/lib/cfn-resource.ts index 3740752c2b5d9..d1796b3411bd7 100644 --- a/packages/aws-cdk-lib/core/lib/cfn-resource.ts +++ b/packages/aws-cdk-lib/core/lib/cfn-resource.ts @@ -1,4 +1,3 @@ -import * as cxapi from '../../cx-api'; import { Annotations } from './annotations'; import { CfnCondition } from './cfn-condition'; // import required to be here, otherwise causes a cycle when running the generated JavaScript @@ -16,6 +15,7 @@ import { Tokenization } from './token'; import { capitalizePropertyNames, ignoreEmpty, PostResolveToken } from './util'; import { FeatureFlags } from './feature-flags'; import { ResolutionTypeHint } from './type-hints'; +import * as cxapi from '../../cx-api'; export interface CfnResourceProps { /** diff --git a/packages/aws-cdk-lib/core/lib/context-provider.ts b/packages/aws-cdk-lib/core/lib/context-provider.ts index 75715f4a52146..d0e79fc02c7fb 100644 --- a/packages/aws-cdk-lib/core/lib/context-provider.ts +++ b/packages/aws-cdk-lib/core/lib/context-provider.ts @@ -1,9 +1,9 @@ -import * as cxschema from '../../cloud-assembly-schema'; -import * as cxapi from '../../cx-api'; import { Construct, Node } from 'constructs'; import { Annotations } from './annotations'; import { Stack } from './stack'; import { Token } from './token'; +import * as cxschema from '../../cloud-assembly-schema'; +import * as cxapi from '../../cx-api'; /** */ diff --git a/packages/aws-cdk-lib/core/lib/custom-resource-provider/custom-resource-provider.ts b/packages/aws-cdk-lib/core/lib/custom-resource-provider/custom-resource-provider.ts index 0bc998317c542..e53d215c19841 100644 --- a/packages/aws-cdk-lib/core/lib/custom-resource-provider/custom-resource-provider.ts +++ b/packages/aws-cdk-lib/core/lib/custom-resource-provider/custom-resource-provider.ts @@ -1,8 +1,9 @@ import * as fs from 'fs'; import * as path from 'path'; -import * as cxapi from '../../../cx-api'; import { Construct } from 'constructs'; import * as fse from 'fs-extra'; +import * as cxapi from '../../../cx-api'; +import { FactName } from '../../../region-info'; import { AssetStaging } from '../asset-staging'; import { FileAssetPackaging } from '../assets'; import { CfnResource } from '../cfn-resource'; @@ -13,7 +14,6 @@ import { Lazy } from '../lazy'; import { Size } from '../size'; import { Stack } from '../stack'; import { Token } from '../token'; -import { FactName } from '../../../region-info'; const ENTRYPOINT_FILENAME = '__entrypoint__'; const ENTRYPOINT_NODEJS_SOURCE = path.join(__dirname, 'nodejs-entrypoint.js'); diff --git a/packages/aws-cdk-lib/core/lib/feature-flags.ts b/packages/aws-cdk-lib/core/lib/feature-flags.ts index 2f5bf933e0eb9..e156ddac41619 100644 --- a/packages/aws-cdk-lib/core/lib/feature-flags.ts +++ b/packages/aws-cdk-lib/core/lib/feature-flags.ts @@ -1,5 +1,5 @@ -import * as cxapi from '../../cx-api'; import { IConstruct, Node } from 'constructs'; +import * as cxapi from '../../cx-api'; /** * Features that are implemented behind a flag in order to preserve backwards diff --git a/packages/aws-cdk-lib/core/lib/nested-stack.ts b/packages/aws-cdk-lib/core/lib/nested-stack.ts index 0f1f8a4f0d3dc..a542b8d3bfaa4 100644 --- a/packages/aws-cdk-lib/core/lib/nested-stack.ts +++ b/packages/aws-cdk-lib/core/lib/nested-stack.ts @@ -1,5 +1,4 @@ import * as crypto from 'crypto'; -import * as cxapi from '../../cx-api'; import { Construct, Node } from 'constructs'; import { FileAssetPackaging } from './assets'; import { Fn } from './cfn-fn'; @@ -14,6 +13,7 @@ import { IResolveContext } from './resolvable'; import { Stack } from './stack'; import { NestedStackSynthesizer } from './stack-synthesizers'; import { Token } from './token'; +import * as cxapi from '../../cx-api'; const NESTED_STACK_SYMBOL = Symbol.for('@aws-cdk/core.NestedStack'); diff --git a/packages/aws-cdk-lib/core/lib/private/metadata-resource.ts b/packages/aws-cdk-lib/core/lib/private/metadata-resource.ts index 0f27a0f4e65ce..06b0d3f3aefef 100644 --- a/packages/aws-cdk-lib/core/lib/private/metadata-resource.ts +++ b/packages/aws-cdk-lib/core/lib/private/metadata-resource.ts @@ -1,7 +1,7 @@ import * as zlib from 'zlib'; -import { RegionInfo } from '../../../region-info'; import { Construct } from 'constructs'; import { ConstructInfo, constructInfoFromStack } from './runtime-info'; +import { RegionInfo } from '../../../region-info'; import { CfnCondition } from '../cfn-condition'; import { Fn } from '../cfn-fn'; import { Aws } from '../cfn-pseudo'; diff --git a/packages/aws-cdk-lib/core/lib/private/synthesis.ts b/packages/aws-cdk-lib/core/lib/private/synthesis.ts index 8f4e00383a18e..7ad67d959ec27 100644 --- a/packages/aws-cdk-lib/core/lib/private/synthesis.ts +++ b/packages/aws-cdk-lib/core/lib/private/synthesis.ts @@ -1,21 +1,21 @@ import * as fs from 'fs'; import * as path from 'path'; -import * as cxapi from '../../../cx-api'; -import { CloudAssembly } from '../../../cx-api'; import { IConstruct } from 'constructs'; import { MetadataResource } from './metadata-resource'; import { prepareApp } from './prepare-app'; import { TreeMetadata } from './tree-metadata'; +import { CloudAssembly } from '../../../cx-api'; +import * as cxapi from '../../../cx-api'; import { Annotations } from '../annotations'; import { App } from '../app'; import { Aspects, IAspect } from '../aspect'; +import { FileSystem } from '../fs'; import { Stack } from '../stack'; import { ISynthesisSession } from '../stack-synthesizers/types'; import { Stage, StageSynthesisOptions } from '../stage'; import { IPolicyValidationPluginBeta1 } from '../validation'; import { ConstructTree } from '../validation/private/construct-tree'; import { PolicyValidationReportFormatter, NamedValidationPluginReport } from '../validation/private/report'; -import { FileSystem } from '../fs'; const POLICY_VALIDATION_FILE_PATH = 'policy-validation-report.json'; const VALIDATION_REPORT_JSON_CONTEXT = '@aws-cdk/core:validationReportJson'; diff --git a/packages/aws-cdk-lib/core/lib/private/tree-metadata.ts b/packages/aws-cdk-lib/core/lib/private/tree-metadata.ts index 0441bea237cd7..f0ceb3c0301c5 100644 --- a/packages/aws-cdk-lib/core/lib/private/tree-metadata.ts +++ b/packages/aws-cdk-lib/core/lib/private/tree-metadata.ts @@ -1,9 +1,9 @@ import * as fs from 'fs'; import * as path from 'path'; -import { ArtifactType } from '../../../cloud-assembly-schema'; import { Construct, IConstruct } from 'constructs'; import { ConstructInfo, constructInfoFromConstruct } from './runtime-info'; +import { ArtifactType } from '../../../cloud-assembly-schema'; import { Annotations } from '../annotations'; import { Stack } from '../stack'; import { ISynthesisSession } from '../stack-synthesizers'; diff --git a/packages/aws-cdk-lib/core/lib/secret-value.ts b/packages/aws-cdk-lib/core/lib/secret-value.ts index 8f9af0e6bfca9..5c528fae1316f 100644 --- a/packages/aws-cdk-lib/core/lib/secret-value.ts +++ b/packages/aws-cdk-lib/core/lib/secret-value.ts @@ -1,4 +1,3 @@ -import { CHECK_SECRET_USAGE } from '../../cx-api'; import { CfnDynamicReference, CfnDynamicReferenceService } from './cfn-dynamic-reference'; import { CfnParameter } from './cfn-parameter'; import { CfnResource } from './cfn-resource'; @@ -7,6 +6,7 @@ import { CfnReference } from './private/cfn-reference'; import { Intrinsic, IntrinsicProps } from './private/intrinsic'; import { IResolveContext } from './resolvable'; import { Token, Tokenization } from './token'; +import { CHECK_SECRET_USAGE } from '../../cx-api'; /** * Work with secret values in the CDK diff --git a/packages/aws-cdk-lib/core/lib/stack-synthesizers/_shared.ts b/packages/aws-cdk-lib/core/lib/stack-synthesizers/_shared.ts index c8165e72f9c0a..a9c882dcb1fa1 100644 --- a/packages/aws-cdk-lib/core/lib/stack-synthesizers/_shared.ts +++ b/packages/aws-cdk-lib/core/lib/stack-synthesizers/_shared.ts @@ -1,8 +1,8 @@ import * as crypto from 'crypto'; -import * as cxschema from '../../../cloud-assembly-schema'; -import * as cxapi from '../../../cx-api'; import { Node, IConstruct } from 'constructs'; import { ISynthesisSession } from './types'; +import * as cxschema from '../../../cloud-assembly-schema'; +import * as cxapi from '../../../cx-api'; import { Stack } from '../stack'; import { Token } from '../token'; diff --git a/packages/aws-cdk-lib/core/lib/stack-synthesizers/asset-manifest-builder.ts b/packages/aws-cdk-lib/core/lib/stack-synthesizers/asset-manifest-builder.ts index c25f620a314db..da10ef7e247d0 100644 --- a/packages/aws-cdk-lib/core/lib/stack-synthesizers/asset-manifest-builder.ts +++ b/packages/aws-cdk-lib/core/lib/stack-synthesizers/asset-manifest-builder.ts @@ -1,8 +1,8 @@ import * as fs from 'fs'; import * as path from 'path'; -import * as cxschema from '../../../cloud-assembly-schema'; import { resolvedOr } from './_shared'; import { ISynthesisSession } from './types'; +import * as cxschema from '../../../cloud-assembly-schema'; import { FileAssetSource, FileAssetPackaging, DockerImageAssetSource } from '../assets'; import { Stack } from '../stack'; diff --git a/packages/aws-cdk-lib/core/lib/stack-synthesizers/cli-credentials-synthesizer.ts b/packages/aws-cdk-lib/core/lib/stack-synthesizers/cli-credentials-synthesizer.ts index a85f483c3654c..d56604a35f21c 100644 --- a/packages/aws-cdk-lib/core/lib/stack-synthesizers/cli-credentials-synthesizer.ts +++ b/packages/aws-cdk-lib/core/lib/stack-synthesizers/cli-credentials-synthesizer.ts @@ -1,9 +1,9 @@ -import * as cxapi from '../../../cx-api'; import { assertBound, StringSpecializer } from './_shared'; import { AssetManifestBuilder } from './asset-manifest-builder'; import { BOOTSTRAP_QUALIFIER_CONTEXT, DefaultStackSynthesizer } from './default-synthesizer'; import { StackSynthesizer } from './stack-synthesizer'; import { ISynthesisSession, IReusableStackSynthesizer, IBoundStackSynthesizer } from './types'; +import * as cxapi from '../../../cx-api'; import { DockerImageAssetLocation, DockerImageAssetSource, FileAssetLocation, FileAssetSource } from '../assets'; import { Stack } from '../stack'; import { Token } from '../token'; diff --git a/packages/aws-cdk-lib/core/lib/stack-synthesizers/default-synthesizer.ts b/packages/aws-cdk-lib/core/lib/stack-synthesizers/default-synthesizer.ts index 9185b5e05016e..7140b7bffbfa5 100644 --- a/packages/aws-cdk-lib/core/lib/stack-synthesizers/default-synthesizer.ts +++ b/packages/aws-cdk-lib/core/lib/stack-synthesizers/default-synthesizer.ts @@ -1,8 +1,8 @@ -import * as cxapi from '../../../cx-api'; import { assertBound, StringSpecializer } from './_shared'; import { AssetManifestBuilder } from './asset-manifest-builder'; import { StackSynthesizer } from './stack-synthesizer'; import { ISynthesisSession, IReusableStackSynthesizer, IBoundStackSynthesizer } from './types'; +import * as cxapi from '../../../cx-api'; import { DockerImageAssetLocation, DockerImageAssetSource, FileAssetLocation, FileAssetSource } from '../assets'; import { Stack } from '../stack'; import { Token } from '../token'; diff --git a/packages/aws-cdk-lib/core/lib/stack-synthesizers/legacy.ts b/packages/aws-cdk-lib/core/lib/stack-synthesizers/legacy.ts index 1717859f38e62..740695c966aab 100644 --- a/packages/aws-cdk-lib/core/lib/stack-synthesizers/legacy.ts +++ b/packages/aws-cdk-lib/core/lib/stack-synthesizers/legacy.ts @@ -1,9 +1,9 @@ -import * as cxschema from '../../../cloud-assembly-schema'; -import * as cxapi from '../../../cx-api'; import { Construct } from 'constructs'; import { assertBound } from './_shared'; import { StackSynthesizer } from './stack-synthesizer'; import { ISynthesisSession, IReusableStackSynthesizer, IBoundStackSynthesizer } from './types'; +import * as cxschema from '../../../cloud-assembly-schema'; +import * as cxapi from '../../../cx-api'; import { DockerImageAssetLocation, DockerImageAssetSource, FileAssetLocation, FileAssetSource } from '../assets'; import { Fn } from '../cfn-fn'; import { FileAssetParameters } from '../private/asset-parameters'; diff --git a/packages/aws-cdk-lib/core/lib/stack-synthesizers/stack-synthesizer.ts b/packages/aws-cdk-lib/core/lib/stack-synthesizers/stack-synthesizer.ts index 5306d98b4789e..444643eb04ff3 100644 --- a/packages/aws-cdk-lib/core/lib/stack-synthesizers/stack-synthesizer.ts +++ b/packages/aws-cdk-lib/core/lib/stack-synthesizers/stack-synthesizer.ts @@ -1,9 +1,9 @@ import * as fs from 'fs'; import * as path from 'path'; -import * as cxschema from '../../../cloud-assembly-schema'; -import * as cxapi from '../../../cx-api'; import { addStackArtifactToAssembly, contentHash, resolvedOr } from './_shared'; import { IStackSynthesizer, ISynthesisSession } from './types'; +import * as cxschema from '../../../cloud-assembly-schema'; +import * as cxapi from '../../../cx-api'; import { DockerImageAssetLocation, DockerImageAssetSource, FileAssetLocation, FileAssetSource, FileAssetPackaging } from '../assets'; import { Fn } from '../cfn-fn'; import { CfnParameter } from '../cfn-parameter'; diff --git a/packages/aws-cdk-lib/core/lib/stack.ts b/packages/aws-cdk-lib/core/lib/stack.ts index b6b153113e009..cb25807207a07 100644 --- a/packages/aws-cdk-lib/core/lib/stack.ts +++ b/packages/aws-cdk-lib/core/lib/stack.ts @@ -1,7 +1,5 @@ import * as fs from 'fs'; import * as path from 'path'; -import * as cxschema from '../../cloud-assembly-schema'; -import * as cxapi from '../../cx-api'; import { IConstruct, Construct, Node } from 'constructs'; import * as minimatch from 'minimatch'; import { Annotations } from './annotations'; @@ -21,6 +19,8 @@ import { CLOUDFORMATION_TOKEN_RESOLVER, CloudFormationLang } from './private/clo import { LogicalIDs } from './private/logical-id'; import { resolve } from './private/resolve'; import { makeUniqueId } from './private/uniqueid'; +import * as cxschema from '../../cloud-assembly-schema'; +import * as cxapi from '../../cx-api'; const STACK_SYMBOL = Symbol.for('@aws-cdk/core.Stack'); const MY_STACK_CACHE = Symbol.for('@aws-cdk/core.Stack.myStack'); diff --git a/packages/aws-cdk-lib/core/lib/stage.ts b/packages/aws-cdk-lib/core/lib/stage.ts index 495af9712eaec..def57f2a32f8d 100644 --- a/packages/aws-cdk-lib/core/lib/stage.ts +++ b/packages/aws-cdk-lib/core/lib/stage.ts @@ -1,9 +1,9 @@ -import * as cxapi from '../../cx-api'; import { IConstruct, Construct, Node } from 'constructs'; import { Environment } from './environment'; import { PermissionsBoundary } from './permissions-boundary'; import { synthesize } from './private/synthesis'; import { IPolicyValidationPluginBeta1 } from './validation'; +import * as cxapi from '../../cx-api'; const STAGE_SYMBOL = Symbol.for('@aws-cdk/core.Stage'); diff --git a/packages/aws-cdk-lib/core/test/app.test.ts b/packages/aws-cdk-lib/core/test/app.test.ts index 57cc29d379e14..b647c08c67d99 100644 --- a/packages/aws-cdk-lib/core/test/app.test.ts +++ b/packages/aws-cdk-lib/core/test/app.test.ts @@ -1,9 +1,9 @@ import * as os from 'os'; import * as path from 'path'; -import { ContextProvider } from '../../cloud-assembly-schema'; -import * as cxapi from '../../cx-api'; import { Construct } from 'constructs'; import * as fs from 'fs-extra'; +import { ContextProvider } from '../../cloud-assembly-schema'; +import * as cxapi from '../../cx-api'; import { CfnResource, DefaultStackSynthesizer, Stack, StackProps } from '../lib'; import { Annotations } from '../lib/annotations'; import { App, AppProps } from '../lib/app'; diff --git a/packages/aws-cdk-lib/core/test/aspect.test.ts b/packages/aws-cdk-lib/core/test/aspect.test.ts index b39f762912c2e..bc716e5843ac1 100644 --- a/packages/aws-cdk-lib/core/test/aspect.test.ts +++ b/packages/aws-cdk-lib/core/test/aspect.test.ts @@ -1,5 +1,5 @@ -import * as cxschema from '../../cloud-assembly-schema'; import { Construct, IConstruct } from 'constructs'; +import * as cxschema from '../../cloud-assembly-schema'; import { App } from '../lib'; import { IAspect, Aspects } from '../lib/aspect'; diff --git a/packages/aws-cdk-lib/core/test/assets.test.ts b/packages/aws-cdk-lib/core/test/assets.test.ts index 0eff5b096a855..10b51a66dbdda 100644 --- a/packages/aws-cdk-lib/core/test/assets.test.ts +++ b/packages/aws-cdk-lib/core/test/assets.test.ts @@ -1,6 +1,6 @@ +import { toCloudFormation } from './util'; import * as cxschema from '../../cloud-assembly-schema'; import * as cxapi from '../../cx-api'; -import { toCloudFormation } from './util'; import { App, FileAssetPackaging, Stack } from '../lib'; describe('assets', () => { diff --git a/packages/aws-cdk-lib/core/test/cfn-resource.test.ts b/packages/aws-cdk-lib/core/test/cfn-resource.test.ts index d4dd2227b79ad..7d6d08787c6fe 100644 --- a/packages/aws-cdk-lib/core/test/cfn-resource.test.ts +++ b/packages/aws-cdk-lib/core/test/cfn-resource.test.ts @@ -1,7 +1,7 @@ -import * as cxschema from '../../cloud-assembly-schema'; -import { VALIDATE_SNAPSHOT_REMOVAL_POLICY } from '../../cx-api'; import { Construct } from 'constructs'; import { getWarnings } from './util'; +import * as cxschema from '../../cloud-assembly-schema'; +import { VALIDATE_SNAPSHOT_REMOVAL_POLICY } from '../../cx-api'; import * as core from '../lib'; import { Names } from '../lib'; diff --git a/packages/aws-cdk-lib/core/test/construct.test.ts b/packages/aws-cdk-lib/core/test/construct.test.ts index 4356cfad8dd3d..2dd6c299fe2ec 100644 --- a/packages/aws-cdk-lib/core/test/construct.test.ts +++ b/packages/aws-cdk-lib/core/test/construct.test.ts @@ -1,7 +1,7 @@ import { testDeprecated } from '@aws-cdk/cdk-build-tools'; -import * as cxschema from '../../cloud-assembly-schema'; import { Construct, ConstructOrder, IConstruct } from 'constructs'; import { reEnableStackTraceCollection, restoreStackTraceColection } from './util'; +import * as cxschema from '../../cloud-assembly-schema'; import { Names } from '../lib'; import { Annotations } from '../lib/annotations'; diff --git a/packages/aws-cdk-lib/core/test/context.test.ts b/packages/aws-cdk-lib/core/test/context.test.ts index 803396346436f..e7d8c638ed5de 100644 --- a/packages/aws-cdk-lib/core/test/context.test.ts +++ b/packages/aws-cdk-lib/core/test/context.test.ts @@ -1,5 +1,5 @@ -import * as cxapi from '../../cx-api'; import { Construct } from 'constructs'; +import * as cxapi from '../../cx-api'; import { App, Stack } from '../lib'; import { ContextProvider } from '../lib/context-provider'; import { synthesize } from '../lib/private/synthesis'; diff --git a/packages/aws-cdk-lib/core/test/custom-resource-provider/custom-resource-provider.test.ts b/packages/aws-cdk-lib/core/test/custom-resource-provider/custom-resource-provider.test.ts index b8946dd3e1be2..5ad7d5530ab91 100644 --- a/packages/aws-cdk-lib/core/test/custom-resource-provider/custom-resource-provider.test.ts +++ b/packages/aws-cdk-lib/core/test/custom-resource-provider/custom-resource-provider.test.ts @@ -461,7 +461,7 @@ describe('custom resource provider', () => { describe('builtInCustomResourceProviderNodeRuntime', () => { test('returns node16 for commercial region', () => { const app = new App(); - const stack = new Stack(app, 'MyStack', { env: { region: 'us-east-1' }}); + const stack = new Stack(app, 'MyStack', { env: { region: 'us-east-1' } }); const rt = builtInCustomResourceProviderNodeRuntime(stack); expect(rt).toEqual(CustomResourceProviderRuntime.NODEJS_16_X); @@ -469,7 +469,7 @@ describe('custom resource provider', () => { test('returns node14 for iso region', () => { const app = new App(); - const stack = new Stack(app, 'MyStack', { env: { region: 'us-iso-east-1' }}); + const stack = new Stack(app, 'MyStack', { env: { region: 'us-iso-east-1' } }); const rt = builtInCustomResourceProviderNodeRuntime(stack); expect(rt).toEqual(CustomResourceProviderRuntime.NODEJS_14_X); diff --git a/packages/aws-cdk-lib/core/test/logical-id.test.ts b/packages/aws-cdk-lib/core/test/logical-id.test.ts index a2ade3ae2a58c..2edc32d6120c4 100644 --- a/packages/aws-cdk-lib/core/test/logical-id.test.ts +++ b/packages/aws-cdk-lib/core/test/logical-id.test.ts @@ -1,6 +1,6 @@ -import * as cxapi from '../../cx-api'; import { Construct } from 'constructs'; import { toCloudFormation } from './util'; +import * as cxapi from '../../cx-api'; import { App, CfnElement, CfnResource, Stack } from '../lib'; /** diff --git a/packages/aws-cdk-lib/core/test/mappings.test.ts b/packages/aws-cdk-lib/core/test/mappings.test.ts index 9a630abd209a9..5f6ae172e1f97 100644 --- a/packages/aws-cdk-lib/core/test/mappings.test.ts +++ b/packages/aws-cdk-lib/core/test/mappings.test.ts @@ -1,6 +1,6 @@ +import { toCloudFormation } from './util'; import { ArtifactMetadataEntryType } from '../../cloud-assembly-schema'; import { CloudAssembly } from '../../cx-api'; -import { toCloudFormation } from './util'; import { App, Aws, CfnMapping, CfnResource, CfnOutput, Fn, Stack } from '../lib'; describe('mappings', () => { diff --git a/packages/aws-cdk-lib/core/test/resource.test.ts b/packages/aws-cdk-lib/core/test/resource.test.ts index a57294fa9a425..5212314043f7d 100644 --- a/packages/aws-cdk-lib/core/test/resource.test.ts +++ b/packages/aws-cdk-lib/core/test/resource.test.ts @@ -1,6 +1,6 @@ -import * as cxapi from '../../cx-api'; import { Construct } from 'constructs'; import { toCloudFormation } from './util'; +import * as cxapi from '../../cx-api'; import { App, App as Root, CfnCondition, CfnDeletionPolicy, CfnResource, diff --git a/packages/aws-cdk-lib/core/test/stage.test.ts b/packages/aws-cdk-lib/core/test/stage.test.ts index 80b471140a6d3..24c298dddec46 100644 --- a/packages/aws-cdk-lib/core/test/stage.test.ts +++ b/packages/aws-cdk-lib/core/test/stage.test.ts @@ -1,6 +1,6 @@ +import { Construct, IConstruct } from 'constructs'; import * as cxschema from '../../cloud-assembly-schema'; import * as cxapi from '../../cx-api'; -import { Construct, IConstruct } from 'constructs'; import { App, CfnResource, IAspect, Stack, Stage, Aspects } from '../lib'; describe('stage', () => { diff --git a/packages/aws-cdk-lib/core/test/synthesis.test.ts b/packages/aws-cdk-lib/core/test/synthesis.test.ts index 4bd9ec3185eaa..4e61b05f0a9cc 100644 --- a/packages/aws-cdk-lib/core/test/synthesis.test.ts +++ b/packages/aws-cdk-lib/core/test/synthesis.test.ts @@ -2,9 +2,9 @@ import * as fs from 'fs'; import * as os from 'os'; import * as path from 'path'; import { testDeprecated } from '@aws-cdk/cdk-build-tools'; +import { Construct } from 'constructs'; import * as cxschema from '../../cloud-assembly-schema'; import * as cxapi from '../../cx-api'; -import { Construct } from 'constructs'; import * as cdk from '../lib'; import { synthesize } from '../lib/private/synthesis'; diff --git a/packages/aws-cdk-lib/custom-resources/lib/aws-custom-resource/aws-custom-resource.ts b/packages/aws-cdk-lib/custom-resources/lib/aws-custom-resource/aws-custom-resource.ts index cea4d66e1afd3..6f3b05ceed747 100644 --- a/packages/aws-cdk-lib/custom-resources/lib/aws-custom-resource/aws-custom-resource.ts +++ b/packages/aws-cdk-lib/custom-resources/lib/aws-custom-resource/aws-custom-resource.ts @@ -1,5 +1,7 @@ import * as fs from 'fs'; import * as path from 'path'; +import { Construct } from 'constructs'; +import { PHYSICAL_RESOURCE_ID_REFERENCE } from './runtime'; import * as ec2 from '../../../aws-ec2'; import * as iam from '../../../aws-iam'; import * as lambda from '../../../aws-lambda'; @@ -7,8 +9,6 @@ import * as logs from '../../../aws-logs'; import * as cdk from '../../../core'; import { Annotations } from '../../../core'; import * as cxapi from '../../../cx-api'; -import { Construct } from 'constructs'; -import { PHYSICAL_RESOURCE_ID_REFERENCE } from './runtime'; import { FactName } from '../../../region-info'; diff --git a/packages/aws-cdk-lib/custom-resources/lib/provider-framework/provider.ts b/packages/aws-cdk-lib/custom-resources/lib/provider-framework/provider.ts index 15a542d45f49f..7f3bf0f83c839 100644 --- a/packages/aws-cdk-lib/custom-resources/lib/provider-framework/provider.ts +++ b/packages/aws-cdk-lib/custom-resources/lib/provider-framework/provider.ts @@ -1,14 +1,14 @@ import * as path from 'path'; +import { Construct } from 'constructs'; +import * as consts from './runtime/consts'; +import { calculateRetryPolicy } from './util'; +import { WaiterStateMachine } from './waiter-state-machine'; import { CustomResourceProviderConfig, ICustomResourceProvider } from '../../../aws-cloudformation'; import * as ec2 from '../../../aws-ec2'; import * as iam from '../../../aws-iam'; import * as lambda from '../../../aws-lambda'; import * as logs from '../../../aws-logs'; import { Duration } from '../../../core'; -import { Construct } from 'constructs'; -import * as consts from './runtime/consts'; -import { calculateRetryPolicy } from './util'; -import { WaiterStateMachine } from './waiter-state-machine'; const RUNTIME_HANDLER_PATH = path.join(__dirname, 'runtime'); const FRAMEWORK_HANDLER_TIMEOUT = Duration.minutes(15); // keep it simple for now diff --git a/packages/aws-cdk-lib/custom-resources/lib/provider-framework/waiter-state-machine.ts b/packages/aws-cdk-lib/custom-resources/lib/provider-framework/waiter-state-machine.ts index da28ec6740d3e..7f9f4ab728a6e 100644 --- a/packages/aws-cdk-lib/custom-resources/lib/provider-framework/waiter-state-machine.ts +++ b/packages/aws-cdk-lib/custom-resources/lib/provider-framework/waiter-state-machine.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import { Grant, IGrantable, Role, ServicePrincipal } from '../../../aws-iam'; import { IFunction } from '../../../aws-lambda'; import { CfnResource, Duration, Stack } from '../../../core'; -import { Construct } from 'constructs'; export interface WaiterStateMachineProps { /** diff --git a/packages/aws-cdk-lib/custom-resources/test/aws-custom-resource/aws-custom-resource.test.ts b/packages/aws-cdk-lib/custom-resources/test/aws-custom-resource/aws-custom-resource.test.ts index ccaa96f21f392..50e015deddec5 100644 --- a/packages/aws-cdk-lib/custom-resources/test/aws-custom-resource/aws-custom-resource.test.ts +++ b/packages/aws-cdk-lib/custom-resources/test/aws-custom-resource/aws-custom-resource.test.ts @@ -1284,7 +1284,7 @@ test('can specify removal policy', () => { describe('builtInCustomResourceNodeRuntime', () => { test('returns node16 for commercial region', () => { const app = new App(); - const stack = new Stack(app, 'MyStack', { env: { region: 'us-east-1' }}); + const stack = new Stack(app, 'MyStack', { env: { region: 'us-east-1' } }); const rt = builtInCustomResourceNodeRuntime(stack); expect(rt).toEqual(lambda.Runtime.NODEJS_16_X); @@ -1292,7 +1292,7 @@ describe('builtInCustomResourceNodeRuntime', () => { test('returns node14 for iso region', () => { const app = new App(); - const stack = new Stack(app, 'MyStack', { env: { region: 'us-iso-east-1' }}); + const stack = new Stack(app, 'MyStack', { env: { region: 'us-iso-east-1' } }); const rt = builtInCustomResourceNodeRuntime(stack); expect(rt).toEqual(lambda.Runtime.NODEJS_14_X); diff --git a/packages/aws-cdk-lib/custom-resources/test/provider-framework/integration-test-fixtures/s3-assert.ts b/packages/aws-cdk-lib/custom-resources/test/provider-framework/integration-test-fixtures/s3-assert.ts index 9cca6d2c436ab..7982d88a7b6ef 100644 --- a/packages/aws-cdk-lib/custom-resources/test/provider-framework/integration-test-fixtures/s3-assert.ts +++ b/packages/aws-cdk-lib/custom-resources/test/provider-framework/integration-test-fixtures/s3-assert.ts @@ -1,9 +1,9 @@ import * as path from 'path'; +import { Construct, Node } from 'constructs'; import * as iam from '../../../../aws-iam'; import * as lambda from '../../../../aws-lambda'; import * as s3 from '../../../../aws-s3'; import { CustomResource, Duration, Stack } from '../../../../core'; -import { Construct, Node } from 'constructs'; import * as cr from '../../../lib'; export interface S3AssertProps { diff --git a/packages/aws-cdk-lib/custom-resources/test/provider-framework/integration-test-fixtures/s3-file.ts b/packages/aws-cdk-lib/custom-resources/test/provider-framework/integration-test-fixtures/s3-file.ts index 9f8baedcdacd2..62c6a3d85ae74 100644 --- a/packages/aws-cdk-lib/custom-resources/test/provider-framework/integration-test-fixtures/s3-file.ts +++ b/packages/aws-cdk-lib/custom-resources/test/provider-framework/integration-test-fixtures/s3-file.ts @@ -1,10 +1,10 @@ import * as path from 'path'; +import { Construct, Node } from 'constructs'; +import * as api from './s3-file-handler/api'; import * as iam from '../../../../aws-iam'; import * as lambda from '../../../../aws-lambda'; import * as s3 from '../../../../aws-s3'; import { CustomResource, Stack } from '../../../../core'; -import { Construct, Node } from 'constructs'; -import * as api from './s3-file-handler/api'; import * as cr from '../../../lib'; interface S3FileProps { diff --git a/packages/aws-cdk-lib/custom-resources/test/provider-framework/waiter-state-machine.test.ts b/packages/aws-cdk-lib/custom-resources/test/provider-framework/waiter-state-machine.test.ts index 2f010529b5021..94d25cfd8323c 100644 --- a/packages/aws-cdk-lib/custom-resources/test/provider-framework/waiter-state-machine.test.ts +++ b/packages/aws-cdk-lib/custom-resources/test/provider-framework/waiter-state-machine.test.ts @@ -1,7 +1,7 @@ +import { Node } from 'constructs'; import { Template } from '../../../assertions'; import { Code, Function as lambdaFn, Runtime } from '../../../aws-lambda'; import { Duration, Stack } from '../../../core'; -import { Node } from 'constructs'; import { WaiterStateMachine } from '../../lib/provider-framework/waiter-state-machine'; describe('state machine', () => { diff --git a/packages/aws-cdk-lib/cx-api/lib/cloud-artifact-aug.ts b/packages/aws-cdk-lib/cx-api/lib/cloud-artifact-aug.ts index 02b3106ba64b0..6c2aa1c90b95e 100644 --- a/packages/aws-cdk-lib/cx-api/lib/cloud-artifact-aug.ts +++ b/packages/aws-cdk-lib/cx-api/lib/cloud-artifact-aug.ts @@ -1,10 +1,10 @@ -import * as cxschema from '../../cloud-assembly-schema'; import { AssetManifestArtifact } from './artifacts/asset-manifest-artifact'; import { CloudFormationStackArtifact } from './artifacts/cloudformation-artifact'; import { NestedCloudAssemblyArtifact } from './artifacts/nested-cloud-assembly-artifact'; import { TreeCloudArtifact } from './artifacts/tree-cloud-artifact'; import { CloudArtifact } from './cloud-artifact'; import { CloudAssembly } from './cloud-assembly'; +import * as cxschema from '../../cloud-assembly-schema'; /** * Add the 'fromManifest' factory function diff --git a/packages/aws-cdk-lib/cx-api/lib/cloud-artifact.ts b/packages/aws-cdk-lib/cx-api/lib/cloud-artifact.ts index c7b16ee421a8b..01fefe31934fc 100644 --- a/packages/aws-cdk-lib/cx-api/lib/cloud-artifact.ts +++ b/packages/aws-cdk-lib/cx-api/lib/cloud-artifact.ts @@ -1,6 +1,6 @@ -import * as cxschema from '../../cloud-assembly-schema'; import type { CloudAssembly } from './cloud-assembly'; import { MetadataEntryResult, SynthesisMessage, SynthesisMessageLevel } from './metadata'; +import * as cxschema from '../../cloud-assembly-schema'; /** * Artifact properties for CloudFormation stacks. diff --git a/packages/aws-cdk-lib/cx-api/lib/cloud-assembly.ts b/packages/aws-cdk-lib/cx-api/lib/cloud-assembly.ts index 61fc3cae92b77..a55b6a368d345 100644 --- a/packages/aws-cdk-lib/cx-api/lib/cloud-assembly.ts +++ b/packages/aws-cdk-lib/cx-api/lib/cloud-assembly.ts @@ -1,13 +1,13 @@ import * as fs from 'fs'; import * as os from 'os'; import * as path from 'path'; -import * as cxschema from '../../cloud-assembly-schema'; -import { LoadManifestOptions } from '../../cloud-assembly-schema'; import { CloudFormationStackArtifact } from './artifacts/cloudformation-artifact'; import { NestedCloudAssemblyArtifact } from './artifacts/nested-cloud-assembly-artifact'; import { TreeCloudArtifact } from './artifacts/tree-cloud-artifact'; import { CloudArtifact } from './cloud-artifact'; import { topologicalSort } from './toposort'; +import { LoadManifestOptions } from '../../cloud-assembly-schema'; +import * as cxschema from '../../cloud-assembly-schema'; /** * The name of the root manifest file of the assembly. diff --git a/packages/aws-cdk-lib/cx-api/lib/features.ts b/packages/aws-cdk-lib/cx-api/lib/features.ts index cef182cdf1581..01addbbded55c 100644 --- a/packages/aws-cdk-lib/cx-api/lib/features.ts +++ b/packages/aws-cdk-lib/cx-api/lib/features.ts @@ -501,6 +501,7 @@ export const FLAGS: Record = { [ENABLE_PARTITION_LITERALS]: { type: FlagType.BugFix, summary: 'Make ARNs concrete if AWS partition is known', + // eslint-disable-next-line @aws-cdk/no-literal-partition detailsMd: ` Enable this feature flag to get partition names as string literals in Stacks with known regions defined in their environment, such as "aws" or "aws-cn". Previously the CloudFormation intrinsic function @@ -772,7 +773,7 @@ export const FLAGS: Record = { To allow all ingress/egress traffic to the VPC default security group you can set the \`restrictDefaultSecurityGroup: false\`. `, - }, + }, ////////////////////////////////////////////////////////////////////// [APIGATEWAY_REQUEST_VALIDATOR_UNIQUE_ID]: { diff --git a/packages/aws-cdk-lib/cx-api/test/stack-artifact.test.ts b/packages/aws-cdk-lib/cx-api/test/stack-artifact.test.ts index 4dd5ddecddfe5..900367f4b0dda 100644 --- a/packages/aws-cdk-lib/cx-api/test/stack-artifact.test.ts +++ b/packages/aws-cdk-lib/cx-api/test/stack-artifact.test.ts @@ -1,7 +1,7 @@ import * as fs from 'fs'; import * as path from 'path'; -import * as cxschema from '../../cloud-assembly-schema'; import { rimraf } from './util'; +import * as cxschema from '../../cloud-assembly-schema'; import * as cxapi from '../lib'; const stackBase = { diff --git a/packages/aws-cdk-lib/index.ts b/packages/aws-cdk-lib/index.ts index f5783728d116a..22afff6c889fa 100644 --- a/packages/aws-cdk-lib/index.ts +++ b/packages/aws-cdk-lib/index.ts @@ -249,4 +249,6 @@ export * as lambda_layer_kubectl from './lambda-layer-kubectl'; export * as lambda_layer_node_proxy_agent from './lambda-layer-node-proxy-agent'; export * as pipelines from './pipelines'; export * as region_info from './region-info'; -export * as triggers from './triggers'; \ No newline at end of file +export * as triggers from './triggers'; +export * as aws_backupgateway from './aws-backupgateway'; +export * as aws_proton from './aws-proton'; \ No newline at end of file diff --git a/packages/aws-cdk-lib/lambda-layer-awscli/lib/awscli-layer.ts b/packages/aws-cdk-lib/lambda-layer-awscli/lib/awscli-layer.ts index 0da0d29c0edfd..bfaa432bb6e66 100644 --- a/packages/aws-cdk-lib/lambda-layer-awscli/lib/awscli-layer.ts +++ b/packages/aws-cdk-lib/lambda-layer-awscli/lib/awscli-layer.ts @@ -1,7 +1,7 @@ import { ASSET_FILE, LAYER_SOURCE_DIR } from '@aws-cdk/asset-awscli-v1'; +import { Construct } from 'constructs'; import * as lambda from '../../aws-lambda'; import { FileSystem } from '../../core'; -import { Construct } from 'constructs'; /** * An AWS Lambda layer that includes the AWS CLI. diff --git a/packages/aws-cdk-lib/lambda-layer-kubectl/lib/kubectl-layer.ts b/packages/aws-cdk-lib/lambda-layer-kubectl/lib/kubectl-layer.ts index cdf62af42d9c2..7e302d414539d 100644 --- a/packages/aws-cdk-lib/lambda-layer-kubectl/lib/kubectl-layer.ts +++ b/packages/aws-cdk-lib/lambda-layer-kubectl/lib/kubectl-layer.ts @@ -1,7 +1,7 @@ import { ASSET_FILE, LAYER_SOURCE_DIR } from '@aws-cdk/asset-kubectl-v20'; +import { Construct } from 'constructs'; import * as lambda from '../../aws-lambda'; import { FileSystem } from '../../core'; -import { Construct } from 'constructs'; /** * An AWS Lambda layer that includes `kubectl` and `helm`. diff --git a/packages/aws-cdk-lib/lambda-layer-node-proxy-agent/lib/node-proxy-agent-layer.ts b/packages/aws-cdk-lib/lambda-layer-node-proxy-agent/lib/node-proxy-agent-layer.ts index bc7b31709f644..1fc5f31340dc3 100644 --- a/packages/aws-cdk-lib/lambda-layer-node-proxy-agent/lib/node-proxy-agent-layer.ts +++ b/packages/aws-cdk-lib/lambda-layer-node-proxy-agent/lib/node-proxy-agent-layer.ts @@ -1,7 +1,7 @@ import { ASSET_FILE, LAYER_SOURCE_DIR } from '@aws-cdk/asset-node-proxy-agent-v5'; +import { Construct } from 'constructs'; import * as lambda from '../../aws-lambda'; import { FileSystem } from '../../core'; -import { Construct } from 'constructs'; /** * An AWS Lambda layer that includes the NPM dependency `proxy-agent`. diff --git a/packages/aws-cdk-lib/package.json b/packages/aws-cdk-lib/package.json index 07e678849ad3b..ab56ab46f6640 100644 --- a/packages/aws-cdk-lib/package.json +++ b/packages/aws-cdk-lib/package.json @@ -29,9 +29,6 @@ "on-bump": "ts-node -P tsconfig.dev.json ./cx-api/build-tools/update-vnext.ts && ts-node -P tsconfig.dev.json ./cx-api/build-tools/flag-report" }, "cdk-build": { - "eslint": { - "disable": true - }, "stripDeprecated": true, "compressAssembly": true, "post": [ @@ -122,8 +119,8 @@ "yaml" ], "dependencies": { - "@aws-cdk/asset-awscli-v1": "^2.2.165", - "@aws-cdk/asset-node-proxy-agent-v5": "^2.0.139", + "@aws-cdk/asset-awscli-v1": "^2.2.168", + "@aws-cdk/asset-node-proxy-agent-v5": "^2.0.141", "@aws-cdk/asset-kubectl-v20": "^2.1.1", "@balena/dockerignore": "^1.0.2", "case": "1.6.3", @@ -138,18 +135,30 @@ }, "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/cfn2ts": "0.0.0", + "@aws-cdk/cfnspec": "0.0.0", "@aws-cdk/pkglint": "0.0.0", + "@types/aws-lambda": "^8.10.115", + "@types/jest": "^29.5.1", + "@types/lodash": "^4.14.194", + "@types/punycode": "^2.1.0", + "aws-sdk": "^2.1373.0", + "aws-sdk-mock": "5.6.0", + "cdk8s": "^2.7.56", "constructs": "^10.0.0", + "delay": "5.0.0", "esbuild": "^0.17.18", + "fast-check": "^2.25.0", "fs-extra": "^11.1.1", + "jest": "^29.5.0", + "jest-each": "^29.5.0", + "lambda-tester": "^4.0.1", + "lodash": "^4.17.15", + "nock": "^13.3.1", + "ts-mock-imports": "^1.3.8", "ts-node": "^10.9.1", + "sinon": "^9.2.4", "typescript": "~5.0.4", - "@aws-cdk/cfn2ts": "0.0.0", - "lambda-tester": "^4.0.1", - "@types/aws-lambda": "^8.10.115", - "@types/jest": "^29.5.1", - "@types/lodash": "^4.14.194", - "@types/punycode": "^2.1.0", "typescript-json-schema": "^0.56.0" }, "peerDependencies": { @@ -442,7 +451,9 @@ "./aws-kinesisfirehose/lib/kinesisfirehose-canned-metrics.generated": "./aws-kinesisfirehose/lib/kinesisfirehose-canned-metrics.generated.js", "./aws-synthetics/lib/synthetics-canned-metrics.generated": "./aws-synthetics/lib/synthetics-canned-metrics.generated.js", "./aws-gamelift/lib/gamelift-canned-metrics.generated": "./aws-gamelift/lib/gamelift-canned-metrics.generated.js", - "./core": "./core/index.js" + "./core": "./core/index.js", + "./aws-backupgateway": "./aws-backupgateway/index.js", + "./aws-proton": "./aws-proton/index.js" }, "preferredCdkCliVersion": "2", "publishConfig": { diff --git a/packages/aws-cdk-lib/pipelines/lib/blueprint/shell-step.ts b/packages/aws-cdk-lib/pipelines/lib/blueprint/shell-step.ts index 9ed7ee022c69c..ee3e23bd3a149 100644 --- a/packages/aws-cdk-lib/pipelines/lib/blueprint/shell-step.ts +++ b/packages/aws-cdk-lib/pipelines/lib/blueprint/shell-step.ts @@ -1,7 +1,7 @@ -import { CfnOutput, Stack } from '../../../core'; import { FileSet, IFileSetProducer } from './file-set'; import { StackDeployment } from './stack-deployment'; import { Step } from './step'; +import { CfnOutput, Stack } from '../../../core'; import { mapValues } from '../private/javascript'; /** diff --git a/packages/aws-cdk-lib/pipelines/lib/blueprint/stack-deployment.ts b/packages/aws-cdk-lib/pipelines/lib/blueprint/stack-deployment.ts index aa4f7e6c25ffa..5732ec0724fd3 100644 --- a/packages/aws-cdk-lib/pipelines/lib/blueprint/stack-deployment.ts +++ b/packages/aws-cdk-lib/pipelines/lib/blueprint/stack-deployment.ts @@ -1,7 +1,7 @@ import * as path from 'path'; -import * as cxapi from '../../../cx-api'; import { AssetType } from './asset-type'; import { Step } from './step'; +import * as cxapi from '../../../cx-api'; import { AssetManifestReader, DockerImageManifestEntry, FileManifestEntry } from '../private/asset-manifest'; import { isAssetManifest } from '../private/cloud-assembly-internals'; diff --git a/packages/aws-cdk-lib/pipelines/lib/blueprint/stage-deployment.ts b/packages/aws-cdk-lib/pipelines/lib/blueprint/stage-deployment.ts index b2fedfcc0dd9f..813e7aacf9f12 100644 --- a/packages/aws-cdk-lib/pipelines/lib/blueprint/stage-deployment.ts +++ b/packages/aws-cdk-lib/pipelines/lib/blueprint/stage-deployment.ts @@ -1,7 +1,7 @@ -import * as cdk from '../../../core'; -import { CloudFormationStackArtifact } from '../../../cx-api'; import { StackDeployment } from './stack-deployment'; import { StackSteps, Step } from './step'; +import * as cdk from '../../../core'; +import { CloudFormationStackArtifact } from '../../../cx-api'; import { isStackArtifact } from '../private/cloud-assembly-internals'; import { pipelineSynth } from '../private/construct-internals'; diff --git a/packages/aws-cdk-lib/pipelines/lib/blueprint/step.ts b/packages/aws-cdk-lib/pipelines/lib/blueprint/step.ts index 3c61e7df5d309..86a6a5d8eca29 100644 --- a/packages/aws-cdk-lib/pipelines/lib/blueprint/step.ts +++ b/packages/aws-cdk-lib/pipelines/lib/blueprint/step.ts @@ -1,6 +1,6 @@ -import { Stack, Token } from '../../../core'; import { FileSet, IFileSetProducer } from './file-set'; import { StackOutputReference } from './shell-step'; +import { Stack, Token } from '../../../core'; import { StepOutput } from '../helpers-internal/step-output'; /** diff --git a/packages/aws-cdk-lib/pipelines/lib/blueprint/wave.ts b/packages/aws-cdk-lib/pipelines/lib/blueprint/wave.ts index 5234ae18c8aec..50a9527ead786 100644 --- a/packages/aws-cdk-lib/pipelines/lib/blueprint/wave.ts +++ b/packages/aws-cdk-lib/pipelines/lib/blueprint/wave.ts @@ -1,6 +1,6 @@ -import * as cdk from '../../../core'; import { StageDeployment } from './stage-deployment'; import { StackSteps, Step } from './step'; +import * as cdk from '../../../core'; /** * Construction properties for a `Wave` diff --git a/packages/aws-cdk-lib/pipelines/lib/codepipeline/codebuild-step.ts b/packages/aws-cdk-lib/pipelines/lib/codepipeline/codebuild-step.ts index fb1c9dbd48e82..de2135781fbe2 100644 --- a/packages/aws-cdk-lib/pipelines/lib/codepipeline/codebuild-step.ts +++ b/packages/aws-cdk-lib/pipelines/lib/codepipeline/codebuild-step.ts @@ -1,9 +1,9 @@ +import { mergeBuildSpecs } from './private/buildspecs'; +import { makeCodePipelineOutput } from './private/outputs'; import * as codebuild from '../../../aws-codebuild'; import * as ec2 from '../../../aws-ec2'; import * as iam from '../../../aws-iam'; import { Duration } from '../../../core'; -import { mergeBuildSpecs } from './private/buildspecs'; -import { makeCodePipelineOutput } from './private/outputs'; import { ShellStep, ShellStepProps } from '../blueprint'; /** diff --git a/packages/aws-cdk-lib/pipelines/lib/codepipeline/codepipeline-source.ts b/packages/aws-cdk-lib/pipelines/lib/codepipeline/codepipeline-source.ts index ca187fda5981e..659cb3d4d514f 100644 --- a/packages/aws-cdk-lib/pipelines/lib/codepipeline/codepipeline-source.ts +++ b/packages/aws-cdk-lib/pipelines/lib/codepipeline/codepipeline-source.ts @@ -1,3 +1,6 @@ +import { Node } from 'constructs'; +import { CodePipelineActionFactoryResult, ProduceActionOptions, ICodePipelineActionFactory } from './codepipeline-action-factory'; +import { makeCodePipelineOutput } from './private/outputs'; import * as codecommit from '../../../aws-codecommit'; import * as cp from '../../../aws-codepipeline'; import { Artifact } from '../../../aws-codepipeline'; @@ -7,9 +10,6 @@ import { IRepository } from '../../../aws-ecr'; import * as iam from '../../../aws-iam'; import { IBucket } from '../../../aws-s3'; import { Fn, SecretValue, Token } from '../../../core'; -import { Node } from 'constructs'; -import { CodePipelineActionFactoryResult, ProduceActionOptions, ICodePipelineActionFactory } from './codepipeline-action-factory'; -import { makeCodePipelineOutput } from './private/outputs'; import { FileSet, Step } from '../blueprint'; /** diff --git a/packages/aws-cdk-lib/pipelines/lib/codepipeline/codepipeline.ts b/packages/aws-cdk-lib/pipelines/lib/codepipeline/codepipeline.ts index 3971a0e108a4c..5c463ebfeb60e 100644 --- a/packages/aws-cdk-lib/pipelines/lib/codepipeline/codepipeline.ts +++ b/packages/aws-cdk-lib/pipelines/lib/codepipeline/codepipeline.ts @@ -1,5 +1,12 @@ import * as fs from 'fs'; import * as path from 'path'; +import { Construct } from 'constructs'; +import { ArtifactMap } from './artifact-map'; +import { CodeBuildStep } from './codebuild-step'; +import { CodePipelineActionFactoryResult, ICodePipelineActionFactory } from './codepipeline-action-factory'; +import { CodeBuildFactory, mergeCodeBuildOptions } from './private/codebuild-factory'; +import { namespaceStepOutputs } from './private/outputs'; +import { StackOutputsMap } from './stack-outputs-map'; import * as cb from '../../../aws-codebuild'; import * as cp from '../../../aws-codepipeline'; import * as cpa from '../../../aws-codepipeline-actions'; @@ -8,13 +15,6 @@ import * as iam from '../../../aws-iam'; import * as s3 from '../../../aws-s3'; import { Aws, CfnCapabilities, Duration, PhysicalName, Stack, Names } from '../../../core'; import * as cxapi from '../../../cx-api'; -import { Construct } from 'constructs'; -import { ArtifactMap } from './artifact-map'; -import { CodeBuildStep } from './codebuild-step'; -import { CodePipelineActionFactoryResult, ICodePipelineActionFactory } from './codepipeline-action-factory'; -import { CodeBuildFactory, mergeCodeBuildOptions } from './private/codebuild-factory'; -import { namespaceStepOutputs } from './private/outputs'; -import { StackOutputsMap } from './stack-outputs-map'; import { AssetType, FileSet, IFileSetProducer, ManualApprovalStep, ShellStep, StackAsset, StackDeployment, Step } from '../blueprint'; import { DockerCredential, dockerCredentialsInstallCommands, DockerCredentialUsage } from '../docker-credentials'; import { GraphNodeCollection, isGraph, AGraphNode, PipelineGraph } from '../helpers-internal'; diff --git a/packages/aws-cdk-lib/pipelines/lib/codepipeline/confirm-permissions-broadening.ts b/packages/aws-cdk-lib/pipelines/lib/codepipeline/confirm-permissions-broadening.ts index 7811cf8854f55..a90d8fd385528 100644 --- a/packages/aws-cdk-lib/pipelines/lib/codepipeline/confirm-permissions-broadening.ts +++ b/packages/aws-cdk-lib/pipelines/lib/codepipeline/confirm-permissions-broadening.ts @@ -1,10 +1,10 @@ +import { Node } from 'constructs'; +import { CodePipeline } from './codepipeline'; +import { CodePipelineActionFactoryResult, ICodePipelineActionFactory, ProduceActionOptions } from './codepipeline-action-factory'; import { IStage } from '../../../aws-codepipeline'; import * as cpa from '../../../aws-codepipeline-actions'; import * as sns from '../../../aws-sns'; import { Stage } from '../../../core'; -import { Node } from 'constructs'; -import { CodePipeline } from './codepipeline'; -import { CodePipelineActionFactoryResult, ICodePipelineActionFactory, ProduceActionOptions } from './codepipeline-action-factory'; import { Step } from '../blueprint'; import { ApplicationSecurityCheck } from '../private/application-security-check'; diff --git a/packages/aws-cdk-lib/pipelines/lib/legacy/actions/deploy-cdk-stack-action.ts b/packages/aws-cdk-lib/pipelines/lib/legacy/actions/deploy-cdk-stack-action.ts index 8602cf078d41e..3de0c99c3de23 100644 --- a/packages/aws-cdk-lib/pipelines/lib/legacy/actions/deploy-cdk-stack-action.ts +++ b/packages/aws-cdk-lib/pipelines/lib/legacy/actions/deploy-cdk-stack-action.ts @@ -1,12 +1,12 @@ import * as fs from 'fs'; import * as path from 'path'; +import { Construct, Node } from 'constructs'; import * as codepipeline from '../../../../aws-codepipeline'; import * as cpactions from '../../../../aws-codepipeline-actions'; import * as events from '../../../../aws-events'; import * as iam from '../../../../aws-iam'; import { Aws, CfnCapabilities, Stack } from '../../../../core'; import * as cxapi from '../../../../cx-api'; -import { Construct, Node } from 'constructs'; import { appOf, assemblyBuilderOf } from '../../private/construct-internals'; import { toPosixPath } from '../../private/fs'; diff --git a/packages/aws-cdk-lib/pipelines/lib/legacy/actions/publish-assets-action.ts b/packages/aws-cdk-lib/pipelines/lib/legacy/actions/publish-assets-action.ts index bb7f53dce2f54..52b1c36c7a153 100644 --- a/packages/aws-cdk-lib/pipelines/lib/legacy/actions/publish-assets-action.ts +++ b/packages/aws-cdk-lib/pipelines/lib/legacy/actions/publish-assets-action.ts @@ -1,5 +1,6 @@ import * as fs from 'fs'; import * as path from 'path'; +import { IDependable, Construct } from 'constructs'; import * as codebuild from '../../../../aws-codebuild'; import * as codepipeline from '../../../../aws-codepipeline'; import * as codepipeline_actions from '../../../../aws-codepipeline-actions'; @@ -7,7 +8,6 @@ import * as ec2 from '../../../../aws-ec2'; import * as events from '../../../../aws-events'; import * as iam from '../../../../aws-iam'; import { ISynthesisSession, Lazy, Stack, attachCustomSynthesis } from '../../../../core'; -import { IDependable, Construct } from 'constructs'; import { AssetType } from '../../blueprint/asset-type'; import { CDKP_DEFAULT_CODEBUILD_IMAGE } from '../../private/default-codebuild-image'; import { toPosixPath } from '../../private/fs'; diff --git a/packages/aws-cdk-lib/pipelines/lib/legacy/actions/update-pipeline-action.ts b/packages/aws-cdk-lib/pipelines/lib/legacy/actions/update-pipeline-action.ts index 76e01645dc1ef..0da0d2936d991 100644 --- a/packages/aws-cdk-lib/pipelines/lib/legacy/actions/update-pipeline-action.ts +++ b/packages/aws-cdk-lib/pipelines/lib/legacy/actions/update-pipeline-action.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; import * as codebuild from '../../../../aws-codebuild'; import * as codepipeline from '../../../../aws-codepipeline'; import * as cpactions from '../../../../aws-codepipeline-actions'; import * as events from '../../../../aws-events'; import * as iam from '../../../../aws-iam'; import { Stack } from '../../../../core'; -import { Construct } from 'constructs'; import { dockerCredentialsInstallCommands, DockerCredential, DockerCredentialUsage } from '../../docker-credentials'; import { embeddedAsmPath } from '../../private/construct-internals'; import { CDKP_DEFAULT_CODEBUILD_IMAGE } from '../../private/default-codebuild-image'; diff --git a/packages/aws-cdk-lib/pipelines/lib/legacy/pipeline.ts b/packages/aws-cdk-lib/pipelines/lib/legacy/pipeline.ts index 5d1a3832f2dbb..276fc8c9455fe 100644 --- a/packages/aws-cdk-lib/pipelines/lib/legacy/pipeline.ts +++ b/packages/aws-cdk-lib/pipelines/lib/legacy/pipeline.ts @@ -1,13 +1,13 @@ import * as path from 'path'; +import { Construct } from 'constructs'; +import { DeployCdkStackAction, PublishAssetsAction, UpdatePipelineAction } from './actions'; +import { AddStageOptions, AssetPublishingCommand, BaseStageOptions, CdkStage, StackOutput } from './stage'; +import { SimpleSynthAction } from './synths'; import * as codebuild from '../../../aws-codebuild'; import * as codepipeline from '../../../aws-codepipeline'; import * as ec2 from '../../../aws-ec2'; import * as iam from '../../../aws-iam'; import { Annotations, App, CfnOutput, PhysicalName, Stack, Stage } from '../../../core'; -import { Construct } from 'constructs'; -import { DeployCdkStackAction, PublishAssetsAction, UpdatePipelineAction } from './actions'; -import { AddStageOptions, AssetPublishingCommand, BaseStageOptions, CdkStage, StackOutput } from './stage'; -import { SimpleSynthAction } from './synths'; import { AssetType } from '../blueprint/asset-type'; import { dockerCredentialsInstallCommands, DockerCredential, DockerCredentialUsage } from '../docker-credentials'; import { ApplicationSecurityCheck } from '../private/application-security-check'; diff --git a/packages/aws-cdk-lib/pipelines/lib/legacy/stage.ts b/packages/aws-cdk-lib/pipelines/lib/legacy/stage.ts index e40eb54d7459a..25f4bf97d8081 100644 --- a/packages/aws-cdk-lib/pipelines/lib/legacy/stage.ts +++ b/packages/aws-cdk-lib/pipelines/lib/legacy/stage.ts @@ -1,3 +1,6 @@ +import { Construct, Node } from 'constructs'; +import { DeployCdkStackAction } from './actions'; +import { CdkPipeline } from './pipeline'; import * as codebuild from '../../../aws-codebuild'; import * as codepipeline from '../../../aws-codepipeline'; import * as cpactions from '../../../aws-codepipeline-actions'; @@ -5,9 +8,6 @@ import { CodeBuildAction } from '../../../aws-codepipeline-actions'; import * as sns from '../../../aws-sns'; import { Stage, Aspects } from '../../../core'; import * as cxapi from '../../../cx-api'; -import { Construct, Node } from 'constructs'; -import { DeployCdkStackAction } from './actions'; -import { CdkPipeline } from './pipeline'; import { AssetType } from '../blueprint/asset-type'; import { ApplicationSecurityCheck } from '../private/application-security-check'; import { AssetManifestReader, DockerImageManifestEntry, FileManifestEntry } from '../private/asset-manifest'; diff --git a/packages/aws-cdk-lib/pipelines/lib/legacy/synths/simple-synth-action.ts b/packages/aws-cdk-lib/pipelines/lib/legacy/synths/simple-synth-action.ts index 4b372349adfb0..8381668962d52 100644 --- a/packages/aws-cdk-lib/pipelines/lib/legacy/synths/simple-synth-action.ts +++ b/packages/aws-cdk-lib/pipelines/lib/legacy/synths/simple-synth-action.ts @@ -1,5 +1,7 @@ import * as crypto from 'crypto'; import * as path from 'path'; +import { Construct } from 'constructs'; +import { copyEnvironmentVariables, filterEmpty } from './_util'; import * as codebuild from '../../../../aws-codebuild'; import * as codepipeline from '../../../../aws-codepipeline'; import * as codepipeline_actions from '../../../../aws-codepipeline-actions'; @@ -7,8 +9,6 @@ import * as ec2 from '../../../../aws-ec2'; import * as events from '../../../../aws-events'; import * as iam from '../../../../aws-iam'; import { Stack } from '../../../../core'; -import { Construct } from 'constructs'; -import { copyEnvironmentVariables, filterEmpty } from './_util'; import { dockerCredentialsInstallCommands, DockerCredential, DockerCredentialUsage } from '../../docker-credentials'; import { CDKP_DEFAULT_CODEBUILD_IMAGE } from '../../private/default-codebuild-image'; import { toPosixPath } from '../../private/fs'; diff --git a/packages/aws-cdk-lib/pipelines/lib/legacy/validation/_files.ts b/packages/aws-cdk-lib/pipelines/lib/legacy/validation/_files.ts index 78ae0354ddf3d..20192332e3b78 100644 --- a/packages/aws-cdk-lib/pipelines/lib/legacy/validation/_files.ts +++ b/packages/aws-cdk-lib/pipelines/lib/legacy/validation/_files.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as codepipeline from '../../../../aws-codepipeline'; import { IGrantable } from '../../../../aws-iam'; import * as s3assets from '../../../../aws-s3-assets'; -import { Construct } from 'constructs'; /** * Additional files to use in a shell script diff --git a/packages/aws-cdk-lib/pipelines/lib/legacy/validation/shell-script-action.ts b/packages/aws-cdk-lib/pipelines/lib/legacy/validation/shell-script-action.ts index b9399d1eeafe4..eddacaa03fa8e 100644 --- a/packages/aws-cdk-lib/pipelines/lib/legacy/validation/shell-script-action.ts +++ b/packages/aws-cdk-lib/pipelines/lib/legacy/validation/shell-script-action.ts @@ -1,10 +1,10 @@ +import { Construct } from 'constructs'; import * as codebuild from '../../../../aws-codebuild'; import * as codepipeline from '../../../../aws-codepipeline'; import * as codepipeline_actions from '../../../../aws-codepipeline-actions'; import * as ec2 from '../../../../aws-ec2'; import * as events from '../../../../aws-events'; import * as iam from '../../../../aws-iam'; -import { Construct } from 'constructs'; import { CDKP_DEFAULT_CODEBUILD_IMAGE } from '../../private/default-codebuild-image'; import { StackOutput } from '../stage'; diff --git a/packages/aws-cdk-lib/pipelines/lib/main/pipeline-base.ts b/packages/aws-cdk-lib/pipelines/lib/main/pipeline-base.ts index 583c030022e8a..ad98e148913fa 100644 --- a/packages/aws-cdk-lib/pipelines/lib/main/pipeline-base.ts +++ b/packages/aws-cdk-lib/pipelines/lib/main/pipeline-base.ts @@ -1,5 +1,5 @@ -import { Aspects, Stage } from '../../../core'; import { Construct } from 'constructs'; +import { Aspects, Stage } from '../../../core'; import { AddStageOpts as StageOptions, WaveOptions, Wave, IFileSetProducer, ShellStep, FileSet } from '../blueprint'; const PIPELINE_SYMBOL = Symbol.for('@aws-cdk/pipelines.PipelineBase'); diff --git a/packages/aws-cdk-lib/pipelines/lib/private/application-security-check.ts b/packages/aws-cdk-lib/pipelines/lib/private/application-security-check.ts index 79bd62dc3af7c..fe0bac965e0a5 100644 --- a/packages/aws-cdk-lib/pipelines/lib/private/application-security-check.ts +++ b/packages/aws-cdk-lib/pipelines/lib/private/application-security-check.ts @@ -1,11 +1,11 @@ import * as path from 'path'; +import { Construct } from 'constructs'; +import { CDKP_DEFAULT_CODEBUILD_IMAGE } from './default-codebuild-image'; import * as codebuild from '../../../aws-codebuild'; import * as cp from '../../../aws-codepipeline'; import * as iam from '../../../aws-iam'; import * as lambda from '../../../aws-lambda'; import { Duration, Tags } from '../../../core'; -import { Construct } from 'constructs'; -import { CDKP_DEFAULT_CODEBUILD_IMAGE } from './default-codebuild-image'; import { builtInCustomResourceNodeRuntime } from '../../../custom-resources'; /** diff --git a/packages/aws-cdk-lib/pipelines/lib/private/asset-singleton-role.ts b/packages/aws-cdk-lib/pipelines/lib/private/asset-singleton-role.ts index f78c737271c5c..49a45e1804b68 100644 --- a/packages/aws-cdk-lib/pipelines/lib/private/asset-singleton-role.ts +++ b/packages/aws-cdk-lib/pipelines/lib/private/asset-singleton-role.ts @@ -1,7 +1,7 @@ +import { Construct, IDependable } from 'constructs'; import * as iam from '../../../aws-iam'; import { PolicyStatement } from '../../../aws-iam'; import { ArnFormat, Stack } from '../../../core'; -import { Construct, IDependable } from 'constructs'; /** * Role which will be reused across asset jobs diff --git a/packages/aws-cdk-lib/pipelines/lib/private/construct-internals.ts b/packages/aws-cdk-lib/pipelines/lib/private/construct-internals.ts index b13c740cbf965..7d268b0ab92a9 100644 --- a/packages/aws-cdk-lib/pipelines/lib/private/construct-internals.ts +++ b/packages/aws-cdk-lib/pipelines/lib/private/construct-internals.ts @@ -2,9 +2,9 @@ * Get access to construct internals that we need but got removed from the Stages PR. */ import * as path from 'path'; +import { Construct, IConstruct, Node } from 'constructs'; import { App, Stage } from '../../../core'; import * as cxapi from '../../../cx-api'; -import { Construct, IConstruct, Node } from 'constructs'; export function appOf(construct: IConstruct): App { const root = Node.of(construct).root; diff --git a/packages/aws-cdk-lib/pipelines/test/codepipeline/codebuild-step.test.ts b/packages/aws-cdk-lib/pipelines/test/codepipeline/codebuild-step.test.ts index 46fc418378cb6..23ce8de5e04da 100644 --- a/packages/aws-cdk-lib/pipelines/test/codepipeline/codebuild-step.test.ts +++ b/packages/aws-cdk-lib/pipelines/test/codepipeline/codebuild-step.test.ts @@ -1,9 +1,9 @@ import { Template, Match } from '../../../assertions'; import * as codebuild from '../../../aws-codebuild'; -import * as iam from '../../../aws-iam'; -import * as s3 from '../../../aws-s3'; import * as ec2 from '../../../aws-ec2'; +import * as iam from '../../../aws-iam'; import * as logs from '../../../aws-logs'; +import * as s3 from '../../../aws-s3'; import { Duration, Stack } from '../../../core'; import * as cdkp from '../../lib'; import { StackOutputReference } from '../../lib'; diff --git a/packages/aws-cdk-lib/pipelines/test/codepipeline/codepipeline-existing.test.ts b/packages/aws-cdk-lib/pipelines/test/codepipeline/codepipeline-existing.test.ts index f8bb40204d27e..b63378fedb0c4 100644 --- a/packages/aws-cdk-lib/pipelines/test/codepipeline/codepipeline-existing.test.ts +++ b/packages/aws-cdk-lib/pipelines/test/codepipeline/codepipeline-existing.test.ts @@ -1,5 +1,5 @@ -import * as codePipeline from '../../../aws-codepipeline'; import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; +import * as codePipeline from '../../../aws-codepipeline'; import * as cdk from '../../../core'; import * as cdkp from '../../lib'; diff --git a/packages/aws-cdk-lib/pipelines/test/codepipeline/codepipeline.test.ts b/packages/aws-cdk-lib/pipelines/test/codepipeline/codepipeline.test.ts index 977e7686414fa..054583de68e5d 100644 --- a/packages/aws-cdk-lib/pipelines/test/codepipeline/codepipeline.test.ts +++ b/packages/aws-cdk-lib/pipelines/test/codepipeline/codepipeline.test.ts @@ -1,12 +1,12 @@ +import { Construct } from 'constructs'; import { Template, Annotations, Match } from '../../../assertions'; import * as ccommit from '../../../aws-codecommit'; import { Pipeline } from '../../../aws-codepipeline'; import * as iam from '../../../aws-iam'; -import * as sqs from '../../../aws-sqs'; import * as s3 from '../../../aws-s3'; +import * as sqs from '../../../aws-sqs'; import * as cdk from '../../../core'; import { Stack } from '../../../core'; -import { Construct } from 'constructs'; import * as cdkp from '../../lib'; import { CodePipeline } from '../../lib'; import { PIPELINE_ENV, TestApp, ModernTestGitHubNpmPipeline, FileAssetApp, TwoStackApp, StageWithStackOutput } from '../testhelpers'; diff --git a/packages/aws-cdk-lib/pipelines/test/compliance/basic-behavior.test.ts b/packages/aws-cdk-lib/pipelines/test/compliance/basic-behavior.test.ts index 5eeccc0527de4..75d58084dadfb 100644 --- a/packages/aws-cdk-lib/pipelines/test/compliance/basic-behavior.test.ts +++ b/packages/aws-cdk-lib/pipelines/test/compliance/basic-behavior.test.ts @@ -1,9 +1,9 @@ /* eslint-disable import/no-extraneous-dependencies */ import * as fs from 'fs'; import * as path from 'path'; +import { Construct } from 'constructs'; import { Capture, Match, Template } from '../../../assertions'; import { Stack, Stage, StageProps, Tags } from '../../../core'; -import { Construct } from 'constructs'; import { behavior, LegacyTestGitHubNpmPipeline, OneStackApp, BucketStack, PIPELINE_ENV, TestApp, ModernTestGitHubNpmPipeline, stringLike } from '../testhelpers'; let app: TestApp; diff --git a/packages/aws-cdk-lib/pipelines/test/compliance/docker-credentials.test.ts b/packages/aws-cdk-lib/pipelines/test/compliance/docker-credentials.test.ts index 1209627eddf3c..e0266239dff2d 100644 --- a/packages/aws-cdk-lib/pipelines/test/compliance/docker-credentials.test.ts +++ b/packages/aws-cdk-lib/pipelines/test/compliance/docker-credentials.test.ts @@ -1,8 +1,8 @@ +import { Construct } from 'constructs'; import { Match, Template } from '../../../assertions'; import * as cb from '../../../aws-codebuild'; import * as secretsmanager from '../../../aws-secretsmanager'; import { Stack } from '../../../core'; -import { Construct } from 'constructs'; import * as cdkp from '../../lib'; import { CodeBuildStep } from '../../lib'; import { CDKP_DEFAULT_CODEBUILD_IMAGE } from '../../lib/private/default-codebuild-image'; diff --git a/packages/aws-cdk-lib/pipelines/test/compliance/escape-hatching.test.ts b/packages/aws-cdk-lib/pipelines/test/compliance/escape-hatching.test.ts index bc63841e496ca..8d83ed80526f6 100644 --- a/packages/aws-cdk-lib/pipelines/test/compliance/escape-hatching.test.ts +++ b/packages/aws-cdk-lib/pipelines/test/compliance/escape-hatching.test.ts @@ -1,7 +1,7 @@ +import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import { Match, Template } from '../../../assertions'; import * as cp from '../../../aws-codepipeline'; import * as cpa from '../../../aws-codepipeline-actions'; -import { describeDeprecated } from '@aws-cdk/cdk-build-tools'; import { SecretValue, Stack } from '../../../core'; import * as cdkp from '../../lib'; import { CodePipelineFileSet } from '../../lib'; diff --git a/packages/aws-cdk-lib/pipelines/test/docker-credentials.test.ts b/packages/aws-cdk-lib/pipelines/test/docker-credentials.test.ts index 41f363a5d3488..5dc5d53f33a96 100644 --- a/packages/aws-cdk-lib/pipelines/test/docker-credentials.test.ts +++ b/packages/aws-cdk-lib/pipelines/test/docker-credentials.test.ts @@ -1,10 +1,10 @@ +import { DockerAssetApp, TestApp } from './testhelpers'; import { Match, Template } from '../../assertions'; import * as ec2 from '../../aws-ec2'; import * as ecr from '../../aws-ecr'; import * as iam from '../../aws-iam'; import * as secretsmanager from '../../aws-secretsmanager'; import * as cdk from '../../core'; -import { DockerAssetApp, TestApp } from './testhelpers'; import * as cdkp from '../lib'; import { ShellStep } from '../lib'; diff --git a/packages/aws-cdk-lib/pipelines/test/main/pipeline-base.test.ts b/packages/aws-cdk-lib/pipelines/test/main/pipeline-base.test.ts index eced0f15babed..e19023b965b82 100644 --- a/packages/aws-cdk-lib/pipelines/test/main/pipeline-base.test.ts +++ b/packages/aws-cdk-lib/pipelines/test/main/pipeline-base.test.ts @@ -1,5 +1,5 @@ -import * as cdk from '../../../core'; import { Construct } from 'constructs'; +import * as cdk from '../../../core'; import { App } from '../../../core/lib'; import { PipelineBase, IFileSetProducer, FileSet } from '../../lib'; import { PIPELINE_ENV } from '../testhelpers'; diff --git a/packages/aws-cdk-lib/pipelines/test/testhelpers/legacy-pipeline.ts b/packages/aws-cdk-lib/pipelines/test/testhelpers/legacy-pipeline.ts index 4b7b76d5dbcc9..a909fe3833e0f 100644 --- a/packages/aws-cdk-lib/pipelines/test/testhelpers/legacy-pipeline.ts +++ b/packages/aws-cdk-lib/pipelines/test/testhelpers/legacy-pipeline.ts @@ -1,7 +1,7 @@ +import { Construct } from 'constructs'; import * as codepipeline from '../../../aws-codepipeline'; import * as codepipeline_actions from '../../../aws-codepipeline-actions'; import { SecretValue } from '../../../core'; -import { Construct } from 'constructs'; import * as cdkp from '../../lib'; export interface LegacyTestGitHubNpmPipelineExtraProps { diff --git a/packages/aws-cdk-lib/pipelines/test/testhelpers/test-app.ts b/packages/aws-cdk-lib/pipelines/test/testhelpers/test-app.ts index 06d770e81fd0f..e6dc89dd68340 100644 --- a/packages/aws-cdk-lib/pipelines/test/testhelpers/test-app.ts +++ b/packages/aws-cdk-lib/pipelines/test/testhelpers/test-app.ts @@ -1,10 +1,10 @@ import * as fs from 'fs'; import * as path from 'path'; +import { Construct } from 'constructs'; import * as ecr_assets from '../../../aws-ecr-assets'; import * as s3 from '../../../aws-s3'; import * as s3_assets from '../../../aws-s3-assets'; import { App, AppProps, Environment, CfnOutput, Stage, StageProps, Stack, StackProps } from '../../../core'; -import { Construct } from 'constructs'; import { assemblyBuilderOf } from '../../lib/private/construct-internals'; export const PIPELINE_ENV: Environment = { diff --git a/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts b/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts index 006c27c94123d..62c8159dc0d3d 100644 --- a/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts +++ b/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts @@ -1,3 +1,4 @@ +/* eslint-disable @aws-cdk/no-literal-partition */ export const AWS_CDK_METADATA = new Set([ 'us-east-2', 'us-east-1', diff --git a/packages/aws-cdk-lib/region-info/build-tools/generate-static-data.ts b/packages/aws-cdk-lib/region-info/build-tools/generate-static-data.ts index 143fcc7c21be5..50219a61cb392 100644 --- a/packages/aws-cdk-lib/region-info/build-tools/generate-static-data.ts +++ b/packages/aws-cdk-lib/region-info/build-tools/generate-static-data.ts @@ -82,7 +82,7 @@ export async function main(): Promise { registerFact(region, 'APPMESH_ECR_ACCOUNT', APPMESH_ECR_ACCOUNTS[region]); - registerFact(region, 'DEFAULT_CR_NODE_VERSION', CR_DEFAULT_RUNTIME_MAP[partition]); + registerFact(region, 'DEFAULT_CR_NODE_VERSION', CR_DEFAULT_RUNTIME_MAP[partition]); const firehoseCidrBlock = FIREHOSE_CIDR_BLOCKS[region]; if (firehoseCidrBlock) { diff --git a/packages/aws-cdk-lib/scripts/gen.ts b/packages/aws-cdk-lib/scripts/gen.ts index efaf91b169fee..3695cdeb1ac91 100644 --- a/packages/aws-cdk-lib/scripts/gen.ts +++ b/packages/aws-cdk-lib/scripts/gen.ts @@ -1,13 +1,13 @@ +import * as path from 'path'; import { generateAll, ModuleMap } from '@aws-cdk/cfn2ts'; import * as fs from 'fs-extra'; -import * as path from 'path'; const awsCdkLibDir = path.join(__dirname, '..'); const pkgJsonPath = path.join(awsCdkLibDir, 'package.json'); const topLevelIndexFilePath = path.join(awsCdkLibDir, 'index.ts'); main().catch(e => { - // eslint-ignore-next-line no-console + // eslint-disable-next-line no-console console.error(e); process.exitCode = 1; }); @@ -31,12 +31,13 @@ async function main() { return { ...accum, [moduleName]: scopes, - } + }; }, {}); await fs.writeJson(scopeMapPath, newScopeMap, { spaces: 2 }); // Call build-tools within modules for other codegen // TODO: Move these up into aws-cdk-libs/scripts + // eslint-disable-next-line @typescript-eslint/no-require-imports require('../aws-events-targets/build-tools/gen.js'); await genCfnIncludeMap(generated); } @@ -62,7 +63,7 @@ async function updatePackageJsonAndIndexFiles(modules: ModuleMap) { moduleConfig = { name: moduleName, submodule: moduleName.replace(/-/g, '_'), - } + }; } const exportName = `./${moduleConfig.name}`; @@ -88,7 +89,7 @@ async function genCfnIncludeMap(generated: ModuleMap) { }); }); - const sortedClassMap = Object.fromEntries(Object.entries(classMap).sort(([resA], [resB]) => resA.localeCompare(resB))) + const sortedClassMap = Object.fromEntries(Object.entries(classMap).sort(([resA], [resB]) => resA.localeCompare(resB))); const filePath = path.join(__dirname, '..', 'cloudformation-include', 'cfn-types-2-classes.json'); await fs.writeJson(filePath, sortedClassMap, { spaces: 2 }); diff --git a/packages/aws-cdk-lib/scripts/scope-map.json b/packages/aws-cdk-lib/scripts/scope-map.json index 02e6a3ad1b40a..53474787d72c9 100644 --- a/packages/aws-cdk-lib/scripts/scope-map.json +++ b/packages/aws-cdk-lib/scripts/scope-map.json @@ -650,5 +650,11 @@ ], "core": [ "AWS::CloudFormation" + ], + "aws-backupgateway": [ + "AWS::BackupGateway" + ], + "aws-proton": [ + "AWS::Proton" ] } diff --git a/packages/aws-cdk/THIRD_PARTY_LICENSES b/packages/aws-cdk/THIRD_PARTY_LICENSES index 97c71d00c0027..307780fcf5773 100644 --- a/packages/aws-cdk/THIRD_PARTY_LICENSES +++ b/packages/aws-cdk/THIRD_PARTY_LICENSES @@ -268,7 +268,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE ---------------- -** aws-sdk@2.1373.0 - https://www.npmjs.com/package/aws-sdk/v/2.1373.0 | Apache-2.0 +** aws-sdk@2.1375.0 - https://www.npmjs.com/package/aws-sdk/v/2.1375.0 | Apache-2.0 AWS SDK for JavaScript Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/aws-cdk/lib/init-templates/app/typescript/package.json b/packages/aws-cdk/lib/init-templates/app/typescript/package.json index e6e3a61b9e604..13f37e451a0c6 100644 --- a/packages/aws-cdk/lib/init-templates/app/typescript/package.json +++ b/packages/aws-cdk/lib/init-templates/app/typescript/package.json @@ -12,7 +12,7 @@ }, "devDependencies": { "@types/jest": "^29.5.1", - "@types/node": "20.1.0", + "@types/node": "20.1.2", "jest": "^29.5.0", "ts-jest": "^29.1.0", "aws-cdk": "%cdk-version%", diff --git a/packages/aws-cdk/lib/init-templates/lib/typescript/package.json b/packages/aws-cdk/lib/init-templates/lib/typescript/package.json index 52e4cdda421ae..57686bfe7a19d 100644 --- a/packages/aws-cdk/lib/init-templates/lib/typescript/package.json +++ b/packages/aws-cdk/lib/init-templates/lib/typescript/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@types/jest": "^29.5.1", - "@types/node": "20.1.0", + "@types/node": "20.1.2", "aws-cdk-lib": "%cdk-version%", "constructs": "%constructs-version%", "jest": "^29.5.0", diff --git a/packages/aws-cdk/lib/init-templates/sample-app/typescript/package.json b/packages/aws-cdk/lib/init-templates/sample-app/typescript/package.json index a39a15e7a7028..64d32e1c17f93 100644 --- a/packages/aws-cdk/lib/init-templates/sample-app/typescript/package.json +++ b/packages/aws-cdk/lib/init-templates/sample-app/typescript/package.json @@ -12,7 +12,7 @@ }, "devDependencies": { "@types/jest": "^29.5.1", - "@types/node": "20.1.0", + "@types/node": "20.1.2", "jest": "^29.5.0", "ts-jest": "^29.1.0", "aws-cdk": "%cdk-version%", diff --git a/packages/aws-cdk/package.json b/packages/aws-cdk/package.json index d52e122db276e..8a83b97d876d7 100644 --- a/packages/aws-cdk/package.json +++ b/packages/aws-cdk/package.json @@ -69,7 +69,7 @@ "@types/jest": "^29.5.1", "@types/mockery": "^1.4.30", "@types/promptly": "^3.0.2", - "@types/semver": "^7.3.13", + "@types/semver": "^7.5.0", "@types/sinon": "^9.0.11", "@types/source-map-support": "^0.5.6", "@types/table": "^6.0.0", @@ -99,7 +99,7 @@ "@aws-cdk/region-info": "0.0.0", "@jsii/check-node": "1.80.0", "archiver": "^5.3.1", - "aws-sdk": "^2.1373.0", + "aws-sdk": "^2.1375.0", "camelcase": "^6.3.0", "cdk-assets": "0.0.0", "chokidar": "^3.5.3", diff --git a/packages/cdk-assets/package.json b/packages/cdk-assets/package.json index 56f27baf0f6a3..eecbd03e2d6a9 100644 --- a/packages/cdk-assets/package.json +++ b/packages/cdk-assets/package.json @@ -46,7 +46,7 @@ "@aws-cdk/cloud-assembly-schema": "0.0.0", "@aws-cdk/cx-api": "0.0.0", "archiver": "^5.3.1", - "aws-sdk": "^2.1373.0", + "aws-sdk": "^2.1375.0", "glob": "^7.2.3", "mime": "^2.6.0", "yargs": "^16.2.0" diff --git a/tools/@aws-cdk/cdk-build-tools/package.json b/tools/@aws-cdk/cdk-build-tools/package.json index d54fd4b5843de..d56d040d81d22 100644 --- a/tools/@aws-cdk/cdk-build-tools/package.json +++ b/tools/@aws-cdk/cdk-build-tools/package.json @@ -39,7 +39,7 @@ "@aws-cdk/pkglint": "0.0.0", "@types/fs-extra": "^9.0.13", "@types/jest": "^29.5.1", - "@types/semver": "^7.3.13", + "@types/semver": "^7.5.0", "@types/yargs": "^15.0.15" }, "dependencies": { diff --git a/tools/@aws-cdk/cfn2ts/lib/index.ts b/tools/@aws-cdk/cfn2ts/lib/index.ts index ee03c418a2549..0fd1bef1629eb 100644 --- a/tools/@aws-cdk/cfn2ts/lib/index.ts +++ b/tools/@aws-cdk/cfn2ts/lib/index.ts @@ -127,13 +127,19 @@ export async function generateAll( coreImport: isCore ? '.' : options.coreImport, }); + // submodule index.ts if (!fs.existsSync(path.join(packagePath, 'index.ts'))) { - let lines = moduleScopes.map((s: string) => `// ${s} Cloudformation Resources`); - lines.push(...outputFiles.map((f) => `export * from './lib/${f.replace('.ts', '')}'`)); - + const lines = ['export * from \'./lib\';']; await fs.writeFile(path.join(packagePath, 'index.ts'), lines.join('\n') + '\n'); } + // lib/index.ts + if (!fs.existsSync(path.join(packagePath, 'lib', 'index.ts'))) { + const lines = moduleScopes.map((s: string) => `// ${s} Cloudformation Resources`); + lines.push(...outputFiles.map((f) => `export * from './${f.replace('.ts', '')}';`)); + await fs.writeFile(path.join(packagePath, 'lib', 'index.ts'), lines.join('\n') + '\n'); + } + // Create .jsiirc.json file if needed if ( !fs.existsSync(path.join(packagePath, '.jsiirc.json')) diff --git a/tools/@aws-cdk/node-bundle/package.json b/tools/@aws-cdk/node-bundle/package.json index 363c12e340811..f748d92a4fed2 100644 --- a/tools/@aws-cdk/node-bundle/package.json +++ b/tools/@aws-cdk/node-bundle/package.json @@ -38,7 +38,7 @@ "jest": "^29", "jest-junit": "^13", "npm-check-updates": "^16", - "projen": "^0.71.46", + "projen": "^0.71.49", "standard-version": "^9", "ts-jest": "^29", "typescript": "^4.5.5" diff --git a/tools/@aws-cdk/pkglint/package.json b/tools/@aws-cdk/pkglint/package.json index a115856fc17d8..321ad7b3676d5 100644 --- a/tools/@aws-cdk/pkglint/package.json +++ b/tools/@aws-cdk/pkglint/package.json @@ -41,7 +41,7 @@ "@types/fs-extra": "^9.0.13", "@types/glob": "^7.2.0", "@types/jest": "^29.5.1", - "@types/semver": "^7.3.13", + "@types/semver": "^7.5.0", "@types/yargs": "^15.0.15", "@typescript-eslint/eslint-plugin": "^4.33.0", "@typescript-eslint/parser": "^4.33.0", diff --git a/tools/@aws-cdk/prlint/lint.ts b/tools/@aws-cdk/prlint/lint.ts index 45d5348e2dcda..31e3cdd533f9b 100644 --- a/tools/@aws-cdk/prlint/lint.ts +++ b/tools/@aws-cdk/prlint/lint.ts @@ -99,7 +99,6 @@ interface Test { * Represents a set of tests and the conditions under which those rules exempt. */ interface ValidateRuleSetOptions { - /** * The function to test for exemption from the rules in testRuleSet. */ @@ -151,7 +150,6 @@ class ValidationCollector { * Props used to perform linting against the pull request. */ export interface PullRequestLinterProps { - /** * GitHub client scoped to pull requests. Imported via @actions/github. */ @@ -345,6 +343,10 @@ export class PullRequestLinter { && review.user?.login !== 'aws-cdk-automation' && review.state === 'CHANGES_REQUESTED' ); + const maintainerApproved = reviews.data.some( + review => review.author_association === 'MEMBER' + && review.state === 'APPROVED' + ); const prLinterFailed = reviews.data.find((review) => review.user?.login === 'aws-cdk-automation' && review.state !== 'DISMISSED') as Review; const userRequestsExemption = pr.labels.some(label => (label.name === Exemption.REQUEST_EXEMPTION || label.name === Exemption.REQUEST_CLARIFICATION)); console.log('evaluation: ', JSON.stringify({ @@ -364,6 +366,8 @@ export class PullRequestLinter { || maintainerRequestedChanges // or the PR linter failed and the user didn't request an exemption || (prLinterFailed && !userRequestsExemption) + // or a maintainer has already approved the PR + || maintainerApproved ) { if (pr.labels.some(label => label.name === 'pr/needs-review')) { console.log(`removing labels from pr ${pr.number}`); diff --git a/tools/@aws-cdk/prlint/test/lint.test.ts b/tools/@aws-cdk/prlint/test/lint.test.ts index 51eb87f4a6e37..0ba2dd2331dc5 100644 --- a/tools/@aws-cdk/prlint/test/lint.test.ts +++ b/tools/@aws-cdk/prlint/test/lint.test.ts @@ -647,6 +647,39 @@ describe('integration tests required on features', () => { expect(mockAddLabel.mock.calls).toEqual([]); }); + test('does not need a review if member has approved', async () => { + // GIVEN + mockListReviews.mockImplementation(() => { + return { + data: [ + { id: 1111122223, user: { login: 'someuser' }, author_association: 'MEMBER', state: 'APPROVED' }, + ] + } + }); + (pr as any).labels = [ + { + name: 'pr/needs-review', + } + ]; + + // WHEN + const prLinter = configureMock(pr); + await prLinter.validateStatusEvent(pr as any, { + sha: SHA, + context: linter.CODE_BUILD_CONTEXT, + state: 'success', + } as any); + + // THEN + expect(mockRemoveLabel.mock.calls[0][0]).toEqual({ + "issue_number": 1234, + "name": "pr/needs-review", + "owner": "aws", + "repo": "aws-cdk", + }); + expect(mockAddLabel.mock.calls).toEqual([]); + }); + test('review happens even if linter fails', async () => { // GIVEN mockListReviews.mockImplementation(() => { diff --git a/tools/@aws-cdk/yarn-cling/package.json b/tools/@aws-cdk/yarn-cling/package.json index a502ccd0f0b3c..bbaa414568594 100644 --- a/tools/@aws-cdk/yarn-cling/package.json +++ b/tools/@aws-cdk/yarn-cling/package.json @@ -40,7 +40,7 @@ "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.1", "@types/node": "18.11.19", - "@types/semver": "^7.3.13", + "@types/semver": "^7.5.0", "@types/yarnpkg__lockfile": "^1.1.5", "jest": "^29.5.0", "typescript": "~4.9.5" diff --git a/version.v2.json b/version.v2.json index d420c4067f014..32bb348ad2366 100644 --- a/version.v2.json +++ b/version.v2.json @@ -1,4 +1,4 @@ { - "version": "2.78.0", - "alphaVersion": "2.78.0-alpha.0" + "version": "2.79.0", + "alphaVersion": "2.79.0-alpha.0" } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 4762fb812aa4d..8ea2e0fe71cd1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -35,25 +35,25 @@ "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@aws-cdk/asset-awscli-v1@^2.2.165": - version "2.2.165" - resolved "https://registry.npmjs.org/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.165.tgz#98dd2681863ae28c16b0c17fd247b494b5ea8538" - integrity sha512-vvgjhNJNrnP2BWjXZqp2JlCIXzchHfAI9Ph8uHKG4oS3cbI5ulKuH+q1tTDTe1G+j5clZSvVdZidUP83mMNw3Q== +"@aws-cdk/asset-awscli-v1@^2.2.168": + version "2.2.168" + resolved "https://registry.npmjs.org/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.168.tgz#a505588d4a3c8da9ef0d06c1a221fc2f2e22e759" + integrity sha512-w0NQAhoeqqTwcf9HoO+NaSval1fGQcxByFg+z6sHT/gkpyrsnuR23dGRY4ARBUWL1DUyjWYptFe0CFyy1Vdmsg== "@aws-cdk/asset-kubectl-v20@^2.1.1": version "2.1.1" resolved "https://registry.npmjs.org/@aws-cdk/asset-kubectl-v20/-/asset-kubectl-v20-2.1.1.tgz#d01c1efb867fb7f2cfd8c8b230b8eae16447e156" integrity sha512-U1ntiX8XiMRRRH5J1IdC+1t5CE89015cwyt5U63Cpk0GnMlN5+h9WsWMlKlPXZR4rdq/m806JRlBMRpBUB2Dhw== -"@aws-cdk/asset-node-proxy-agent-v5@^2.0.139": - version "2.0.139" - resolved "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v5/-/asset-node-proxy-agent-v5-2.0.139.tgz#ccbe91786d79c7a075832334e03a1d9618068634" - integrity sha512-7vx6nDiZqk8KJ/mmCbR6jCcOlU2DgkRv4v908ej249R7+qnnngsJwYmmwyqeQGbDVWb3D8I563EojZB3h6b0vw== +"@aws-cdk/asset-node-proxy-agent-v5@^2.0.141": + version "2.0.141" + resolved "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v5/-/asset-node-proxy-agent-v5-2.0.141.tgz#0e738efb6d42453571a4cf1e7e3c9a71b131747c" + integrity sha512-+Yu9Ij3jrIoyuYlx71rfBMeiTmS3YCrhvhGKNLwYvOTrij5ZTO+b3FYlrN/J31Bx8tRQrDlR75ERbxt4Wb/v9A== -"@aws-cdk/lambda-layer-kubectl-v24@^2.0.186": - version "2.0.186" - resolved "https://registry.npmjs.org/@aws-cdk/lambda-layer-kubectl-v24/-/lambda-layer-kubectl-v24-2.0.186.tgz#38928648d441cba296e3fa124a3573d9403f82ec" - integrity sha512-E7Wem9S5qLJcRiXhN7cQ93W19bMpvVN/AOLXXP9tzajs0u6maunV2bwKNkEqxaD/tGimIcm3lu3EYo82SXaOow== +"@aws-cdk/lambda-layer-kubectl-v24@^2.0.188": + version "2.0.188" + resolved "https://registry.npmjs.org/@aws-cdk/lambda-layer-kubectl-v24/-/lambda-layer-kubectl-v24-2.0.188.tgz#d0cfc0c9aa29b6bd3722d053ec5d7bb99b133508" + integrity sha512-b+AtKHiw7TTUc6rpkqftzJbRAI8R8ArShBjJdcnnFtY0NozYZ44LAIM+UlAr5kVG+LhoqhdPJQme1VYQV7vFrQ== "@babel/code-frame@7.12.11": version "7.12.11" @@ -1317,9 +1317,9 @@ which "^2.0.2" "@npmcli/run-script@^6.0.0": - version "6.0.1" - resolved "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.1.tgz#a94404783d9afaff62decb71944435d0d8a29f8e" - integrity sha512-Yi04ZSold8jcbBJD/ahKMJSQCQifH8DAbMwkBvoLaTpGFxzHC3B/5ZyoVR69q/4xedz84tvi9DJOJjNe17h+LA== + version "6.0.2" + resolved "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.2.tgz#a25452d45ee7f7fb8c16dfaf9624423c0c0eb885" + integrity sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA== dependencies: "@npmcli/node-gyp" "^3.0.0" "@npmcli/promise-spawn" "^6.0.0" @@ -2017,9 +2017,9 @@ integrity sha512-uv53RrNdhbkV/3VmVCtfImfYCWC3GTTRn3R11Whni3EJ+gb178tkZBVNj2edLY5CMrB749dQi+SJkg87jsN8UQ== "@types/node@*": - version "20.1.0" - resolved "https://registry.npmjs.org/@types/node/-/node-20.1.0.tgz#258805edc37c327cf706e64c6957f241ca4c4c20" - integrity sha512-O+z53uwx64xY7D6roOi4+jApDGFg0qn6WHcxe5QeqjMaTezBO/mxdfFXIVAVVyNWKx84OmPB3L8kbVYOTeN34A== + version "20.1.2" + resolved "https://registry.npmjs.org/@types/node/-/node-20.1.2.tgz#8fd63447e3f99aba6c3168fd2ec4580d5b97886f" + integrity sha512-CTO/wa8x+rZU626cL2BlbCDzydgnFNgc19h4YvizpTO88MFQxab8wqisxaofQJ/9bLGugRdWIuX/TbIs6VVF6g== "@types/node@18.11.19": version "18.11.19" @@ -2027,14 +2027,14 @@ integrity sha512-YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw== "@types/node@^14": - version "14.18.45" - resolved "https://registry.npmjs.org/@types/node/-/node-14.18.45.tgz#d962a7409509dd4de3ce4838e83f49b5703ec09d" - integrity sha512-Nd+FPp60jEaJpm4LAxuLT3wIhB4k0Jdj9DAP4ydqGyMg8DhE+7oM1we+QkwOkpMySTjcqcNfPOWY5kBuAOhkeg== + version "14.18.46" + resolved "https://registry.npmjs.org/@types/node/-/node-14.18.46.tgz#ffc5a96cbe4fb5af9d16ac08e50229de30969487" + integrity sha512-n4yVT5FuY5NCcGHCosQSGvvCT74HhowymPN2OEcsHPw6U1NuxV9dvxWbrM2dnBukWjdMYzig1WfIkWdTTQJqng== "@types/node@^16.9.2": - version "16.18.26" - resolved "https://registry.npmjs.org/@types/node/-/node-16.18.26.tgz#a18b88726a67bc6a8a5bdac9a40c093ecb03ccd0" - integrity sha512-pCNBzNQqCXE4A6FWDmrn/o1Qu+qBf8tnorBlNoPNSBQJF+jXzvTKNI/aMiE+hGJbK5sDAD65g7OS/YwSHIEJdw== + version "16.18.28" + resolved "https://registry.npmjs.org/@types/node/-/node-16.18.28.tgz#f674e1577827c5282e5005c3fa99ea06df835c49" + integrity sha512-SNMfiPqsiPoYfmyi+2qnDO4nZyMIOCab/CW+Slcml0lhIzkOizYzWtt/A7tgB3TSitd+YJKi8fSC2Cpm/VCp7A== "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -2082,10 +2082,10 @@ dependencies: "@types/node" "*" -"@types/semver@^7.3.12", "@types/semver@^7.3.13": - version "7.3.13" - resolved "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91" - integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw== +"@types/semver@^7.3.12", "@types/semver@^7.5.0": + version "7.5.0" + resolved "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a" + integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw== "@types/sinon@^9.0.11": version "9.0.11" @@ -2181,14 +2181,14 @@ tsutils "^3.21.0" "@typescript-eslint/eslint-plugin@^5": - version "5.59.2" - resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.2.tgz#684a2ce7182f3b4dac342eef7caa1c2bae476abd" - integrity sha512-yVrXupeHjRxLDcPKL10sGQ/QlVrA8J5IYOEWVqk0lJaSZP7X5DfnP7Ns3cc74/blmbipQ1htFNVGsHX6wsYm0A== + version "5.59.5" + resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.5.tgz#f156827610a3f8cefc56baeaa93cd4a5f32966b4" + integrity sha512-feA9xbVRWJZor+AnLNAr7A8JRWeZqHUf4T9tlP+TN04b05pFVhO5eN7/O93Y/1OUlLMHKbnJisgDURs/qvtqdg== dependencies: "@eslint-community/regexpp" "^4.4.0" - "@typescript-eslint/scope-manager" "5.59.2" - "@typescript-eslint/type-utils" "5.59.2" - "@typescript-eslint/utils" "5.59.2" + "@typescript-eslint/scope-manager" "5.59.5" + "@typescript-eslint/type-utils" "5.59.5" + "@typescript-eslint/utils" "5.59.5" debug "^4.3.4" grapheme-splitter "^1.0.4" ignore "^5.2.0" @@ -2219,13 +2219,13 @@ debug "^4.3.1" "@typescript-eslint/parser@^5": - version "5.59.2" - resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.2.tgz#c2c443247901d95865b9f77332d9eee7c55655e8" - integrity sha512-uq0sKyw6ao1iFOZZGk9F8Nro/8+gfB5ezl1cA06SrqbgJAt0SRoFhb9pXaHvkrxUpZaoLxt8KlovHNk8Gp6/HQ== + version "5.59.5" + resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.5.tgz#63064f5eafbdbfb5f9dfbf5c4503cdf949852981" + integrity sha512-NJXQC4MRnF9N9yWqQE2/KLRSOLvrrlZb48NGVfBa+RuPMN6B7ZcK5jZOvhuygv4D64fRKnZI4L4p8+M+rfeQuw== dependencies: - "@typescript-eslint/scope-manager" "5.59.2" - "@typescript-eslint/types" "5.59.2" - "@typescript-eslint/typescript-estree" "5.59.2" + "@typescript-eslint/scope-manager" "5.59.5" + "@typescript-eslint/types" "5.59.5" + "@typescript-eslint/typescript-estree" "5.59.5" debug "^4.3.4" "@typescript-eslint/scope-manager@4.33.0": @@ -2236,21 +2236,21 @@ "@typescript-eslint/types" "4.33.0" "@typescript-eslint/visitor-keys" "4.33.0" -"@typescript-eslint/scope-manager@5.59.2": - version "5.59.2" - resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.2.tgz#f699fe936ee4e2c996d14f0fdd3a7da5ba7b9a4c" - integrity sha512-dB1v7ROySwQWKqQ8rEWcdbTsFjh2G0vn8KUyvTXdPoyzSL6lLGkiXEV5CvpJsEe9xIdKV+8Zqb7wif2issoOFA== +"@typescript-eslint/scope-manager@5.59.5": + version "5.59.5" + resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.5.tgz#33ffc7e8663f42cfaac873de65ebf65d2bce674d" + integrity sha512-jVecWwnkX6ZgutF+DovbBJirZcAxgxC0EOHYt/niMROf8p4PwxxG32Qdhj/iIQQIuOflLjNkxoXyArkcIP7C3A== dependencies: - "@typescript-eslint/types" "5.59.2" - "@typescript-eslint/visitor-keys" "5.59.2" + "@typescript-eslint/types" "5.59.5" + "@typescript-eslint/visitor-keys" "5.59.5" -"@typescript-eslint/type-utils@5.59.2": - version "5.59.2" - resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.2.tgz#0729c237503604cd9a7084b5af04c496c9a4cdcf" - integrity sha512-b1LS2phBOsEy/T381bxkkywfQXkV1dWda/z0PhnIy3bC5+rQWQDS7fk9CSpcXBccPY27Z6vBEuaPBCKCgYezyQ== +"@typescript-eslint/type-utils@5.59.5": + version "5.59.5" + resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.5.tgz#485b0e2c5b923460bc2ea6b338c595343f06fc9b" + integrity sha512-4eyhS7oGym67/pSxA2mmNq7X164oqDYNnZCUayBwJZIRVvKpBCMBzFnFxjeoDeShjtO6RQBHBuwybuX3POnDqg== dependencies: - "@typescript-eslint/typescript-estree" "5.59.2" - "@typescript-eslint/utils" "5.59.2" + "@typescript-eslint/typescript-estree" "5.59.5" + "@typescript-eslint/utils" "5.59.5" debug "^4.3.4" tsutils "^3.21.0" @@ -2259,10 +2259,10 @@ resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72" integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ== -"@typescript-eslint/types@5.59.2": - version "5.59.2" - resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.2.tgz#b511d2b9847fe277c5cb002a2318bd329ef4f655" - integrity sha512-LbJ/HqoVs2XTGq5shkiKaNTuVv5tTejdHgfdjqRUGdYhjW1crm/M7og2jhVskMt8/4wS3T1+PfFvL1K3wqYj4w== +"@typescript-eslint/types@5.59.5": + version "5.59.5" + resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.5.tgz#e63c5952532306d97c6ea432cee0981f6d2258c7" + integrity sha512-xkfRPHbqSH4Ggx4eHRIO/eGL8XL4Ysb4woL8c87YuAo8Md7AUjyWKa9YMwTL519SyDPrfEgKdewjkxNCVeJW7w== "@typescript-eslint/typescript-estree@4.33.0", "@typescript-eslint/typescript-estree@^4.33.0": version "4.33.0" @@ -2277,30 +2277,30 @@ semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/typescript-estree@5.59.2": - version "5.59.2" - resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.2.tgz#6e2fabd3ba01db5d69df44e0b654c0b051fe9936" - integrity sha512-+j4SmbwVmZsQ9jEyBMgpuBD0rKwi9RxRpjX71Brr73RsYnEr3Lt5QZ624Bxphp8HUkSKfqGnPJp1kA5nl0Sh7Q== +"@typescript-eslint/typescript-estree@5.59.5": + version "5.59.5" + resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.5.tgz#9b252ce55dd765e972a7a2f99233c439c5101e42" + integrity sha512-+XXdLN2CZLZcD/mO7mQtJMvCkzRfmODbeSKuMY/yXbGkzvA9rJyDY5qDYNoiz2kP/dmyAxXquL2BvLQLJFPQIg== dependencies: - "@typescript-eslint/types" "5.59.2" - "@typescript-eslint/visitor-keys" "5.59.2" + "@typescript-eslint/types" "5.59.5" + "@typescript-eslint/visitor-keys" "5.59.5" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/utils@5.59.2": - version "5.59.2" - resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.2.tgz#0c45178124d10cc986115885688db6abc37939f4" - integrity sha512-kSuF6/77TZzyGPhGO4uVp+f0SBoYxCDf+lW3GKhtKru/L8k/Hd7NFQxyWUeY7Z/KGB2C6Fe3yf2vVi4V9TsCSQ== +"@typescript-eslint/utils@5.59.5": + version "5.59.5" + resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.5.tgz#15b3eb619bb223302e60413adb0accd29c32bcae" + integrity sha512-sCEHOiw+RbyTii9c3/qN74hYDPNORb8yWCoPLmB7BIflhplJ65u2PBpdRla12e3SSTJ2erRkPjz7ngLHhUegxA== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@types/json-schema" "^7.0.9" "@types/semver" "^7.3.12" - "@typescript-eslint/scope-manager" "5.59.2" - "@typescript-eslint/types" "5.59.2" - "@typescript-eslint/typescript-estree" "5.59.2" + "@typescript-eslint/scope-manager" "5.59.5" + "@typescript-eslint/types" "5.59.5" + "@typescript-eslint/typescript-estree" "5.59.5" eslint-scope "^5.1.1" semver "^7.3.7" @@ -2312,12 +2312,12 @@ "@typescript-eslint/types" "4.33.0" eslint-visitor-keys "^2.0.0" -"@typescript-eslint/visitor-keys@5.59.2": - version "5.59.2" - resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.2.tgz#37a419dc2723a3eacbf722512b86d6caf7d3b750" - integrity sha512-EEpsO8m3RASrKAHI9jpavNv9NlEUebV4qmF1OWxSTtKSFBpC1NCmWazDQHFivRf0O1DV11BA645yrLEVQ0/Lig== +"@typescript-eslint/visitor-keys@5.59.5": + version "5.59.5" + resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.5.tgz#ba5b8d6791a13cf9fea6716af1e7626434b29b9b" + integrity sha512-qL+Oz+dbeBRTeyJTIy0eniD3uvqU7x+y1QceBismZ41hd4aBSRh8UAw4pZP0+XzLuPZmx4raNMq/I+59W2lXKA== dependencies: - "@typescript-eslint/types" "5.59.2" + "@typescript-eslint/types" "5.59.5" eslint-visitor-keys "^3.3.0" "@xmldom/xmldom@^0.8.6", "@xmldom/xmldom@^0.8.7": @@ -2737,10 +2737,10 @@ aws-sdk-mock@5.6.0: sinon "^11.1.1" traverse "^0.6.6" -aws-sdk@^2.1373.0, aws-sdk@^2.928.0: - version "2.1373.0" - resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1373.0.tgz#e1e7d5b01498de48dd0cd8c7849c1766c115f13d" - integrity sha512-3/P79VU2VVeiof25bn8TSepEhWCRhwuQGYoEWX/2pApQRJAY+w/3JFVKHjbAe3NYEEBNeiAE6PQ9DqWz5Pp+Lw== +aws-sdk@^2.1373.0, aws-sdk@^2.1375.0, aws-sdk@^2.928.0: + version "2.1375.0" + resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1375.0.tgz#9fbc6f7e1eb8211bd39ec32fb2d4a7a6a0de2469" + integrity sha512-4JusqLa0+TJ4a2rfxuiPiaEHZVxVWDzREN8rAI4zhL+u4QbqGq95yfMh9v5QtSDkdNCAReA5DSSVXPOHbS80pA== dependencies: buffer "4.9.2" events "1.1.1" @@ -3120,10 +3120,10 @@ case@1.6.3, case@^1.6.3: resolved "https://registry.npmjs.org/case/-/case-1.6.3.tgz#0a4386e3e9825351ca2e6216c60467ff5f1ea1c9" integrity sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ== -cdk-generate-synthetic-examples@^0.1.235: - version "0.1.235" - resolved "https://registry.npmjs.org/cdk-generate-synthetic-examples/-/cdk-generate-synthetic-examples-0.1.235.tgz#9667908de9fd970f82bd64085310e094c1a3b97b" - integrity sha512-EyCGnbYyuMefOHyI0BKD1NUktXThjiAlQUL0DRtWmYwuDX7T8xMw0TdckTWkW0QfFD3vWm3eB6YizDAk4qNubQ== +cdk-generate-synthetic-examples@^0.1.237: + version "0.1.237" + resolved "https://registry.npmjs.org/cdk-generate-synthetic-examples/-/cdk-generate-synthetic-examples-0.1.237.tgz#1be21819a4854143f0494b523bedffb6dabac4da" + integrity sha512-Qnr1lsmHu6gqtcuXFP7zKhiMmtKBHPbekCZnBeYyWg3nNsX1q1uBWeeJj7DF+w1PUS0PXo6liYe3PAp9iy+6XQ== dependencies: "@jsii/spec" "^1.80.0" fs-extra "^10.1.0" @@ -3132,10 +3132,10 @@ cdk-generate-synthetic-examples@^0.1.235: jsii-rosetta "^1.80.0" yargs "^17.7.2" -cdk8s-plus-24@2.7.22: - version "2.7.22" - resolved "https://registry.npmjs.org/cdk8s-plus-24/-/cdk8s-plus-24-2.7.22.tgz#c9c2fc664c70c50e9e62ce1290bf628148a56899" - integrity sha512-vGNA+4LB5PaIUNMBugL1N34qGRJMn66jIQna+GW/w1IWaVk10/hQB3eKP6Gd8LU4hQWiX1F413KegYzPlmbXkg== +cdk8s-plus-24@2.7.24: + version "2.7.24" + resolved "https://registry.npmjs.org/cdk8s-plus-24/-/cdk8s-plus-24-2.7.24.tgz#b64fea71220723767795e120a2faa4c25d21946c" + integrity sha512-bImiVVbTW60+ayjPf/FVYYYEi4StFDINk6dqETdDNl4pjBWgCgEJE01BcrM7Uap0zJRxikarPZnWNY1VufZ1EA== dependencies: minimatch "^3.1.2" @@ -3429,7 +3429,7 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" -commander@^10.0.1, commander@~10.0.1: +commander@^10.0.0, commander@~10.0.1: version "10.0.1" resolved "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== @@ -3540,7 +3540,7 @@ console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control- resolved "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== -constructs@^10.0.0, constructs@^10.2.17: +constructs@^10.0.0: version "10.2.17" resolved "https://registry.npmjs.org/constructs/-/constructs-10.2.17.tgz#3d3f233ca583fc6ba18611f11232c6d2be280928" integrity sha512-D3a/+iKMkBj8Elf1NIl1jBNIrK07Pg7ICBe5QEgtEKYEZOuHQvlCK9PK1f87SQ+GhtOnwSyvP+q+Pq5zBLu5kg== @@ -4245,9 +4245,9 @@ ejs@^3.1.7: jake "^10.8.5" electron-to-chromium@^1.4.284: - version "1.4.385" - resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.385.tgz#1afd8d6280d510145148777b899ff481c65531ff" - integrity sha512-L9zlje9bIw0h+CwPQumiuVlfMcV4boxRjFIWDcLfFqTZNbkwOExBzfmswytHawObQX4OUhtNv8gIiB21kOurIg== + version "1.4.388" + resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.388.tgz#ec0d1be823d5b14da56d91ec5c57e84b4624ea45" + integrity sha512-xZ0y4zjWZgp65okzwwt00f2rYibkFPHUv9qBz+Vzn8cB9UXIo9Zc6Dw81LJYhhNt0G/vR1OJEfStZ49NKl0YxQ== emittery@^0.13.1: version "0.13.1" @@ -4274,9 +4274,9 @@ end-of-stream@^1.4.1: once "^1.4.0" enhanced-resolve@^5.8.3: - version "5.13.0" - resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.13.0.tgz#26d1ecc448c02de997133217b5c1053f34a0a275" - integrity sha512-eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg== + version "5.14.0" + resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.14.0.tgz#0b6c676c8a3266c99fa281e4433a706f5c0c61c4" + integrity sha512-+DCows0XNwLDcUhbFJPdlQEVnT2zXlCv7hPxemTz86/O+B/hCQ+mb7ydkPKiflpVraqLPCAfu7lDy+hBXueojw== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -5397,9 +5397,9 @@ glob@7.1.4: path-is-absolute "^1.0.0" glob@^10.0.0, glob@^10.2.2, glob@~10.2.2: - version "10.2.2" - resolved "https://registry.npmjs.org/glob/-/glob-10.2.2.tgz#ce2468727de7e035e8ecf684669dc74d0526ab75" - integrity sha512-Xsa0BcxIC6th9UwNjZkhrMtNo/MnyRL8jGCP+uEwhA5oFOCY1f2s1/oNKY47xQ0Bg5nkjsfAEIej1VeH62bDDQ== + version "10.2.3" + resolved "https://registry.npmjs.org/glob/-/glob-10.2.3.tgz#aa6765963fe6c5936d5c2e00943e7af06302a1a7" + integrity sha512-Kb4rfmBVE3eQTAimgmeqc2LwSnN0wIOkkUL6HmxEFxNJ4fHghYHVbFba/HcGcRjE6s9KoMNK3rSOwkL4PioZjg== dependencies: foreground-child "^3.1.0" jackspeak "^2.0.3" @@ -5844,7 +5844,7 @@ ini@^3.0.0, ini@^3.0.1, ini@~3.0.0: resolved "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz#c76ec81007875bc44d544ff7a11a55d12294102d" integrity sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ== -ini@^4.1.0: +ini@^4.0.0: version "4.1.0" resolved "https://registry.npmjs.org/ini/-/ini-4.1.0.tgz#3bca65a0ae224f07f8f8b3392d8c94a7f1bb007b" integrity sha512-HLR38RSF2iulAzc3I/sma4CoYxQP844rPYCNfzGDOHqa/YqVlwuuZgBx6M50/X8dKgzk0cm1qRg3+47mK2N+cQ== @@ -8129,9 +8129,9 @@ node-fetch@2.6.7: whatwg-url "^5.0.0" node-fetch@^2.6.7: - version "2.6.9" - resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6" - integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg== + version "2.6.11" + resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25" + integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w== dependencies: whatwg-url "^5.0.0" @@ -8281,34 +8281,34 @@ npm-bundled@^3.0.0: npm-normalize-package-bin "^3.0.0" npm-check-updates@^16: - version "16.10.10" - resolved "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.10.10.tgz#1d1ee7881295b5c93f78a1999e7854d998938647" - integrity sha512-QO8gsUJRPTUltu3MqyUVgJDgG7H+oyKnpMJ5JRG40tLTPd0s6AI18gGBtq8RZiAQTeVbNkWu7C8gOEJgl3goBw== + version "16.10.12" + resolved "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.10.12.tgz#26080e2b3414ff565868a7be598a3e659382893c" + integrity sha512-js/Gg9+5RTyOQZnmFcPswLxf4sK/H5AE/8bl4tkleLJTC1gXhQqqELUFwXqppNvx488aXxN52ZY9k9MSSvEW2A== dependencies: chalk "^5.2.0" cli-table3 "^0.6.3" - commander "^10.0.1" + commander "^10.0.0" fast-memoize "^2.5.2" find-up "5.0.0" fp-and-or "^0.1.3" get-stdin "^8.0.0" globby "^11.0.4" hosted-git-info "^5.1.0" - ini "^4.1.0" + ini "^4.0.0" js-yaml "^4.1.0" json-parse-helpfulerror "^1.0.3" jsonlines "^0.1.1" lodash "^4.17.21" minimatch "^9.0.0" p-map "^4.0.0" - pacote "15.1.3" + pacote "15.1.1" parse-github-url "^1.0.2" progress "^2.0.3" prompts-ncu "^3.0.0" rc-config-loader "^4.1.2" remote-git-tags "^3.0.0" rimraf "^5.0.0" - semver "^7.5.0" + semver "^7.4.0" semver-utils "^1.1.4" source-map-support "^0.5.21" spawn-please "^2.0.1" @@ -9002,30 +9002,6 @@ pacote@15.1.1: ssri "^10.0.0" tar "^6.1.11" -pacote@15.1.3, pacote@^15.0.0, pacote@^15.0.8: - version "15.1.3" - resolved "https://registry.npmjs.org/pacote/-/pacote-15.1.3.tgz#4c0e7fb5e7ab3b27fb3f86514b451ad4c4f64e9d" - integrity sha512-aRts8cZqxiJVDitmAh+3z+FxuO3tLNWEmwDRPEpDDiZJaRz06clP4XX112ynMT5uF0QNoMPajBBHnaStUEPJXA== - dependencies: - "@npmcli/git" "^4.0.0" - "@npmcli/installed-package-contents" "^2.0.1" - "@npmcli/promise-spawn" "^6.0.1" - "@npmcli/run-script" "^6.0.0" - cacache "^17.0.0" - fs-minipass "^3.0.0" - minipass "^5.0.0" - npm-package-arg "^10.0.0" - npm-packlist "^7.0.0" - npm-pick-manifest "^8.0.0" - npm-registry-fetch "^14.0.0" - proc-log "^3.0.0" - promise-retry "^2.0.1" - read-package-json "^6.0.0" - read-package-json-fast "^3.0.0" - sigstore "^1.3.0" - ssri "^10.0.0" - tar "^6.1.11" - pacote@^13.0.3, pacote@^13.6.1, pacote@^13.6.2: version "13.6.2" resolved "https://registry.npmjs.org/pacote/-/pacote-13.6.2.tgz#0d444ba3618ab3e5cd330b451c22967bbd0ca48a" @@ -9053,6 +9029,30 @@ pacote@^13.0.3, pacote@^13.6.1, pacote@^13.6.2: ssri "^9.0.0" tar "^6.1.11" +pacote@^15.0.0, pacote@^15.0.8: + version "15.1.3" + resolved "https://registry.npmjs.org/pacote/-/pacote-15.1.3.tgz#4c0e7fb5e7ab3b27fb3f86514b451ad4c4f64e9d" + integrity sha512-aRts8cZqxiJVDitmAh+3z+FxuO3tLNWEmwDRPEpDDiZJaRz06clP4XX112ynMT5uF0QNoMPajBBHnaStUEPJXA== + dependencies: + "@npmcli/git" "^4.0.0" + "@npmcli/installed-package-contents" "^2.0.1" + "@npmcli/promise-spawn" "^6.0.1" + "@npmcli/run-script" "^6.0.0" + cacache "^17.0.0" + fs-minipass "^3.0.0" + minipass "^5.0.0" + npm-package-arg "^10.0.0" + npm-packlist "^7.0.0" + npm-pick-manifest "^8.0.0" + npm-registry-fetch "^14.0.0" + proc-log "^3.0.0" + promise-retry "^2.0.1" + read-package-json "^6.0.0" + read-package-json-fast "^3.0.0" + sigstore "^1.3.0" + ssri "^10.0.0" + tar "^6.1.11" + pako@~1.0.2: version "1.0.11" resolved "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" @@ -9375,10 +9375,10 @@ progress@^2.0.0, progress@^2.0.3: resolved "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -projen@^0.71.46: - version "0.71.46" - resolved "https://registry.npmjs.org/projen/-/projen-0.71.46.tgz#e4708b7943b897e89c00a6eabd1bd60b3a9f0dc0" - integrity sha512-8HyyTkb28pveTojJnVi6NKFaiKtcKC77Vnb+R4jsflAYAToHoKoM97WrTGxZeLaUeSNuJt8ICBdt3bJIbEye1Q== +projen@^0.71.49: + version "0.71.49" + resolved "https://registry.npmjs.org/projen/-/projen-0.71.49.tgz#df286ac23264fbef30a9d4645c4c4f2961a8cce6" + integrity sha512-3KubwhlOs5swx3thV8HZPXDW7aooEtXabyNcOnusXZbuGlYGRH+3W6NNhacH6KWNskIPUHU9i/Ly/lDlnWsm3A== dependencies: "@iarna/toml" "^2.2.5" case "^1.6.3" @@ -9739,9 +9739,9 @@ readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.0.6, readable util-deprecate "~1.0.1" readable-stream@^4.1.0: - version "4.3.0" - resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-4.3.0.tgz#0914d0c72db03b316c9733bb3461d64a3cc50cba" - integrity sha512-MuEnA0lbSi7JS8XM+WNJlWZkHAAdm7gETHdFK//Q/mChGyj2akEFtdLZh32jSdkWGbRwCW9pn6g3LWDdDeZnBQ== + version "4.4.0" + resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.0.tgz#55ce132d60a988c460d75c631e9ccf6a7229b468" + integrity sha512-kDMOq0qLtxV9f/SQv522h8cxZBqNZXuXNyjyezmfAAuribMyVXziljpQ/uQhfE1XLg2/TLTW2DsnoE4VAi/krg== dependencies: abort-controller "^3.0.0" buffer "^6.0.3" @@ -10084,7 +10084,7 @@ semver@7.3.8: dependencies: lru-cache "^6.0.0" -semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.0: +semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.4.0, semver@^7.5.0: version "7.5.0" resolved "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0" integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA== @@ -10945,11 +10945,12 @@ tsutils@^3.21.0: tslib "^1.8.1" tuf-js@^1.1.3: - version "1.1.5" - resolved "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.5.tgz#ad82a18c5db42f142d2d2e15d6d25655e30c03c3" - integrity sha512-inqodgxdsmuxrtQVbu6tPNgRKWD1Boy3VB6GO7KczJZpAHiTukwhSzXUSzvDcw5pE2Jo8ua+e1ykpHv7VdPVlQ== + version "1.1.6" + resolved "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.6.tgz#ad3e7a20237b83b51c2a8f9d1ddf093279a10fc2" + integrity sha512-CXwFVIsXGbVY4vFiWF7TJKWmlKJAT8TWkH4RmiohJRcDJInix++F0dznDmoVbtJNzZ8yLprKUG4YrDIhv3nBMg== dependencies: "@tufjs/models" "1.0.4" + debug "^4.3.4" make-fetch-happen "^11.1.0" tunnel@^0.0.6: @@ -11077,9 +11078,9 @@ typescript@^3.9.10, typescript@^3.9.5, typescript@^3.9.7, typescript@~3.9.10: integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q== typescript@next: - version "5.1.0-dev.20230508" - resolved "https://registry.npmjs.org/typescript/-/typescript-5.1.0-dev.20230508.tgz#610ec5682b481852735754d6326d2de489137186" - integrity sha512-87gFJLsUB0IWN6/MUhh0QHS+qnLR5gTGwZr5vU5dYEVPv+VTNv/g2oXLWr5LCEP+hyj+a4LXx8QjCD7x6v+5wg== + version "5.1.0-dev.20230510" + resolved "https://registry.npmjs.org/typescript/-/typescript-5.1.0-dev.20230510.tgz#4b42ecd76c179dcf87785f8adf9a9737e53a38b9" + integrity sha512-jtCZp40/FBD7Tlj916Dv7bbr+NJK1ZYXoODwxKNBSuZTGeuijogC3k78zp84rij3uxY+F+HFl30cIpMm5i/iAQ== typescript@~5.0.4: version "5.0.4"