aws · mergify · Jan 3, 2020 · Jan 3, 2020 · Jan 3, 2020 · Jan 3, 2020
diff --git a/packages/@aws-cdk/aws-eks/lib/helm-chart.ts b/packages/@aws-cdk/aws-eks/lib/helm-chart.ts
@@ -1,11 +1,7 @@
-import { CustomResource, NestedStack } from '@aws-cdk/aws-cloudformation';
-import * as iam from '@aws-cdk/aws-iam';
-import * as lambda from '@aws-cdk/aws-lambda';
-import { Construct, Duration, Stack } from '@aws-cdk/core';
-import * as cr from '@aws-cdk/custom-resources';
-import * as path from 'path';
+import { CustomResource } from '@aws-cdk/aws-cloudformation';
+import { Construct, Stack } from '@aws-cdk/core';
 import { Cluster } from './cluster';
-import { KubectlLayer } from './kubectl-layer';
+import { KubectlProvider } from './kubectl-provider';
 
 /**
  * Helm Chart options.
@@ -80,7 +76,7 @@ export class HelmChart extends Construct {
 
     const stack = Stack.of(this);
 
-    const provider = HelmResourceProvider.getOrCreate(this);
+    const provider = KubectlProvider.getOrCreate(this);
 
     new CustomResource(this, 'Resource', {
       provider: provider.provider,
@@ -98,48 +94,3 @@ export class HelmChart extends Construct {
     });
   }
 }
-
-class HelmResourceProvider extends NestedStack {
-  /**
-   * Creates a stack-singleton resource provider nested stack.
-   */
-  public static getOrCreate(scope: Construct) {
-    const stack = Stack.of(scope);
-    const uid = '@aws-cdk/aws-eks.HelmResourceProvider';
-    return stack.node.tryFindChild(uid) as HelmResourceProvider || new HelmResourceProvider(stack, uid);
-  }
-
-  /**
-   * The custom resource provider.
-   */
-  public readonly provider: cr.Provider;
-
-  /**
-   * The IAM role used to execute this provider.
-   */
-  public readonly role: iam.IRole;
-
-  private constructor(scope: Construct, id: string) {
-    super(scope, id);
-
-    const handler = new lambda.Function(this, 'Handler', {
-      code: lambda.Code.fromAsset(path.join(__dirname, 'helm-chart')),
-      runtime: lambda.Runtime.PYTHON_3_7,
-      handler: 'index.handler',
-      timeout: Duration.minutes(15),
-      layers: [ KubectlLayer.getOrCreate(this, { version: "2.0.0-beta1" }) ],
-      memorySize: 256,
-    });
-
-    this.provider = new cr.Provider(this, 'Provider', {
-      onEventHandler: handler
-    });
-
-    this.role = handler.role!;
-
-    this.role.addToPolicy(new iam.PolicyStatement({
-      actions: [ 'eks:DescribeCluster' ],
-      resources: [ '*' ]
-    }));
-  }
-}
diff --git a/packages/@aws-cdk/aws-eks/lib/k8s-resource.ts b/packages/@aws-cdk/aws-eks/lib/k8s-resource.ts
@@ -1,11 +1,7 @@
-import { CustomResource, NestedStack } from '@aws-cdk/aws-cloudformation';
-import * as iam from '@aws-cdk/aws-iam';
-import * as lambda from '@aws-cdk/aws-lambda';
-import { Construct, Duration, Stack } from '@aws-cdk/core';
-import * as cr from '@aws-cdk/custom-resources';
-import * as path from 'path';
+import { CustomResource } from '@aws-cdk/aws-cloudformation';
+import { Construct, Stack } from '@aws-cdk/core';
 import { Cluster } from './cluster';
