Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(aws-cdk-lib): enable eslint #25515

Merged
merged 13 commits into from
May 11, 2023
Merged

chore(aws-cdk-lib): enable eslint #25515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3c6292e
use tsconfig.dev for eslint
mrgrain May 10, 2023
77b437e
re-enable eslint
mrgrain May 10, 2023
5f42b00
auto-fix
mrgrain May 10, 2023
dcee2fd
missing deps
mrgrain May 10, 2023
f6042a7
fix aws partition
mrgrain May 10, 2023
255cf0d
more partition fix
mrgrain May 10, 2023
3365595
import order
mrgrain May 10, 2023
01caa61
create correct new submodules that pass the linter
mrgrain May 10, 2023
d5233e4
unit test fixes for partition in arn
mrgrain May 11, 2023
2ae4fd3
integ test aws-codepipeline-actions/test/integ.pipeilne-elastic-beans…
mrgrain May 11, 2023
52d365c
aws-ses/test/integ.configuration-set
mrgrain May 11, 2023
d2e0ad2
secret rotation handles partitions explicitly
mrgrain May 11, 2023
7d132ff
Merge branch 'main' into mrgrain/fix/enable-eslint-aws-cdk-lib
mergify[bot] May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 5 additions & 5 deletions ...ic-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}
}
Expand Down Expand Up @@ -53,15 +53,15 @@
}
}
},
"700b33b613fbd899489f08c591ff8e002d433573bc48eca4a106e66109f3087f": {
"533487c9e5a2cc1009e664662485074855ae58bca4728d59bdebc81acf8e7e3b": {
"source": {
"path": "aws-cdk-codepipeline-elastic-beanstalk-deploy.template.json",
"packaging": "file"
},
"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}"
}
}
Expand Down
17 changes: 14 additions & 3 deletions ...-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "68b22621fff135f9e3f225bad7ff80fdf2f45c3d9910af601206a0d9b279933a.zip"
"S3Key": "6a28458f7bc3d04e4d2b17f9c3da0709bf456e34b06ea7c96111eecb2fddd054.zip"
},
"Description": "/opt/awscli/aws"
}
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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"
]
]
}
]
}
},
Expand Down
7 changes: 5 additions & 2 deletions ...depipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -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": [
Expand Down
29 changes: 20 additions & 9 deletions ...s-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/tree.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
"s3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"s3Key": "68b22621fff135f9e3f225bad7ff80fdf2f45c3d9910af601206a0d9b279933a.zip"
"s3Key": "6a28458f7bc3d04e4d2b17f9c3da0709bf456e34b06ea7c96111eecb2fddd054.zip"
},
"description": "/opt/awscli/aws"
}
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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"
]
]
}
]
}
},
Expand Down Expand Up @@ -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"
}
}
},
Expand Down Expand Up @@ -1316,7 +1327,7 @@
"path": "codepipeline-elastic-beanstalk-deploy/DefaultTest/Default",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"version": "10.2.17"
}
},
"DeployAssert": {
Expand Down Expand Up @@ -1362,7 +1373,7 @@
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"version": "10.2.17"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion ...ework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Binary file added ...t.js.snapshot/.cache/0f8a80f5f2310ea7e3295258fdbb79c43a1e8c0a11e863e63dc82832599412ed.zip
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions ...-ses/test/integ.configuration-set.js.snapshot/cdk-ses-configuration-set-integ.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "31.0.0",
"files": {
"cd65988992d4e34f7f8904d852fb1dd37bab88445e48e7880cbbf26d934cc065": {
"bd889c61b6018acea6fdd262c97b73b9af12855427e235914757eaeea73396ba": {
"source": {
"path": "cdk-ses-configuration-set-integ.template.json",
"packaging": "file"
},
"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}"
}
}
Expand Down
6 changes: 5 additions & 1 deletion ...es/test/integ.configuration-set.js.snapshot/cdk-ses-configuration-set-integ.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,11 @@
"Fn::Join": [
"",
[
"arn:aws:ses:",
"arn:",
{
"Ref": "AWS::Partition"
},
":ses:",
{
"Ref": "AWS::Region"
},
Expand Down
2 changes: 1 addition & 1 deletion ...cdk-testing/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/cdk.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"20.0.0"}
{"version":"31.0.0"}
2 changes: 1 addition & 1 deletion ...sting/framework-integ/test/aws-ses/test/integ.configuration-set.js.snapshot/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Loading