Skip to content

Commit 95c06e2

Browse files
authored
chore(eks): onUpdate improve error message and allow concurrent updateTag (#33975)
### Issue # (if applicable) Closes #33452 ### Description of changes - Add missing update types to validation error message - Allow `updateTag` concurrently with other updates - Fix failing `cluster-resource-handler-mocks.ts` ### Description of how you validated changes Unit + Integ ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 88e04f0 commit 95c06e2

19 files changed

+149
-4240
lines changed

packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-tags.js.snapshot/EKSTagStack.assets.json

+25-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-tags.js.snapshot/EKSTagStack.template.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -402,9 +402,9 @@
402402
"S3Bucket": {
403403
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
404404
},
405-
"S3Key": "9953ad4c3e84d120643ece4b2e51caf43fd9850063641b4d78bf30fbe6b4d381.zip"
405+
"S3Key": "a5110b475e7a506b8a1282cdfb3c2f7ae59bcf00ba96273a702339b8819dd17f.zip"
406406
},
407-
"Description": "/opt/kubectl/kubectl 1.30; /opt/helm/helm 3.17.1",
407+
"Description": "/opt/kubectl/kubectl 1.31.0; /opt/helm/helm 3.17.1",
408408
"LicenseInfo": "Apache-2.0"
409409
}
410410
},
@@ -723,7 +723,7 @@
723723
]
724724
},
725725
"Config": {
726-
"version": "1.30",
726+
"version": "1.31",
727727
"roleArn": {
728728
"Fn::GetAtt": [
729729
"ClusterRoleFA261979",
@@ -760,7 +760,7 @@
760760
"endpointPrivateAccess": true
761761
},
762762
"tags": {
763-
"foo": "bar"
763+
"foo": "world"
764764
},
765765
"accessConfig": {}
766766
},
@@ -831,7 +831,7 @@
831831
{
832832
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
833833
},
834-
"/d70b3b5020d5cd271ecd23004ac3c98bcb69fbcb9a4f6c1d449cc4f5b04f527f.json"
834+
"/6c0ec8690bb2a81b7f186ce623fc2755f7ba906598d65bce5679c7680a0ca1b0.json"
835835
]
836836
]
837837
}
@@ -881,7 +881,7 @@
881881
{
882882
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
883883
},
884-
"/2fdf6d5632557c277bb79cdfef7883900b471ba98050c75c5d63b9e12c12aa2d.json"
884+
"/725ff6502489cf9b18bc7a38fc66b6f0a3eacef43e47fb260507c201131ba40e.json"
885885
]
886886
]
887887
}

packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-tags.js.snapshot/EKSTagStackawscdkawseksClusterResourceProviderD3984169.nested.template.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"S3Bucket": {
5151
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
5252
},
53-
"S3Key": "3e3beb1ec50447453ff75bc32446f8d3144f8a15d316f7c68770413524d7e812.zip"
53+
"S3Key": "5e26fe1db8ce3c4e3a4463e9e01996ba9baa7f2e468aa7ce30fd593883b306ab.zip"
5454
},
5555
"Description": "onEvent handler for EKS cluster resource provider",
5656
"Environment": {
@@ -123,7 +123,7 @@
123123
"S3Bucket": {
124124
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
125125
},
126-
"S3Key": "3e3beb1ec50447453ff75bc32446f8d3144f8a15d316f7c68770413524d7e812.zip"
126+
"S3Key": "5e26fe1db8ce3c4e3a4463e9e01996ba9baa7f2e468aa7ce30fd593883b306ab.zip"
127127
},
128128
"Description": "isComplete handler for EKS cluster resource provider",
129129
"Environment": {

packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-tags.js.snapshot/EKSTagStackawscdkawseksKubectlProvider64339FC8.nested.template.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"S3Bucket": {
5555
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
5656
},
57-
"S3Key": "1c5a2ab1d1e53b0672a644454aab3dbb258ccd0079c92ad0e23b95b2c2079f70.zip"
57+
"S3Key": "12157b27d30ab71eb24ae65825f672ba5cc2c09dbb1703cd7adfcff3aeaca136.zip"
5858
},
5959
"Description": "/opt/awscli/aws"
6060
}

packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-tags.js.snapshot/asset.1c5a2ab1d1e53b0672a644454aab3dbb258ccd0079c92ad0e23b95b2c2079f70.zip

-3
This file was deleted.

0 commit comments

Comments
 (0)