Skip to content

Commit d2c3f72

Browse files
authored
Merge pull request #1423 from magodo/svcendpoint_k8s_import_panic
`azuredevops_serviceendpoint_kubernetes`: Fix import panic
2 parents 93a6fb1 + 1dab429 commit d2c3f72

File tree

1 file changed

+17
-20
lines changed

1 file changed

+17
-20
lines changed

azuredevops/internal/service/serviceendpoint/resource_serviceendpoint_kubernetes.go

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -367,36 +367,33 @@ func flattenServiceEndpointKubernetes(d *schema.ResourceData, serviceEndpoint *s
367367
d.Set("azure_subscription", configItemList)
368368
case "Kubeconfig":
369369
var kubeconfig map[string]interface{}
370-
kubeconfigSet := d.Get("kubeconfig").([]interface{})
371-
configuration := kubeconfigSet[0].(map[string]interface{})
372370

373-
if len(configuration) > 0 {
374-
kubeconfig = map[string]interface{}{}
371+
kubeconfig = map[string]interface{}{}
375372

376-
if v, ok := configuration["kube_config"]; ok {
373+
if kubeconfigSet := d.Get("kubeconfig").([]interface{}); len(kubeconfigSet) != 0 {
374+
if v, ok := kubeconfigSet[0].(map[string]interface{})["kube_config"]; ok {
377375
kubeconfig["kube_config"] = v.(string)
378376
}
377+
}
379378

380-
if serviceEndpoint.Data != nil {
381-
if v, ok := (*serviceEndpoint.Data)["acceptUntrustedCerts"]; ok {
382-
acceptUntrustedCerts, err := strconv.ParseBool(v)
383-
if err != nil {
384-
return fmt.Errorf("failed to parse `accept_untrusted_certs`: %+v ", err)
385-
}
386-
kubeconfig["accept_untrusted_certs"] = acceptUntrustedCerts
379+
if serviceEndpoint.Data != nil {
380+
if v, ok := (*serviceEndpoint.Data)["acceptUntrustedCerts"]; ok {
381+
acceptUntrustedCerts, err := strconv.ParseBool(v)
382+
if err != nil {
383+
return fmt.Errorf("failed to parse `accept_untrusted_certs`: %+v ", err)
387384
}
385+
kubeconfig["accept_untrusted_certs"] = acceptUntrustedCerts
388386
}
387+
}
389388

390-
if serviceEndpoint.Authorization != nil && serviceEndpoint.Authorization.Parameters != nil {
391-
if v, ok := (*serviceEndpoint.Authorization.Parameters)["clusterContext"]; ok {
392-
kubeconfig["cluster_context"] = v
393-
}
389+
if serviceEndpoint.Authorization != nil && serviceEndpoint.Authorization.Parameters != nil {
390+
if v, ok := (*serviceEndpoint.Authorization.Parameters)["clusterContext"]; ok {
391+
kubeconfig["cluster_context"] = v
394392
}
395-
396-
kubeconfigList := make([]map[string]interface{}, 1)
397-
kubeconfigList[0] = kubeconfig
398-
d.Set("kubeconfig", kubeconfigList)
399393
}
394+
kubeconfigList := make([]map[string]interface{}, 1)
395+
kubeconfigList[0] = kubeconfig
396+
d.Set("kubeconfig", kubeconfigList)
400397
case "ServiceAccount":
401398
var serviceAccount map[string]interface{}
402399
serviceAccountSet := d.Get("service_account").([]interface{})

0 commit comments

Comments
 (0)