-import { KubectlLayer } from './kubectl-layer';
+import { KubectlProvider } from './kubectl-provider';
 
 export interface KubernetesResourceProps {
   /**
@@ -61,7 +57,7 @@ export class KubernetesResource extends Construct {
     }
 
     const stack = Stack.of(this);
-    const provider = KubernetesResourceProvider.getOrCreate(this);
+    const provider = KubectlProvider.getOrCreate(this);
 
     new CustomResource(this, 'Resource', {
       provider: provider.provider,
@@ -77,48 +73,3 @@ export class KubernetesResource extends Construct {
     });
   }
 }
-
-class KubernetesResourceProvider extends NestedStack {
-  /**
-   * Creates a stack-singleton resource provider nested stack.
-   */
-  public static getOrCreate(scope: Construct) {
-    const stack = Stack.of(scope);
-    const uid = '@aws-cdk/aws-eks.KubernetesResourceProvider';
-    return stack.node.tryFindChild(uid) as KubernetesResourceProvider || new KubernetesResourceProvider(stack, uid);
-  }
-
-  /**
-   * The custom resource provider.
-   */
-  public readonly provider: cr.Provider;
-
-  /**
-   * The IAM role used to execute this provider.
-   */
-  public readonly role: iam.IRole;
-
-  private constructor(scope: Construct, id: string) {
-    super(scope, id);
-
-    const handler = new lambda.Function(this, 'Handler', {
-      runtime: lambda.Runtime.PYTHON_2_7,
-      handler: 'index.handler',
-      timeout: Duration.minutes(15),
-      layers: [ KubectlLayer.getOrCreate(this) ],
-      memorySize: 256,
-      code: lambda.Code.fromAsset(path.join(__dirname, 'k8s-resource-handler'))
-    });
-
-    this.provider = new cr.Provider(this, 'Provider', {
-      onEventHandler: handler
-    });
-
-    this.role = handler.role!;
-
-    this.role.addToPolicy(new iam.PolicyStatement({
-      actions: [ 'eks:DescribeCluster' ],
-      resources: [ '*' ]
-    }));
-  }
-}
diff --git a/...aws-eks/lib/k8s-resource-handler/index.py → ...eks/lib/kubectl-handler/apply/__init__.py b/...aws-eks/lib/k8s-resource-handler/index.py → ...eks/lib/kubectl-handler/apply/__init__.py
@@ -12,7 +12,7 @@
 outdir = os.environ.get('TEST_OUTDIR', '/tmp')
 kubeconfig = os.path.join(outdir, 'kubeconfig')
 
-def handler(event, context):
+def apply_handler(event, context):
     logger.info(json.dumps(event))
 
     request_type = event['RequestType']

diff --git a/.../@aws-cdk/aws-eks/lib/helm-chart/index.py → ...-eks/lib/kubectl-handler/helm/__init__.py b/.../@aws-cdk/aws-eks/lib/helm-chart/index.py → ...-eks/lib/kubectl-handler/helm/__init__.py
@@ -12,7 +12,7 @@
 outdir = os.environ.get('TEST_OUTDIR', '/tmp')
 kubeconfig = os.path.join(outdir, 'kubeconfig')
 
-def handler(event, context):
+def helm_handler(event, context):
     logger.info(json.dumps(event))
 
     request_type = event['RequestType']

diff --git a/packages/@aws-cdk/aws-eks/lib/kubectl-handler/index.py b/packages/@aws-cdk/aws-eks/lib/kubectl-handler/index.py
@@ -0,0 +1,18 @@
+import json
+import logging
+
+from apply import apply_handler
+from helm import helm_handler
+
+
+def handler(event, context):
+  print(json.dumps(event))
+
+  resource_type = event['ResourceType']
+  if resource_type == 'Custom::AWSCDK-EKS-KubernetesResource':
+    return apply_handler(event, context)
+
+  if resource_type == 'Custom::AWSCDK-EKS-HelmChart':
+    return helm_handler(event, context)
+
+  raise Exception("unknown resource type %s" % resource_type)
diff --git a/packages/@aws-cdk/aws-eks/lib/kubectl-provider.ts b/packages/@aws-cdk/aws-eks/lib/kubectl-provider.ts
@@ -0,0 +1,52 @@
+import { NestedStack } from '@aws-cdk/aws-cloudformation';
+import * as iam from '@aws-cdk/aws-iam';
+import * as lambda from '@aws-cdk/aws-lambda';
+import { Construct, Duration, Stack } from '@aws-cdk/core';
+import * as cr from '@aws-cdk/custom-resources';
+import * as path from 'path';
+import { KubectlLayer } from './kubectl-layer';
+
+export class KubectlProvider extends NestedStack {
+  /**
+   * Creates a stack-singleton resource provider nested stack.
+   */
+  public static getOrCreate(scope: Construct) {
+    const stack = Stack.of(scope);
+    const uid = '@aws-cdk/aws-eks.KubectlProvider';
+    return stack.node.tryFindChild(uid) as KubectlProvider || new KubectlProvider(stack, uid);
+  }
+
+  /**
+   * The custom resource provider.
+   */
+  public readonly provider: cr.Provider;
+
+  /**
+   * The IAM role used to execute this provider.
+   */
+  public readonly role: iam.IRole;
+
+  private constructor(scope: Construct, id: string) {
+    super(scope, id);
+
+    const handler = new lambda.Function(this, 'Handler', {
+      code: lambda.Code.fromAsset(path.join(__dirname, 'kubectl-handler')),
+      runtime: lambda.Runtime.PYTHON_3_7,
+      handler: 'index.handler',
+      timeout: Duration.minutes(15),
+      layers: [ KubectlLayer.getOrCreate(this, { version: "2.0.0-beta1" }) ],
+      memorySize: 256,
+    });
+
+    this.provider = new cr.Provider(this, 'Provider', {
+      onEventHandler: handler
+    });
+
+    this.role = handler.role!;
+
+    this.role.addToPolicy(new iam.PolicyStatement({
+      actions: [ 'eks:DescribeCluster' ],
+      resources: [ '*' ]
+    }));
+  }
+}
diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.defaults.expected.json b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.defaults.expected.json
@@ -697,8 +697,8 @@
               "Principal": {
                 "AWS": {
                   "Fn::GetAtt": [
-                    "awscdkawseksKubernetesResourceProviderNestedStackawscdkawseksKubernetesResourceProviderNestedStackResource1A5AAA66",
-                    "Outputs.eksintegdefaults2awscdkawseksKubernetesResourceProviderHandlerServiceRole4872080FArn"
+                    "awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B",
+                    "Outputs.eksintegdefaults2awscdkawseksKubectlProviderHandlerServiceRoleDC956DD6Arn"
                   ]
                 }
               }
