Add Service Account namespace and name to log messages (#2539)

tomkukral · web-flow · commit ca45276d2e85 · 2024-07-03T10:48:06.000+02:00
diff --git a/kubernetes/data_source_kubernetes_service_account_v1.go b/kubernetes/data_source_kubernetes_service_account_v1.go
@@ -74,7 +74,7 @@ func dataSourceKubernetesServiceAccountV1Read(ctx context.Context, d *schema.Res
 			d.SetId(buildId(sa.ObjectMeta))
 			return nil
 		}
-		return diag.Errorf("Unable to fetch service account from Kubernetes: %s", err)
+		return diag.Errorf(`Unable to fetch service account "%s/%s" from Kubernetes: %s`, metadata.Namespace, metadata.Name, err)
 	}
 
 	defaultSecret, diagMsg := findDefaultServiceAccountV1(ctx, sa, conn)
diff --git a/kubernetes/resource_kubernetes_service_account_v1.go b/kubernetes/resource_kubernetes_service_account_v1.go
@@ -421,7 +421,7 @@ func resourceKubernetesServiceAccountV1ImportState(ctx context.Context, d *schem
 
 	sa, err := conn.CoreV1().ServiceAccounts(namespace).Get(ctx, name, metav1.GetOptions{})
 	if err != nil {
-		return nil, fmt.Errorf("Unable to fetch service account from Kubernetes: %s", err)
+		return nil, fmt.Errorf(`Unable to fetch service account "%s/%s" from Kubernetes: %s`, namespace, name, err)
 	}
 
 	defaultSecret, diagMsg := findDefaultServiceAccountV1(ctx, sa, conn)

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ func dataSourceKubernetesServiceAccountV1Read(ctx context.Context, d *schema.Res`
`74`	`74`	`d.SetId(buildId(sa.ObjectMeta))`
`75`	`75`	`return nil`
`76`	`76`	`}`
`77`		`- return diag.Errorf("Unable to fetch service account from Kubernetes: %s", err)`
	`77`	+ return diag.Errorf(`Unable to fetch service account "%s/%s" from Kubernetes: %s`, metadata.Namespace, metadata.Name, err)
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`defaultSecret, diagMsg := findDefaultServiceAccountV1(ctx, sa, conn)`
Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,7 @@ func resourceKubernetesServiceAccountV1ImportState(ctx context.Context, d *schem`
`421`	`421`
`422`	`422`	`sa, err := conn.CoreV1().ServiceAccounts(namespace).Get(ctx, name, metav1.GetOptions{})`
`423`	`423`	`if err != nil {`
`424`		`- return nil, fmt.Errorf("Unable to fetch service account from Kubernetes: %s", err)`
	`424`	+ return nil, fmt.Errorf(`Unable to fetch service account "%s/%s" from Kubernetes: %s`, namespace, name, err)
`425`	`425`	`}`
`426`	`426`
`427`	`427`	`defaultSecret, diagMsg := findDefaultServiceAccountV1(ctx, sa, conn)`