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

fix(eks): cluster-resource-handler fails to verify delete operations #26375

Closed
wants to merge 9 commits into from
Closed

fix(eks): cluster-resource-handler fails to verify delete operations #26375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
62a3bb2
fix onDelete handler to catch httpResponseCode for exceptions
kishiel Jul 11, 2023
c38e784
Differentiate ipv6/v4 stack names, remove duplicate helm chart test
kishiel Jul 11, 2023
6015fb6
Fix fargate onDelete to use httpResponseCode
kishiel Jul 11, 2023
8c9310d
Remove ngnix components due to breaking changes
kishiel Jul 13, 2023
fecbfcf
eks snapshots partial
kishiel Jul 13, 2023
6b9bdcc
aws-stepfunctions-tasks snapshots
kishiel Jul 13, 2023
fa9a2aa
bottlerocket snapshots
kishiel Jul 14, 2023
933f772
cluster snapshot
kishiel Jul 14, 2023
8eb6cce
imported cluster snapshot
kishiel Jul 14, 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
  •  
  •  
  •  
0 ...5aa8dfa55496bbc7717623351649/cluster.d.ts → ...a14a4236becaac93bf7f9fe70e92/cluster.d.ts
View file
Open in desktop
File renamed without changes.
277 changes: 277 additions & 0 deletions ...napshot/asset.5c9562d0ac61a1465a168c71e161265c2578a14a4236becaac93bf7f9fe70e92/cluster.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions ...095aa8dfa55496bbc7717623351649/cluster.ts → ...78a14a4236becaac93bf7f9fe70e92/cluster.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export class ClusterResourceHandler extends ResourceHandler {
try {
await this.eks.deleteCluster({ name: this.clusterName });
} catch (e: any) {
if (e.code !== 'ResourceNotFoundException') {
if (e.$metadata.httpStatusCode !== 404) {
throw e;
} else {
console.log(`cluster ${this.clusterName} not found, idempotently succeeded`);
Expand All @@ -88,8 +88,8 @@ export class ClusterResourceHandler extends ResourceHandler {
const resp = await this.eks.describeCluster({ name: this.clusterName });
console.log('describeCluster returned:', JSON.stringify(resp, undefined, 2));
} catch (e: any) {
if (e.code === 'ResourceNotFoundException') {
console.log('received ResourceNotFoundException, this means the cluster has been deleted (or never existed)');
if (e.$metadata.httpStatusCode === 404) {
console.log('received 404, this means the cluster has been deleted (or never existed)');
return { IsComplete: true };
}

Expand Down
0 ...95aa8dfa55496bbc7717623351649/common.d.ts → ...8a14a4236becaac93bf7f9fe70e92/common.d.ts
View file
Open in desktop
File renamed without changes.
0 ...e095aa8dfa55496bbc7717623351649/common.js → ...578a14a4236becaac93bf7f9fe70e92/common.js
View file
Open in desktop
File renamed without changes.
0 ...e095aa8dfa55496bbc7717623351649/common.ts → ...578a14a4236becaac93bf7f9fe70e92/common.ts
View file
Open in desktop
File renamed without changes.
0 ...55496bbc7717623351649/compareLogging.d.ts → ...6becaac93bf7f9fe70e92/compareLogging.d.ts
View file
Open in desktop
File renamed without changes.
0 ...fa55496bbc7717623351649/compareLogging.js → ...236becaac93bf7f9fe70e92/compareLogging.js
View file
Open in desktop
File renamed without changes.
0 ...fa55496bbc7717623351649/compareLogging.ts → ...236becaac93bf7f9fe70e92/compareLogging.ts
View file
Open in desktop
File renamed without changes.
0 ...95aa8dfa55496bbc7717623351649/consts.d.ts → ...8a14a4236becaac93bf7f9fe70e92/consts.d.ts
View file
Open in desktop
File renamed without changes.
0 ...e095aa8dfa55496bbc7717623351649/consts.js → ...578a14a4236becaac93bf7f9fe70e92/consts.js
View file
Open in desktop
File renamed without changes.
0 ...e095aa8dfa55496bbc7717623351649/consts.ts → ...578a14a4236becaac93bf7f9fe70e92/consts.ts
View file
Open in desktop
File renamed without changes.
0 ...5aa8dfa55496bbc7717623351649/fargate.d.ts → ...a14a4236becaac93bf7f9fe70e92/fargate.d.ts
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...095aa8dfa55496bbc7717623351649/fargate.js → ...78a14a4236becaac93bf7f9fe70e92/fargate.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...095aa8dfa55496bbc7717623351649/fargate.ts → ...78a14a4236becaac93bf7f9fe70e92/fargate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ export class FargateProfileResourceHandler extends ResourceHandler {

return status;
} catch (describeFargateProfileError: any) {
if (describeFargateProfileError.code === 'ResourceNotFoundException') {
this.log('received ResourceNotFoundException, this means the profile has been deleted (or never existed)');
if (describeFargateProfileError.$metadata.httpStatusCode === 404) {
this.log('received 404, this means the profile has been deleted (or never existed)');
return 'NOT_FOUND';
}

Expand Down
0 ...095aa8dfa55496bbc7717623351649/index.d.ts → ...78a14a4236becaac93bf7f9fe70e92/index.d.ts
View file
Open in desktop
File renamed without changes.
0 ...8e095aa8dfa55496bbc7717623351649/index.js → ...2578a14a4236becaac93bf7f9fe70e92/index.js
View file
Open in desktop
File renamed without changes.
0 ...8e095aa8dfa55496bbc7717623351649/index.ts → ...2578a14a4236becaac93bf7f9fe70e92/index.ts
View file
Open in desktop
File renamed without changes.
277 changes: 0 additions & 277 deletions ...napshot/asset.a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649/cluster.js
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions ...test/integ.alb-controller.js.snapshot/aws-cdk-eks-cluster-alb-controller-test.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
}
}
},
"a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649": {
"5c9562d0ac61a1465a168c71e161265c2578a14a4236becaac93bf7f9fe70e92": {
"source": {
"path": "asset.a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649",
"path": "asset.5c9562d0ac61a1465a168c71e161265c2578a14a4236becaac93bf7f9fe70e92",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip",
"objectKey": "5c9562d0ac61a1465a168c71e161265c2578a14a4236becaac93bf7f9fe70e92.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down Expand Up @@ -118,15 +118,15 @@
}
}
},
"5668822355521ba6595d0d082996b9c5c1d1b047f32bd57bf98780960aadea2d": {
"0d97acfcabaa747fb659c83ba64f5ac8c8a4cd6de673da0605fcb611a9b95e20": {
"source": {
"path": "awscdkeksclusteralbcontrollertestawscdkawseksClusterResourceProvider5DBBAFBB.nested.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "5668822355521ba6595d0d082996b9c5c1d1b047f32bd57bf98780960aadea2d.json",
"objectKey": "0d97acfcabaa747fb659c83ba64f5ac8c8a4cd6de673da0605fcb611a9b95e20.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand All @@ -144,15 +144,15 @@
}
}
},
"d22501e675c0b5ebc6b919ce32ebad5790ef1f1c3a24785733a1ea78217ecc54": {
"9e28c564f70c57302958f9eba9a956bd712cd97d5b23d4c018368b43228b2e45": {
"source": {
"path": "aws-cdk-eks-cluster-alb-controller-test.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "d22501e675c0b5ebc6b919ce32ebad5790ef1f1c3a24785733a1ea78217ecc54.json",
"objectKey": "9e28c564f70c57302958f9eba9a956bd712cd97d5b23d4c018368b43228b2e45.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...st/integ.alb-controller.js.snapshot/aws-cdk-eks-cluster-alb-controller-test.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,7 +1055,7 @@
{
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"/5668822355521ba6595d0d082996b9c5c1d1b047f32bd57bf98780960aadea2d.json"
"/0d97acfcabaa747fb659c83ba64f5ac8c8a4cd6de673da0605fcb611a9b95e20.json"
]
]
}
Expand Down
4 changes: 2 additions & 2 deletions ...sclusteralbcontrollertestawscdkawseksClusterResourceProvider5DBBAFBB.nested.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip"
"S3Key": "5c9562d0ac61a1465a168c71e161265c2578a14a4236becaac93bf7f9fe70e92.zip"
},
"Role": {
"Fn::GetAtt": [
Expand Down Expand Up @@ -115,7 +115,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip"
"S3Key": "5c9562d0ac61a1465a168c71e161265c2578a14a4236becaac93bf7f9fe70e92.zip"
},
"Role": {
"Fn::GetAtt": [
Expand Down
1 change: 1 addition & 0 deletions ...cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/integ.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"stacks": [
"aws-cdk-eks-cluster-alb-controller-test"
],
"diffAssets": true,
"assertionStack": "aws-cdk-cluster-alb-controller/DefaultTest/DeployAssert",
"assertionStackName": "awscdkclusteralbcontrollerDefaultTestDeployAssert78AE94CA"
}
Expand Down
2 changes: 1 addition & 1 deletion ...-testing/framework-integ/test/aws-eks/test/integ.alb-controller.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}/d22501e675c0b5ebc6b919ce32ebad5790ef1f1c3a24785733a1ea78217ecc54.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9e28c564f70c57302958f9eba9a956bd712cd97d5b23d4c018368b43228b2e45.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down
6 changes: 3 additions & 3 deletions ...-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/tree.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1563,7 +1563,7 @@
"s3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip"
"s3Key": "5c9562d0ac61a1465a168c71e161265c2578a14a4236becaac93bf7f9fe70e92.zip"
},
"role": {
"Fn::GetAtt": [
Expand Down Expand Up @@ -1695,7 +1695,7 @@
"s3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip"
"s3Key": "5c9562d0ac61a1465a168c71e161265c2578a14a4236becaac93bf7f9fe70e92.zip"
},
"role": {
"Fn::GetAtt": [
Expand Down Expand Up @@ -2601,7 +2601,7 @@
{
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"/5668822355521ba6595d0d082996b9c5c1d1b047f32bd57bf98780960aadea2d.json"
"/0d97acfcabaa747fb659c83ba64f5ac8c8a4cd6de673da0605fcb611a9b95e20.json"
]
]
}
Expand Down
0 ...5aa8dfa55496bbc7717623351649/cluster.d.ts → ...a14a4236becaac93bf7f9fe70e92/cluster.d.ts
View file
Open in desktop
File renamed without changes.
Loading
Loading