@@ -1100,8 +1100,8 @@
       "Properties": {
         "ServiceToken": {
           "Fn::GetAtt": [
-            "awscdkawseksKubernetesResourceProviderNestedStackawscdkawseksKubernetesResourceProviderNestedStackResource1A5AAA66",
-            "Outputs.eksintegdefaults2awscdkawseksKubernetesResourceProviderframeworkonEvent6CA18B28Arn"
+            "awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B",
+            "Outputs.eksintegdefaults2awscdkawseksKubectlProviderframeworkonEvent58F1426BArn"
           ]
         },
         "Manifest": {
@@ -1193,7 +1193,7 @@
         }
       }
     },
-    "awscdkawseksKubernetesResourceProviderNestedStackawscdkawseksKubernetesResourceProviderNestedStackResource1A5AAA66": {
+    "awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "TemplateURL": {
@@ -1206,7 +1206,7 @@
               },
               "/",
               {
-                "Ref": "AssetParameters9c326f06202274fde286cdfb04b4d8be6f58ef01451f732630a5fb719e047b17S3BucketC7A27D79"
+                "Ref": "AssetParameters062367425f2c2b16272f048a7fffbd79f56783d414b682ea748be095e9be275fS3Bucket8A55873F"
               },
               "/",
               {
@@ -1216,7 +1216,7 @@
                     "Fn::Split": [
                       "||",
                       {
-                        "Ref": "AssetParameters9c326f06202274fde286cdfb04b4d8be6f58ef01451f732630a5fb719e047b17S3VersionKey96773BD1"
+                        "Ref": "AssetParameters062367425f2c2b16272f048a7fffbd79f56783d414b682ea748be095e9be275fS3VersionKeyC8FCD0D8"
                       }
                     ]
                   }
@@ -1229,7 +1229,7 @@
                     "Fn::Split": [
                       "||",
                       {
-                        "Ref": "AssetParameters9c326f06202274fde286cdfb04b4d8be6f58ef01451f732630a5fb719e047b17S3VersionKey96773BD1"
+                        "Ref": "AssetParameters062367425f2c2b16272f048a7fffbd79f56783d414b682ea748be095e9be275fS3VersionKeyC8FCD0D8"
                       }
                     ]
                   }
