42 changes: 21 additions & 21 deletions ...nteg.eks-bottlerocket-ng.js.snapshot/aws-cdk-eks-cluster-bottlerocket-ng-test.assets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,106 +14,106 @@
}
}
},
"ad44c2b0638f04871c889d78e71dea90ffae67b9cc4aa4366d5102db42435ee1": {
"75dfa9114a30421542432dcb55212f010f591a9e3bd203ae98ba3f9bedf5bb31": {
"source": {
"path": "asset.ad44c2b0638f04871c889d78e71dea90ffae67b9cc4aa4366d5102db42435ee1.zip",
"path": "asset.75dfa9114a30421542432dcb55212f010f591a9e3bd203ae98ba3f9bedf5bb31.zip",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "ad44c2b0638f04871c889d78e71dea90ffae67b9cc4aa4366d5102db42435ee1.zip",
"objectKey": "75dfa9114a30421542432dcb55212f010f591a9e3bd203ae98ba3f9bedf5bb31.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"68b8fc42fe6d1eb6e6c39212ce770fac02511440fecfc5b69a904fe8a19f6b8e": {
"a21fb971385f0210c6b1c88a25f1b9986bae4e4e1bca8d4aa818c442e1878ddf": {
"source": {
"path": "asset.68b8fc42fe6d1eb6e6c39212ce770fac02511440fecfc5b69a904fe8a19f6b8e",
"path": "asset.a21fb971385f0210c6b1c88a25f1b9986bae4e4e1bca8d4aa818c442e1878ddf",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "68b8fc42fe6d1eb6e6c39212ce770fac02511440fecfc5b69a904fe8a19f6b8e.zip",
"objectKey": "a21fb971385f0210c6b1c88a25f1b9986bae4e4e1bca8d4aa818c442e1878ddf.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"1eabd374284db340b74179e3429008132f5b6b0b7b28d472d852807d7f5f9746": {
"45017ac1fb5b50dac36a255c328b0fe125f18a8e6d3689e188eab5e3a1bf8146": {
"source": {
"path": "asset.1eabd374284db340b74179e3429008132f5b6b0b7b28d472d852807d7f5f9746",
"path": "asset.45017ac1fb5b50dac36a255c328b0fe125f18a8e6d3689e188eab5e3a1bf8146",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "1eabd374284db340b74179e3429008132f5b6b0b7b28d472d852807d7f5f9746.zip",
"objectKey": "45017ac1fb5b50dac36a255c328b0fe125f18a8e6d3689e188eab5e3a1bf8146.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"2427a81588377445b76031dc4adb9190776c951949a535cb32fde3ba6db8ee92": {
"9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b": {
"source": {
"path": "asset.2427a81588377445b76031dc4adb9190776c951949a535cb32fde3ba6db8ee92",
"path": "asset.9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "2427a81588377445b76031dc4adb9190776c951949a535cb32fde3ba6db8ee92.zip",
"objectKey": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"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}"
}
}
},
"d2dcbab40708a36ea81bce8f057d64ddfbe9f657303a6a201684fbd5bfd3185e": {
"38d5c2557dde2231c3bf37517f1b2cc1c13014847748a31898d19017f497debd": {
"source": {
"path": "awscdkeksclusterbottlerocketngtestawscdkawseksClusterResourceProvider7EC04E81.nested.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "d2dcbab40708a36ea81bce8f057d64ddfbe9f657303a6a201684fbd5bfd3185e.json",
"objectKey": "38d5c2557dde2231c3bf37517f1b2cc1c13014847748a31898d19017f497debd.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"2f3af4bbf084bc07add0d02946a0a6cb466716259665107d07ce400fec7df7eb": {
"ffc809d7378b762d8b15fe685c95b5f6780b0eb30aa6f2675be9fce592e0fb28": {
"source": {
"path": "awscdkeksclusterbottlerocketngtestawscdkawseksKubectlProviderE02BC096.nested.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "2f3af4bbf084bc07add0d02946a0a6cb466716259665107d07ce400fec7df7eb.json",
"objectKey": "ffc809d7378b762d8b15fe685c95b5f6780b0eb30aa6f2675be9fce592e0fb28.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"05bd0b78da02eda33a8390beda604618ea4902a384b3f64a07f1b79a28be28a8": {
"8b1e099510cf85d33b59f258d89efc15f379d1f06face0a4c519c6cb5f33d9b5": {
"source": {
"path": "aws-cdk-eks-cluster-bottlerocket-ng-test.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "05bd0b78da02eda33a8390beda604618ea4902a384b3f64a07f1b79a28be28a8.json",
"objectKey": "8b1e099510cf85d33b59f258d89efc15f379d1f06face0a4c519c6cb5f33d9b5.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
179 changes: 146 additions & 33 deletions ...eg.eks-bottlerocket-ng.js.snapshot/aws-cdk-eks-cluster-bottlerocket-ng-test.template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,117 @@
"LicenseInfo": "Apache-2.0"
}
},
"ClusterKubectlHandlerRole94549F93": {
"Type": "AWS::IAM::Role",
"Properties": {
"AssumeRolePolicyDocument": {
"Statement": [
{
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "lambda.amazonaws.com"
}
}
],
"Version": "2012-10-17"
},
"ManagedPolicyArns": [
{
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
]
]
},
{
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole"
]
]
},
{
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":iam::aws:policy/AmazonEC2ContainerRegistryReadOnly"
]
]
},
{
"Fn::If": [
"ClusterHasEcrPublic8EE1114E",
{
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":iam::aws:policy/AmazonElasticContainerRegistryPublicReadOnly"
]
]
},
{
"Ref": "AWS::NoValue"
}
]
}
]
}
},
"ClusterKubectlHandlerRoleDefaultPolicyE44083DD": {
"Type": "AWS::IAM::Policy",
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": "eks:DescribeCluster",
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"Cluster9EE0221C",
"Arn"
]
}
},
{
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"ClusterCreationRole360249B6",
"Arn"
]
}
}
],
"Version": "2012-10-17"
},
"PolicyName": "ClusterKubectlHandlerRoleDefaultPolicyE44083DD",
"Roles": [
{
"Ref": "ClusterKubectlHandlerRole94549F93"
}
]
}
},
"ClusterRoleFA261979": {
"Type": "AWS::IAM::Role",
"Properties": {
Expand Down Expand Up @@ -496,22 +607,26 @@
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"AWS": {
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":iam::",
{
"Ref": "AWS::AccountId"
},
":root"
"AWS": [
{
"Fn::GetAtt": [
"ClusterKubectlHandlerRole94549F93",
"Arn"
]
]
}
},
{
"Fn::GetAtt": [
"awscdkawseksClusterResourceProviderNestedStackawscdkawseksClusterResourceProviderNestedStackResource9827C454",
"Outputs.awscdkeksclusterbottlerocketngtestawscdkawseksClusterResourceProviderIsCompleteHandlerServiceRoleE74A431FArn"
]
},
{
"Fn::GetAtt": [
"awscdkawseksClusterResourceProviderNestedStackawscdkawseksClusterResourceProviderNestedStackResource9827C454",
"Outputs.awscdkeksclusterbottlerocketngtestawscdkawseksClusterResourceProviderOnEventHandlerServiceRoleF2D7A6FBArn"
]
}
]
}
}
],
Expand Down Expand Up @@ -972,17 +1087,9 @@
{
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"/d2dcbab40708a36ea81bce8f057d64ddfbe9f657303a6a201684fbd5bfd3185e.json"
"/38d5c2557dde2231c3bf37517f1b2cc1c13014847748a31898d19017f497debd.json"
]
]
},
"Parameters": {
"referencetoawscdkeksclusterbottlerocketngtestClusterCreationRole94E8BD1EArn": {
"Fn::GetAtt": [
"ClusterCreationRole360249B6",
"Arn"
]
}
}
},
"UpdateReplacePolicy": "Delete",
Expand All @@ -1007,20 +1114,14 @@
{
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"/2f3af4bbf084bc07add0d02946a0a6cb466716259665107d07ce400fec7df7eb.json"
"/ffc809d7378b762d8b15fe685c95b5f6780b0eb30aa6f2675be9fce592e0fb28.json"
]
]
},
"Parameters": {
"referencetoawscdkeksclusterbottlerocketngtestCluster81B40D2EArn": {
"Fn::GetAtt": [
"Cluster9EE0221C",
"Arn"
]
},
"referencetoawscdkeksclusterbottlerocketngtestClusterCreationRole94E8BD1EArn": {
"referencetoawscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn": {
"Fn::GetAtt": [
"ClusterCreationRole360249B6",
"ClusterKubectlHandlerRole94549F93",
"Arn"
]
},
Expand All @@ -1042,6 +1143,8 @@
}
},
"DependsOn": [
"ClusterKubectlHandlerRoleDefaultPolicyE44083DD",
"ClusterKubectlHandlerRole94549F93",
"VpcPrivateSubnet1DefaultRouteBE02A9ED",
"VpcPrivateSubnet1RouteTableAssociation70C59FA6",
"VpcPrivateSubnet2DefaultRoute060D2087",
Expand All @@ -1051,6 +1154,16 @@
"DeletionPolicy": "Delete"
}
},
"Conditions": {
"ClusterHasEcrPublic8EE1114E": {
"Fn::Equals": [
{
"Ref": "AWS::Partition"
},
"aws"
]
}
},
"Outputs": {
"ClusterConfigCommand43AAE40F": {
"Value": {
Expand Down
81 changes: 22 additions & 59 deletions ...clusterbottlerocketngtestawscdkawseksClusterResourceProvider7EC04E81.nested.template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "ad44c2b0638f04871c889d78e71dea90ffae67b9cc4aa4366d5102db42435ee1.zip"
"S3Key": "75dfa9114a30421542432dcb55212f010f591a9e3bd203ae98ba3f9bedf5bb31.zip"
},
"Description": "/opt/nodejs/node_modules/proxy-agent"
}
Expand Down Expand Up @@ -43,37 +43,14 @@
]
}
},
"OnEventHandlerServiceRoleDefaultPolicyC57085D4": {
"Type": "AWS::IAM::Policy",
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Resource": {
"Ref": "referencetoawscdkeksclusterbottlerocketngtestClusterCreationRole94E8BD1EArn"
}
}
],
"Version": "2012-10-17"
},
"PolicyName": "OnEventHandlerServiceRoleDefaultPolicyC57085D4",
"Roles": [
{
"Ref": "OnEventHandlerServiceRole15A26729"
}
]
}
},
"OnEventHandler42BEBAE0": {
"Type": "AWS::Lambda::Function",
"Properties": {
"Code": {
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "68b8fc42fe6d1eb6e6c39212ce770fac02511440fecfc5b69a904fe8a19f6b8e.zip"
"S3Key": "a21fb971385f0210c6b1c88a25f1b9986bae4e4e1bca8d4aa818c442e1878ddf.zip"
},
"Role": {
"Fn::GetAtt": [
Expand All @@ -97,7 +74,6 @@
"Timeout": 60
},
"DependsOn": [
"OnEventHandlerServiceRoleDefaultPolicyC57085D4",
"OnEventHandlerServiceRole15A26729"
]
},
Expand Down Expand Up @@ -132,37 +108,14 @@
]
}
},
"IsCompleteHandlerServiceRoleDefaultPolicy8F64197B": {
"Type": "AWS::IAM::Policy",
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Resource": {
"Ref": "referencetoawscdkeksclusterbottlerocketngtestClusterCreationRole94E8BD1EArn"
}
}
],
"Version": "2012-10-17"
},
"PolicyName": "IsCompleteHandlerServiceRoleDefaultPolicy8F64197B",
"Roles": [
{
"Ref": "IsCompleteHandlerServiceRole5810CC58"
}
]
}
},
"IsCompleteHandler7073F4DA": {
"Type": "AWS::Lambda::Function",
"Properties": {
"Code": {
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "68b8fc42fe6d1eb6e6c39212ce770fac02511440fecfc5b69a904fe8a19f6b8e.zip"
"S3Key": "a21fb971385f0210c6b1c88a25f1b9986bae4e4e1bca8d4aa818c442e1878ddf.zip"
},
"Role": {
"Fn::GetAtt": [
Expand All @@ -186,7 +139,6 @@
"Timeout": 60
},
"DependsOn": [
"IsCompleteHandlerServiceRoleDefaultPolicy8F64197B",
"IsCompleteHandlerServiceRole5810CC58"
]
},
Expand Down Expand Up @@ -297,7 +249,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "1eabd374284db340b74179e3429008132f5b6b0b7b28d472d852807d7f5f9746.zip"
"S3Key": "45017ac1fb5b50dac36a255c328b0fe125f18a8e6d3689e188eab5e3a1bf8146.zip"
},
"Role": {
"Fn::GetAtt": [
Expand Down Expand Up @@ -434,7 +386,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "1eabd374284db340b74179e3429008132f5b6b0b7b28d472d852807d7f5f9746.zip"
"S3Key": "45017ac1fb5b50dac36a255c328b0fe125f18a8e6d3689e188eab5e3a1bf8146.zip"
},
"Role": {
"Fn::GetAtt": [
Expand Down Expand Up @@ -568,7 +520,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "1eabd374284db340b74179e3429008132f5b6b0b7b28d472d852807d7f5f9746.zip"
"S3Key": "45017ac1fb5b50dac36a255c328b0fe125f18a8e6d3689e188eab5e3a1bf8146.zip"
},
"Role": {
"Fn::GetAtt": [
Expand Down Expand Up @@ -720,6 +672,22 @@
}
},
"Outputs": {
"awscdkeksclusterbottlerocketngtestawscdkawseksClusterResourceProviderOnEventHandlerServiceRoleF2D7A6FBArn": {
"Value": {
"Fn::GetAtt": [
"OnEventHandlerServiceRole15A26729",
"Arn"
]
}
},
"awscdkeksclusterbottlerocketngtestawscdkawseksClusterResourceProviderIsCompleteHandlerServiceRoleE74A431FArn": {
"Value": {
"Fn::GetAtt": [
"IsCompleteHandlerServiceRole5810CC58",
"Arn"
]
}
},
"awscdkeksclusterbottlerocketngtestawscdkawseksClusterResourceProviderframeworkonEventCB851FF9Arn": {
"Value": {
"Fn::GetAtt": [
Expand All @@ -728,10 +696,5 @@
]
}
}
},
"Parameters": {
"referencetoawscdkeksclusterbottlerocketngtestClusterCreationRole94E8BD1EArn": {
"Type": "String"
}
}
}
137 changes: 6 additions & 131 deletions ...wscdkeksclusterbottlerocketngtestawscdkawseksKubectlProviderE02BC096.nested.template.json
View file
Original file line number Diff line number Diff line change
@@ -1,124 +1,16 @@
{
"Resources": {
"HandlerServiceRoleFCDC14AE": {
"Type": "AWS::IAM::Role",
"Properties": {
"AssumeRolePolicyDocument": {
"Statement": [
{
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "lambda.amazonaws.com"
}
}
],
"Version": "2012-10-17"
},
"ManagedPolicyArns": [
{
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
]
]
},
{
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole"
]
]
},
{
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":iam::aws:policy/AmazonEC2ContainerRegistryReadOnly"
]
]
},
{
"Fn::If": [
"HasEcrPublic",
{
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":iam::aws:policy/AmazonElasticContainerRegistryPublicReadOnly"
]
]
},
{
"Ref": "AWS::NoValue"
}
]
}
]
}
},
"HandlerServiceRoleDefaultPolicyCBD0CC91": {
"Type": "AWS::IAM::Policy",
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": "eks:DescribeCluster",
"Effect": "Allow",
"Resource": {
"Ref": "referencetoawscdkeksclusterbottlerocketngtestCluster81B40D2EArn"
}
},
{
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Resource": {
"Ref": "referencetoawscdkeksclusterbottlerocketngtestClusterCreationRole94E8BD1EArn"
}
}
],
"Version": "2012-10-17"
},
"PolicyName": "HandlerServiceRoleDefaultPolicyCBD0CC91",
"Roles": [
{
"Ref": "HandlerServiceRoleFCDC14AE"
}
]
}
},
"Handler886CB40B": {
"Type": "AWS::Lambda::Function",
"Properties": {
"Code": {
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "2427a81588377445b76031dc4adb9190776c951949a535cb32fde3ba6db8ee92.zip"
"S3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip"
},
"Role": {
"Fn::GetAtt": [
"HandlerServiceRoleFCDC14AE",
"Arn"
]
"Ref": "referencetoawscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn"
},
"Description": "onEvent handler for EKS kubectl resource provider",
"Handler": "index.handler",
Expand Down Expand Up @@ -148,11 +40,7 @@
}
]
}
},
"DependsOn": [
"HandlerServiceRoleDefaultPolicyCBD0CC91",
"HandlerServiceRoleFCDC14AE"
]
}
},
"AwsCliLayerF44AAF94": {
"Type": "AWS::Lambda::LayerVersion",
Expand All @@ -161,7 +49,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 @@ -258,7 +146,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "1eabd374284db340b74179e3429008132f5b6b0b7b28d472d852807d7f5f9746.zip"
"S3Key": "45017ac1fb5b50dac36a255c328b0fe125f18a8e6d3689e188eab5e3a1bf8146.zip"
},
"Role": {
"Fn::GetAtt": [
Expand Down Expand Up @@ -302,16 +190,6 @@
]
}
},
"Conditions": {
"HasEcrPublic": {
"Fn::Equals": [
{
"Ref": "AWS::Partition"
},
"aws"
]
}
},
"Outputs": {
"awscdkeksclusterbottlerocketngtestawscdkawseksKubectlProviderframeworkonEvent3ECB1FCDArn": {
"Value": {
Expand All @@ -323,10 +201,7 @@
}
},
"Parameters": {
"referencetoawscdkeksclusterbottlerocketngtestCluster81B40D2EArn": {
"Type": "String"
},
"referencetoawscdkeksclusterbottlerocketngtestClusterCreationRole94E8BD1EArn": {
"referencetoawscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn": {
"Type": "String"
},
"referencetoawscdkeksclusterbottlerocketngtestKubectlLayer779BB176Ref": {
Expand Down
70 changes: 29 additions & 41 deletions ...ing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/manifest.json
View file
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}/05bd0b78da02eda33a8390beda604618ea4902a384b3f64a07f1b79a28be28a8.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/8b1e099510cf85d33b59f258d89efc15f379d1f06face0a4c519c6cb5f33d9b5.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down Expand Up @@ -171,6 +171,18 @@
"data": "KubectlLayer600207B5"
}
],
"/aws-cdk-eks-cluster-bottlerocket-ng-test/Cluster/KubectlHandlerRole/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "ClusterKubectlHandlerRole94549F93"
}
],
"/aws-cdk-eks-cluster-bottlerocket-ng-test/Cluster/KubectlHandlerRole/DefaultPolicy/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "ClusterKubectlHandlerRoleDefaultPolicyE44083DD"
}
],
"/aws-cdk-eks-cluster-bottlerocket-ng-test/Cluster/Role/Resource": [
{
"type": "aws:cdk:logicalId",
Expand Down Expand Up @@ -207,6 +219,12 @@
"data": "ClusterKubectlReadyBarrier200052AF"
}
],
"/aws-cdk-eks-cluster-bottlerocket-ng-test/Cluster/HasEcrPublic": [
{
"type": "aws:cdk:logicalId",
"data": "ClusterHasEcrPublic8EE1114E"
}
],
"/aws-cdk-eks-cluster-bottlerocket-ng-test/Cluster/AwsAuth/manifest/Resource/Default": [
{
"type": "aws:cdk:logicalId",
Expand Down Expand Up @@ -261,12 +279,6 @@
"data": "OnEventHandlerServiceRole15A26729"
}
],
"/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider/OnEventHandler/ServiceRole/DefaultPolicy/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "OnEventHandlerServiceRoleDefaultPolicyC57085D4"
}
],
"/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider/OnEventHandler/Resource": [
{
"type": "aws:cdk:logicalId",
Expand All @@ -279,12 +291,6 @@
"data": "IsCompleteHandlerServiceRole5810CC58"
}
],
"/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider/IsCompleteHandler/ServiceRole/DefaultPolicy/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "IsCompleteHandlerServiceRoleDefaultPolicy8F64197B"
}
],
"/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider/IsCompleteHandler/Resource": [
{
"type": "aws:cdk:logicalId",
Expand Down Expand Up @@ -363,34 +369,28 @@
"data": "Providerwaiterstatemachine5D4A9DF0"
}
],
"/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider/awscdkeksclusterbottlerocketngtestawscdkawseksClusterResourceProviderframeworkonEventCB851FF9Arn": [
{
"type": "aws:cdk:logicalId",
"data": "awscdkeksclusterbottlerocketngtestawscdkawseksClusterResourceProviderframeworkonEventCB851FF9Arn"
}
],
"/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider/reference-to-awscdkeksclusterbottlerocketngtestClusterCreationRole94E8BD1EArn": [
"/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider/awscdkeksclusterbottlerocketngtestawscdkawseksClusterResourceProviderOnEventHandlerServiceRoleF2D7A6FBArn": [
{
"type": "aws:cdk:logicalId",
"data": "referencetoawscdkeksclusterbottlerocketngtestClusterCreationRole94E8BD1EArn"
"data": "awscdkeksclusterbottlerocketngtestawscdkawseksClusterResourceProviderOnEventHandlerServiceRoleF2D7A6FBArn"
}
],
"/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider.NestedStack/@aws-cdk--aws-eks.ClusterResourceProvider.NestedStackResource": [
"/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider/awscdkeksclusterbottlerocketngtestawscdkawseksClusterResourceProviderIsCompleteHandlerServiceRoleE74A431FArn": [
{
"type": "aws:cdk:logicalId",
"data": "awscdkawseksClusterResourceProviderNestedStackawscdkawseksClusterResourceProviderNestedStackResource9827C454"
"data": "awscdkeksclusterbottlerocketngtestawscdkawseksClusterResourceProviderIsCompleteHandlerServiceRoleE74A431FArn"
}
],
"/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.KubectlProvider/Handler/ServiceRole/Resource": [
"/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider/awscdkeksclusterbottlerocketngtestawscdkawseksClusterResourceProviderframeworkonEventCB851FF9Arn": [
{
"type": "aws:cdk:logicalId",
"data": "HandlerServiceRoleFCDC14AE"
"data": "awscdkeksclusterbottlerocketngtestawscdkawseksClusterResourceProviderframeworkonEventCB851FF9Arn"
}
],
"/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.KubectlProvider/Handler/ServiceRole/DefaultPolicy/Resource": [
"/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider.NestedStack/@aws-cdk--aws-eks.ClusterResourceProvider.NestedStackResource": [
{
"type": "aws:cdk:logicalId",
"data": "HandlerServiceRoleDefaultPolicyCBD0CC91"
"data": "awscdkawseksClusterResourceProviderNestedStackawscdkawseksClusterResourceProviderNestedStackResource9827C454"
}
],
"/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.KubectlProvider/Handler/Resource": [
Expand All @@ -405,12 +405,6 @@
"data": "AwsCliLayerF44AAF94"
}
],
"/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.KubectlProvider/HasEcrPublic": [
{
"type": "aws:cdk:logicalId",
"data": "HasEcrPublic"
}
],
"/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.KubectlProvider/Provider/framework-onEvent/ServiceRole/Resource": [
{
"type": "aws:cdk:logicalId",
Expand All @@ -435,16 +429,10 @@
"data": "awscdkeksclusterbottlerocketngtestawscdkawseksKubectlProviderframeworkonEvent3ECB1FCDArn"
}
],
"/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterbottlerocketngtestCluster81B40D2EArn": [
{
"type": "aws:cdk:logicalId",
"data": "referencetoawscdkeksclusterbottlerocketngtestCluster81B40D2EArn"
}
],
"/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterbottlerocketngtestClusterCreationRole94E8BD1EArn": [
"/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn": [
{
"type": "aws:cdk:logicalId",
"data": "referencetoawscdkeksclusterbottlerocketngtestClusterCreationRole94E8BD1EArn"
"data": "referencetoawscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn"
}
],
"/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterbottlerocketngtestKubectlLayer779BB176Ref": [
Expand Down
627 changes: 287 additions & 340 deletions ...testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/tree.json
View file

Large diffs are not rendered by default.

69 changes: 0 additions & 69 deletions ...apshot/asset.1eabd374284db340b74179e3429008132f5b6b0b7b28d472d852807d7f5f9746/outbound.js
View file

This file was deleted.

0 ...b7b28d472d852807d7f5f9746/cfn-response.js → ...e6d3689e188eab5e3a1bf8146/cfn-response.js
View file
File renamed without changes.
0 ...f5b6b0b7b28d472d852807d7f5f9746/consts.js → ...5f18a8e6d3689e188eab5e3a1bf8146/consts.js
View file
File renamed without changes.
0 ...6b0b7b28d472d852807d7f5f9746/framework.js → ...8a8e6d3689e188eab5e3a1bf8146/framework.js
View file
File renamed without changes.
73 changes: 73 additions & 0 deletions ...apshot/asset.45017ac1fb5b50dac36a255c328b0fe125f18a8e6d3689e188eab5e3a1bf8146/outbound.js
View file
0 ...32f5b6b0b7b28d472d852807d7f5f9746/util.js → ...125f18a8e6d3689e188eab5e3a1bf8146/util.js
View file
File renamed without changes.
Binary file removed ...pc.js.snapshot/asset.68b22621fff135f9e3f225bad7ff80fdf2f45c3d9910af601206a0d9b279933a.zip
View file
Binary file not shown.
59 changes: 0 additions & 59 deletions ....snapshot/asset.68b8fc42fe6d1eb6e6c39212ce770fac02511440fecfc5b69a904fe8a19f6b8e/index.js
View file

This file was deleted.

Binary file renamed ...f80fdf2f45c3d9910af601206a0d9b279933a.zip → ...a0709bf456e34b06ea7c96111eecb2fddd054.zip
View file
Binary file not shown.
Binary file renamed ...dea90ffae67b9cc4aa4366d5102db42435ee1.zip → ...12f010f591a9e3bd203ae98ba3f9bedf5bb31.zip
View file
Binary file not shown.
0 ...9a535cb32fde3ba6db8ee92/apply/__init__.py → ...2c77010b24d9b156ced5a1b/apply/__init__.py
View file
File renamed without changes.
0 ...949a535cb32fde3ba6db8ee92/get/__init__.py → ...062c77010b24d9b156ced5a1b/get/__init__.py
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...49a535cb32fde3ba6db8ee92/helm/__init__.py → ...62c77010b24d9b156ced5a1b/helm/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def get_oci_cmd(repository, version):
cmnd = [f"helm pull {repository} --version {version} --untar"]
else:
logger.error("OCI repository format not recognized, falling back to helm pull")
cmnd = ['helm', 'pull', repository, '--version', version, '--untar']
cmnd = [f"helm pull {repository} --version {version} --untar"]

return cmnd

Expand Down
0 ...776c951949a535cb32fde3ba6db8ee92/index.py → ...8ce2537062c77010b24d9b156ced5a1b/index.py
View file
File renamed without changes.
0 ...9a535cb32fde3ba6db8ee92/patch/__init__.py → ...2c77010b24d9b156ced5a1b/patch/__init__.py
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...1440fecfc5b69a904fe8a19f6b8e/cluster.d.ts → ...4e4e1bca8d4aa818c442e1878ddf/cluster.d.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { IsCompleteResponse, OnEventResponse } from '../../../custom-resources/lib/provider-framework/types';
import { EksClient, ResourceEvent, ResourceHandler } from './common';
import { IsCompleteResponse, OnEventResponse } from '../../../custom-resources/lib/provider-framework/types';
export declare class ClusterResourceHandler extends ResourceHandler {
get clusterName(): string;
private readonly newProps;
Expand Down
2 changes: 1 addition & 1 deletion ...511440fecfc5b69a904fe8a19f6b8e/cluster.js → ...ae4e4e1bca8d4aa818c442e1878ddf/cluster.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...511440fecfc5b69a904fe8a19f6b8e/cluster.ts → ...ae4e4e1bca8d4aa818c442e1878ddf/cluster.ts
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...11440fecfc5b69a904fe8a19f6b8e/common.d.ts → ...e4e4e1bca8d4aa818c442e1878ddf/common.d.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { IsCompleteResponse, OnEventResponse } from '../../../custom-resources/lib/provider-framework/types';
import * as aws from 'aws-sdk';
import { IsCompleteResponse, OnEventResponse } from '../../../custom-resources/lib/provider-framework/types';
export interface EksUpdateId {
/**
* If this field is included in an event passed to "IsComplete", it means we
Expand Down
2 changes: 1 addition & 1 deletion ...2511440fecfc5b69a904fe8a19f6b8e/common.js → ...bae4e4e1bca8d4aa818c442e1878ddf/common.js
View file
2 changes: 1 addition & 1 deletion ...2511440fecfc5b69a904fe8a19f6b8e/common.ts → ...bae4e4e1bca8d4aa818c442e1878ddf/common.ts
View file
Original file line number Diff line number Diff line change
@@ -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 {
/**
Expand Down
0 ...fc5b69a904fe8a19f6b8e/compareLogging.d.ts → ...a8d4aa818c442e1878ddf/compareLogging.d.ts
View file
File renamed without changes.
0 ...ecfc5b69a904fe8a19f6b8e/compareLogging.js → ...bca8d4aa818c442e1878ddf/compareLogging.js
View file
File renamed without changes.
0 ...ecfc5b69a904fe8a19f6b8e/compareLogging.ts → ...bca8d4aa818c442e1878ddf/compareLogging.ts
View file
File renamed without changes.
0 ...11440fecfc5b69a904fe8a19f6b8e/consts.d.ts → ...e4e4e1bca8d4aa818c442e1878ddf/consts.d.ts
View file
File renamed without changes.
0 ...2511440fecfc5b69a904fe8a19f6b8e/consts.js → ...bae4e4e1bca8d4aa818c442e1878ddf/consts.js
View file
File renamed without changes.
0 ...2511440fecfc5b69a904fe8a19f6b8e/consts.ts → ...bae4e4e1bca8d4aa818c442e1878ddf/consts.ts
View file
File renamed without changes.
0 ...1440fecfc5b69a904fe8a19f6b8e/fargate.d.ts → ...4e4e1bca8d4aa818c442e1878ddf/fargate.d.ts
View file
File renamed without changes.
0 ...511440fecfc5b69a904fe8a19f6b8e/fargate.js → ...ae4e4e1bca8d4aa818c442e1878ddf/fargate.js
View file
File renamed without changes.
0 ...511440fecfc5b69a904fe8a19f6b8e/fargate.ts → ...ae4e4e1bca8d4aa818c442e1878ddf/fargate.ts
View file
File renamed without changes.
0 ...511440fecfc5b69a904fe8a19f6b8e/index.d.ts → ...ae4e4e1bca8d4aa818c442e1878ddf/index.d.ts
View file
File renamed without changes.
61 changes: 61 additions & 0 deletions ....snapshot/asset.a21fb971385f0210c6b1c88a25f1b9986bae4e4e1bca8d4aa818c442e1878ddf/index.js
View file
2 changes: 1 addition & 1 deletion ...02511440fecfc5b69a904fe8a19f6b8e/index.ts → ...6bae4e4e1bca8d4aa818c442e1878ddf/index.ts
View file
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
Binary file modified ...pc.js.snapshot/asset.c475180f5b1bbabac165414da13a9b843b111cd3b6d5fae9c954c006640c4064.zip
View file
Binary file not shown.
42 changes: 21 additions & 21 deletions ...t/integ.eks-cluster-handlers-vpc.js.snapshot/aws-cdk-eks-handlers-in-vpc-test.assets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,106 +14,106 @@
}
}
},
"ad44c2b0638f04871c889d78e71dea90ffae67b9cc4aa4366d5102db42435ee1": {
"75dfa9114a30421542432dcb55212f010f591a9e3bd203ae98ba3f9bedf5bb31": {
"source": {
"path": "asset.ad44c2b0638f04871c889d78e71dea90ffae67b9cc4aa4366d5102db42435ee1.zip",
"path": "asset.75dfa9114a30421542432dcb55212f010f591a9e3bd203ae98ba3f9bedf5bb31.zip",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "ad44c2b0638f04871c889d78e71dea90ffae67b9cc4aa4366d5102db42435ee1.zip",
"objectKey": "75dfa9114a30421542432dcb55212f010f591a9e3bd203ae98ba3f9bedf5bb31.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"68b8fc42fe6d1eb6e6c39212ce770fac02511440fecfc5b69a904fe8a19f6b8e": {
"a21fb971385f0210c6b1c88a25f1b9986bae4e4e1bca8d4aa818c442e1878ddf": {
"source": {
"path": "asset.68b8fc42fe6d1eb6e6c39212ce770fac02511440fecfc5b69a904fe8a19f6b8e",
"path": "asset.a21fb971385f0210c6b1c88a25f1b9986bae4e4e1bca8d4aa818c442e1878ddf",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "68b8fc42fe6d1eb6e6c39212ce770fac02511440fecfc5b69a904fe8a19f6b8e.zip",
"objectKey": "a21fb971385f0210c6b1c88a25f1b9986bae4e4e1bca8d4aa818c442e1878ddf.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"1eabd374284db340b74179e3429008132f5b6b0b7b28d472d852807d7f5f9746": {
"45017ac1fb5b50dac36a255c328b0fe125f18a8e6d3689e188eab5e3a1bf8146": {
"source": {
"path": "asset.1eabd374284db340b74179e3429008132f5b6b0b7b28d472d852807d7f5f9746",
"path": "asset.45017ac1fb5b50dac36a255c328b0fe125f18a8e6d3689e188eab5e3a1bf8146",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "1eabd374284db340b74179e3429008132f5b6b0b7b28d472d852807d7f5f9746.zip",
"objectKey": "45017ac1fb5b50dac36a255c328b0fe125f18a8e6d3689e188eab5e3a1bf8146.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"2427a81588377445b76031dc4adb9190776c951949a535cb32fde3ba6db8ee92": {
"9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b": {
"source": {
"path": "asset.2427a81588377445b76031dc4adb9190776c951949a535cb32fde3ba6db8ee92",
"path": "asset.9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "2427a81588377445b76031dc4adb9190776c951949a535cb32fde3ba6db8ee92.zip",
"objectKey": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"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}"
}
}
},
"12a7747fbba84dc9d9994493c674439c5931e975909c95edf1afc5bbf7190ca9": {
"90366393e5113f68934f0493c46471d709399eba9f9cc63fbfd44718ba852565": {
"source": {
"path": "awscdkekshandlersinvpctestawscdkawseksClusterResourceProvider9260AB35.nested.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "12a7747fbba84dc9d9994493c674439c5931e975909c95edf1afc5bbf7190ca9.json",
"objectKey": "90366393e5113f68934f0493c46471d709399eba9f9cc63fbfd44718ba852565.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"8e45e1778261284855411fabd41134539c0dee3f46ae0a720a22297f9a12a0e5": {
"728e246b991fd992b0ef2c65c35a8a20a249472ff705b3c93b8fd71e7d550391": {
"source": {
"path": "awscdkekshandlersinvpctestawscdkawseksKubectlProvider72227111.nested.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "8e45e1778261284855411fabd41134539c0dee3f46ae0a720a22297f9a12a0e5.json",
"objectKey": "728e246b991fd992b0ef2c65c35a8a20a249472ff705b3c93b8fd71e7d550391.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"725b8c452a570e92be27b2022997eb6abd27bb9263c35e6b5f8583027113c147": {
"bc6f8a8c29a1629ce6d6545354144578b62c4a23ec237a0f88872ae81ab43246": {
"source": {
"path": "aws-cdk-eks-handlers-in-vpc-test.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "725b8c452a570e92be27b2022997eb6abd27bb9263c35e6b5f8583027113c147.json",
"objectKey": "bc6f8a8c29a1629ce6d6545354144578b62c4a23ec237a0f88872ae81ab43246.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
355 changes: 187 additions & 168 deletions ...integ.eks-cluster-handlers-vpc.js.snapshot/aws-cdk-eks-handlers-in-vpc-test.template.json
View file

Large diffs are not rendered by default.

79 changes: 22 additions & 57 deletions ...wscdkekshandlersinvpctestawscdkawseksClusterResourceProvider9260AB35.nested.template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "ad44c2b0638f04871c889d78e71dea90ffae67b9cc4aa4366d5102db42435ee1.zip"
"S3Key": "75dfa9114a30421542432dcb55212f010f591a9e3bd203ae98ba3f9bedf5bb31.zip"
},
"Description": "/opt/nodejs/node_modules/proxy-agent"
}
Expand Down Expand Up @@ -55,29 +55,6 @@
]
}
},
"OnEventHandlerServiceRoleDefaultPolicyC57085D4": {
"Type": "AWS::IAM::Policy",
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Resource": {
"Ref": "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackCreationRoleADAAC7FDArn"
}
}
],
"Version": "2012-10-17"
},
"PolicyName": "OnEventHandlerServiceRoleDefaultPolicyC57085D4",
"Roles": [
{
"Ref": "OnEventHandlerServiceRole15A26729"
}
]
}
},
"OnEventHandlerSecurityGroup88E14F70": {
"Type": "AWS::EC2::SecurityGroup",
"Properties": {
Expand All @@ -101,7 +78,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "68b8fc42fe6d1eb6e6c39212ce770fac02511440fecfc5b69a904fe8a19f6b8e.zip"
"S3Key": "a21fb971385f0210c6b1c88a25f1b9986bae4e4e1bca8d4aa818c442e1878ddf.zip"
},
"Role": {
"Fn::GetAtt": [
Expand Down Expand Up @@ -143,7 +120,6 @@
}
},
"DependsOn": [
"OnEventHandlerServiceRoleDefaultPolicyC57085D4",
"OnEventHandlerServiceRole15A26729"
]
},
Expand Down Expand Up @@ -190,29 +166,6 @@
]
}
},
"IsCompleteHandlerServiceRoleDefaultPolicy8F64197B": {
"Type": "AWS::IAM::Policy",
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Resource": {
"Ref": "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackCreationRoleADAAC7FDArn"
}
}
],
"Version": "2012-10-17"
},
"PolicyName": "IsCompleteHandlerServiceRoleDefaultPolicy8F64197B",
"Roles": [
{
"Ref": "IsCompleteHandlerServiceRole5810CC58"
}
]
}
},
"IsCompleteHandlerSecurityGroupE0DF1ECF": {
"Type": "AWS::EC2::SecurityGroup",
"Properties": {
Expand All @@ -236,7 +189,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "68b8fc42fe6d1eb6e6c39212ce770fac02511440fecfc5b69a904fe8a19f6b8e.zip"
"S3Key": "a21fb971385f0210c6b1c88a25f1b9986bae4e4e1bca8d4aa818c442e1878ddf.zip"
},
"Role": {
"Fn::GetAtt": [
Expand Down Expand Up @@ -278,7 +231,6 @@
}
},
"DependsOn": [
"IsCompleteHandlerServiceRoleDefaultPolicy8F64197B",
"IsCompleteHandlerServiceRole5810CC58"
]
},
Expand Down Expand Up @@ -417,7 +369,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "1eabd374284db340b74179e3429008132f5b6b0b7b28d472d852807d7f5f9746.zip"
"S3Key": "45017ac1fb5b50dac36a255c328b0fe125f18a8e6d3689e188eab5e3a1bf8146.zip"
},
"Role": {
"Fn::GetAtt": [
Expand Down Expand Up @@ -600,7 +552,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "1eabd374284db340b74179e3429008132f5b6b0b7b28d472d852807d7f5f9746.zip"
"S3Key": "45017ac1fb5b50dac36a255c328b0fe125f18a8e6d3689e188eab5e3a1bf8146.zip"
},
"Role": {
"Fn::GetAtt": [
Expand Down Expand Up @@ -780,7 +732,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "1eabd374284db340b74179e3429008132f5b6b0b7b28d472d852807d7f5f9746.zip"
"S3Key": "45017ac1fb5b50dac36a255c328b0fe125f18a8e6d3689e188eab5e3a1bf8146.zip"
},
"Role": {
"Fn::GetAtt": [
Expand Down Expand Up @@ -950,6 +902,22 @@
}
},
"Outputs": {
"awscdkekshandlersinvpctestawscdkawseksClusterResourceProviderOnEventHandlerServiceRole059C26FCArn": {
"Value": {
"Fn::GetAtt": [
"OnEventHandlerServiceRole15A26729",
"Arn"
]
}
},
"awscdkekshandlersinvpctestawscdkawseksClusterResourceProviderIsCompleteHandlerServiceRole2AACEB53Arn": {
"Value": {
"Fn::GetAtt": [
"IsCompleteHandlerServiceRole5810CC58",
"Arn"
]
}
},
"awscdkekshandlersinvpctestawscdkawseksClusterResourceProviderframeworkonEvent5C6C2463Arn": {
"Value": {
"Fn::GetAtt": [
Expand All @@ -960,9 +928,6 @@
}
},
"Parameters": {
"referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackCreationRoleADAAC7FDArn": {
"Type": "String"
},
"referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackDefaultVpcE40EA7ACRef": {
"Type": "String"
},
Expand Down
137 changes: 6 additions & 131 deletions ...apshot/awscdkekshandlersinvpctestawscdkawseksKubectlProvider72227111.nested.template.json
View file
Original file line number Diff line number Diff line change
@@ -1,124 +1,16 @@
{
"Resources": {
"HandlerServiceRoleFCDC14AE": {
"Type": "AWS::IAM::Role",
"Properties": {
"AssumeRolePolicyDocument": {
"Statement": [
{
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "lambda.amazonaws.com"
}
}
],
"Version": "2012-10-17"
},
"ManagedPolicyArns": [
{
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
]
]
},
{
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole"
]
]
},
{
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":iam::aws:policy/AmazonEC2ContainerRegistryReadOnly"
]
]
},
{
"Fn::If": [
"HasEcrPublic",
{
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":iam::aws:policy/AmazonElasticContainerRegistryPublicReadOnly"
]
]
},
{
"Ref": "AWS::NoValue"
}
]
}
]
}
},
"HandlerServiceRoleDefaultPolicyCBD0CC91": {
"Type": "AWS::IAM::Policy",
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": "eks:DescribeCluster",
"Effect": "Allow",
"Resource": {
"Ref": "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStack429D29C0Arn"
}
},
{
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Resource": {
"Ref": "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackCreationRoleADAAC7FDArn"
}
}
],
"Version": "2012-10-17"
},
"PolicyName": "HandlerServiceRoleDefaultPolicyCBD0CC91",
"Roles": [
{
"Ref": "HandlerServiceRoleFCDC14AE"
}
]
}
},
"Handler886CB40B": {
"Type": "AWS::Lambda::Function",
"Properties": {
"Code": {
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "2427a81588377445b76031dc4adb9190776c951949a535cb32fde3ba6db8ee92.zip"
"S3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip"
},
"Role": {
"Fn::GetAtt": [
"HandlerServiceRoleFCDC14AE",
"Arn"
]
"Ref": "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackKubectlHandlerRole12BCDBC7Arn"
},
"Description": "onEvent handler for EKS kubectl resource provider",
"Handler": "index.handler",
Expand Down Expand Up @@ -148,11 +40,7 @@
}
]
}
},
"DependsOn": [
"HandlerServiceRoleDefaultPolicyCBD0CC91",
"HandlerServiceRoleFCDC14AE"
]
}
},
"AwsCliLayerF44AAF94": {
"Type": "AWS::Lambda::LayerVersion",
Expand All @@ -161,7 +49,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 @@ -258,7 +146,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "1eabd374284db340b74179e3429008132f5b6b0b7b28d472d852807d7f5f9746.zip"
"S3Key": "45017ac1fb5b50dac36a255c328b0fe125f18a8e6d3689e188eab5e3a1bf8146.zip"
},
"Role": {
"Fn::GetAtt": [
Expand Down Expand Up @@ -302,16 +190,6 @@
]
}
},
"Conditions": {
"HasEcrPublic": {
"Fn::Equals": [
{
"Ref": "AWS::Partition"
},
"aws"
]
}
},
"Outputs": {
"awscdkekshandlersinvpctestawscdkawseksKubectlProviderframeworkonEventB8D0A5E7Arn": {
"Value": {
Expand All @@ -323,10 +201,7 @@
}
},
"Parameters": {
"referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStack429D29C0Arn": {
"Type": "String"
},
"referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackCreationRoleADAAC7FDArn": {
"referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackKubectlHandlerRole12BCDBC7Arn": {
"Type": "String"
},
"referencetoawscdkekshandlersinvpctestKubectlLayerAD42127BRef": {
Expand Down
Loading