k8s: Handle error from GetCredentials and protect against panic. (#1064)

digitalocean · Nov 1, 2023 · 2351b82 · 2351b82
1 parent b6e1db0
commit 2351b82
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/digitalocean/kubernetes/resource_kubernetes_cluster.go b/digitalocean/kubernetes/resource_kubernetes_cluster.go
@@ -400,11 +400,9 @@ func digitaloceanKubernetesClusterRead(
  }
  }
  if expiresAt.IsZero() || expiresAt.Before(time.Now()) {
- creds, resp, err := client.Kubernetes.GetCredentials(context.Background(), cluster.ID, &godo.KubernetesClusterCredentialsGetRequest{})
+ creds, _, err := client.Kubernetes.GetCredentials(context.Background(), cluster.ID, &godo.KubernetesClusterCredentialsGetRequest{})
  if err != nil {
- if resp != nil && resp.StatusCode == 404 {
- return diag.Errorf("Unable to fetch Kubernetes credentials: %s", err)
- }
+ return diag.Errorf("Unable to fetch Kubernetes credentials: %s", err)
  }
  d.Set("kube_config", flattenCredentials(cluster.Name, cluster.RegionSlug, creds))
  }
@@ -676,6 +674,10 @@ type kubernetesConfigUserData struct {
 }
 
 func flattenCredentials(name string, region string, creds *godo.KubernetesClusterCredentials) []interface{} {
+ if creds == nil {
+ return nil
+ }
+
  raw := map[string]interface{}{
  "cluster_ca_certificate": base64.StdEncoding.EncodeToString(creds.CertificateAuthorityData),
  "host": creds.Server,