From 7febe52e349208f0d715bcb8fcf002ac0d3ef8a4 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <daniel@pulumi.com>
Date: Tue, 22 Aug 2023 14:54:04 +0100
Subject: [PATCH] Guard against cluster certificate authority being undefined
 (#903)

Likely addresses #676

Although the types don't describe the certificate authority as being possibly undefined, the error reported would indicate it can be. Therefore we'll add some extra guards just in case.

If the cluster certificate authority is undefined, then we'll pass the certData to generateKubeConfig as undefined. This will then not set the property within the kubeconfig, but at least it won't throw a hard error causing the whole deployment to fail.

Aside: Fix resolve() call which requires a value to be passed.
---
 nodejs/eks/cluster.ts | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/nodejs/eks/cluster.ts b/nodejs/eks/cluster.ts
index 4ccd4e1a7..974a5d7c3 100644
--- a/nodejs/eks/cluster.ts
+++ b/nodejs/eks/cluster.ts
@@ -199,7 +199,7 @@ interface ExecEnvVar {
 export function generateKubeconfig(
     clusterName: pulumi.Input<string>,
     clusterEndpoint: pulumi.Input<string>,
-    certData: pulumi.Input<string>,
+    certData?: pulumi.Input<string>,
     opts?: KubeconfigOptions,
 ) {
     let args = ["eks", "get-token", "--cluster-name", clusterName];
@@ -627,7 +627,7 @@ export function createCore(
                             timeout: reqTimeoutMilliseconds,
                         };
                         const req = https.request(options, (res) => {
-                            res.statusCode === 200 ? resolve() : reject(); // Verify healthz returns 200
+                            res.statusCode === 200 ? resolve(undefined) : reject(); // Verify healthz returns 200
                         });
                         req.on("timeout", reject);
                         req.on("error", reject);
@@ -675,7 +675,7 @@ export function createCore(
                         return generateKubeconfig(
                             clusterName,
                             clusterEndpoint,
-                            clusterCertificateAuthority.data,
+                            clusterCertificateAuthority?.data,
                             opts,
                         );
                     });
@@ -683,14 +683,14 @@ export function createCore(
                     config = generateKubeconfig(
                         clusterName,
                         clusterEndpoint,
-                        clusterCertificateAuthority.data,
+                        clusterCertificateAuthority?.data,
                         providerCredentialOpts,
                     );
                 } else {
                     config = generateKubeconfig(
                         clusterName,
                         clusterEndpoint,
-                        clusterCertificateAuthority.data,
+                        clusterCertificateAuthority?.data,
                     );
                 }
                 return config;
@@ -918,7 +918,9 @@ export function createCore(
                         selectors: selectors,
                         subnetIds: pulumi
                             .output(clusterSubnetIds)
-                            .apply((subnets) => computeWorkerSubnets(parent, fargate.subnetIds ?? subnets)),
+                            .apply((subnets) =>
+                                computeWorkerSubnets(parent, fargate.subnetIds ?? subnets),
+                            ),
                     },
                     { parent, dependsOn: [eksNodeAccess], provider },
                 );
@@ -1673,7 +1675,7 @@ export class Cluster extends pulumi.ComponentResource {
         const kc = generateKubeconfig(
             this.eksCluster.name,
             this.eksCluster.endpoint,
-            this.eksCluster.certificateAuthority.data,
+            this.eksCluster.certificateAuthority?.data,
             args,
         );
         return pulumi.output(kc).apply(JSON.stringify);
@@ -1876,7 +1878,7 @@ export class ClusterInternal extends pulumi.ComponentResource {
         const kc = generateKubeconfig(
             this.eksCluster.name,
             this.eksCluster.endpoint,
-            this.eksCluster.certificateAuthority.data,
+            this.eksCluster.certificateAuthority?.data,
             args,
         );
         return pulumi.output(kc).apply(JSON.stringify);