@@ -1239,11 +1239,11 @@
           ]
         },
         "Parameters": {
-          "referencetoeksintegdefaults2AssetParameters21d34b692341e38aac82036dc6f81727130d345c23a6dce90d2af2779c9adfe2S3BucketBDF1BF98Ref": {
-            "Ref": "AssetParameters21d34b692341e38aac82036dc6f81727130d345c23a6dce90d2af2779c9adfe2S3BucketB6E15294"
+          "referencetoeksintegdefaults2AssetParameters0004c128dffc6609d53bf9ca8d7d6a83efe9b2ed05ca4e9ed5642fa034057774S3Bucket8271E6B2Ref": {
+            "Ref": "AssetParameters0004c128dffc6609d53bf9ca8d7d6a83efe9b2ed05ca4e9ed5642fa034057774S3Bucket68EDA20F"
           },
-          "referencetoeksintegdefaults2AssetParameters21d34b692341e38aac82036dc6f81727130d345c23a6dce90d2af2779c9adfe2S3VersionKey8EF2741FRef": {
-            "Ref": "AssetParameters21d34b692341e38aac82036dc6f81727130d345c23a6dce90d2af2779c9adfe2S3VersionKey5071432F"
+          "referencetoeksintegdefaults2AssetParameters0004c128dffc6609d53bf9ca8d7d6a83efe9b2ed05ca4e9ed5642fa034057774S3VersionKey16B6FD0FRef": {
+            "Ref": "AssetParameters0004c128dffc6609d53bf9ca8d7d6a83efe9b2ed05ca4e9ed5642fa034057774S3VersionKey4E0E7FA0"
           },
           "referencetoeksintegdefaults2AssetParameters3e728f777afd6d4a580bc77d99f86194358dca730432b3f4583e544f1e85d2a0S3Bucket45B8FC93Ref": {
             "Ref": "AssetParameters3e728f777afd6d4a580bc77d99f86194358dca730432b3f4583e544f1e85d2a0S3BucketE8BB46CE"
@@ -1339,29 +1339,29 @@
       "Type": "String",
       "Description": "Artifact hash for asset \"3e728f777afd6d4a580bc77d99f86194358dca730432b3f4583e544f1e85d2a0\""
     },
-    "AssetParameters21d34b692341e38aac82036dc6f81727130d345c23a6dce90d2af2779c9adfe2S3BucketB6E15294": {
+    "AssetParameters0004c128dffc6609d53bf9ca8d7d6a83efe9b2ed05ca4e9ed5642fa034057774S3Bucket68EDA20F": {
       "Type": "String",
-      "Description": "S3 bucket for asset \"21d34b692341e38aac82036dc6f81727130d345c23a6dce90d2af2779c9adfe2\""
+      "Description": "S3 bucket for asset \"0004c128dffc6609d53bf9ca8d7d6a83efe9b2ed05ca4e9ed5642fa034057774\""
     },
-    "AssetParameters21d34b692341e38aac82036dc6f81727130d345c23a6dce90d2af2779c9adfe2S3VersionKey5071432F": {
+    "AssetParameters0004c128dffc6609d53bf9ca8d7d6a83efe9b2ed05ca4e9ed5642fa034057774S3VersionKey4E0E7FA0": {
       "Type": "String",
-      "Description": "S3 key for asset version \"21d34b692341e38aac82036dc6f81727130d345c23a6dce90d2af2779c9adfe2\""
+      "Description": "S3 key for asset version \"0004c128dffc6609d53bf9ca8d7d6a83efe9b2ed05ca4e9ed5642fa034057774\""
     },
-    "AssetParameters21d34b692341e38aac82036dc6f81727130d345c23a6dce90d2af2779c9adfe2ArtifactHash1FC307C8": {
+    "AssetParameters0004c128dffc6609d53bf9ca8d7d6a83efe9b2ed05ca4e9ed5642fa034057774ArtifactHash0AEC8AC6": {
       "Type": "String",
-      "Description": "Artifact hash for asset \"21d34b692341e38aac82036dc6f81727130d345c23a6dce90d2af2779c9adfe2\""
+      "Description": "Artifact hash for asset \"0004c128dffc6609d53bf9ca8d7d6a83efe9b2ed05ca4e9ed5642fa034057774\""
     },
-    "AssetParameters9c326f06202274fde286cdfb04b4d8be6f58ef01451f732630a5fb719e047b17S3BucketC7A27D79": {
+    "AssetParameters062367425f2c2b16272f048a7fffbd79f56783d414b682ea748be095e9be275fS3Bucket8A55873F": {
       "Type": "String",
-      "Description": "S3 bucket for asset \"9c326f06202274fde286cdfb04b4d8be6f58ef01451f732630a5fb719e047b17\""
+      "Description": "S3 bucket for asset \"062367425f2c2b16272f048a7fffbd79f56783d414b682ea748be095e9be275f\""
     },
-    "AssetParameters9c326f06202274fde286cdfb04b4d8be6f58ef01451f732630a5fb719e047b17S3VersionKey96773BD1": {
+    "AssetParameters062367425f2c2b16272f048a7fffbd79f56783d414b682ea748be095e9be275fS3VersionKeyC8FCD0D8": {
       "Type": "String",
-      "Description": "S3 key for asset version \"9c326f06202274fde286cdfb04b4d8be6f58ef01451f732630a5fb719e047b17\""
+      "Description": "S3 key for asset version \"062367425f2c2b16272f048a7fffbd79f56783d414b682ea748be095e9be275f\""
     },
-    "AssetParameters9c326f06202274fde286cdfb04b4d8be6f58ef01451f732630a5fb719e047b17ArtifactHashD5617B98": {
+    "AssetParameters062367425f2c2b16272f048a7fffbd79f56783d414b682ea748be095e9be275fArtifactHash1AA0A1C1": {
       "Type": "String",
-      "Description": "Artifact hash for asset \"9c326f06202274fde286cdfb04b4d8be6f58ef01451f732630a5fb719e047b17\""
+      "Description": "Artifact hash for asset \"062367425f2c2b16272f048a7fffbd79f56783d414b682ea748be095e9be275f\""
     },
     "AssetParametersf29b7dd5a7cb088f618b2e9719b79ce3a4c26d5def29508494ba139f87bdddfeS3Bucket39A5D284": {
       "Type": "String",