Remove unnecessary error returns and handlings (#2364)

Author: arybolovlev

kubernetes/resource_kubernetes_certificate_signing_request_v1.go

@@ -93,10 +93,7 @@ func resourceKubernetesCertificateSigningRequestV1Create(ctx context.Context, d
 	}
 
 	metadata := expandMetadata(d.Get("metadata").([]interface{}))
-	spec, err := expandCertificateSigningRequestV1Spec(d.Get("spec").([]interface{}))
-	if err != nil {
-		return diag.FromErr(err)
-	}
+	spec := expandCertificateSigningRequestV1Spec(d.Get("spec").([]interface{}))
 
 	csr := certificates.CertificateSigningRequest{
 		ObjectMeta: metadata,

kubernetes/resource_kubernetes_cron_job_migrate.go

@@ -16,5 +16,6 @@ func resourceKubernetesCronJobV0() *schema.Resource {
 }
 
 func resourceKubernetesCronJobUpgradeV0(ctx context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
-	return upgradeJobTemplatePodSpecWithResourcesFieldV0(ctx, rawState, meta)
+	// Return a nil error here to satisfy StateUpgradeFunc signature
+	return upgradeJobTemplatePodSpecWithResourcesFieldV0(ctx, rawState, meta), nil
 }

kubernetes/resource_kubernetes_csi_driver_v1.go

@@ -119,10 +119,7 @@ func resourceKubernetesCSIDriverV1Read(ctx context.Context, d *schema.ResourceDa
 		return diag.FromErr(err)
 	}
 
-	spec, err := flattenCSIDriverV1Spec(CSIDriver.Spec)
-	if err != nil {
-		return diag.FromErr(err)
-	}
+	spec := flattenCSIDriverV1Spec(CSIDriver.Spec)
 
 	err = d.Set("spec", spec)
 	if err != nil {
@@ -141,10 +138,7 @@ func resourceKubernetesCSIDriverV1Update(ctx context.Context, d *schema.Resource
 	name := d.Id()
 	ops := patchMetadata("metadata.0.", "/metadata/", d)
 	if d.HasChange("spec") {
-		diffOps, err := patchCSIDriverV1Spec("spec.0.", "/spec", d)
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		diffOps := patchCSIDriverV1Spec("spec.0.", "/spec", d)
 		ops = append(ops, *diffOps...)
 	}
 	data, err := ops.MarshalJSON()

kubernetes/resource_kubernetes_csi_driver_v1beta1.go

@@ -116,10 +116,7 @@ func resourceKubernetesCSIDriverV1Beta1Read(ctx context.Context, d *schema.Resou
 		return diag.FromErr(err)
 	}
 
-	spec, err := flattenCSIDriverSpec(CSIDriver.Spec)
-	if err != nil {
-		return diag.FromErr(err)
-	}
+	spec := flattenCSIDriverSpec(CSIDriver.Spec)
 
 	err = d.Set("spec", spec)
 	if err != nil {
@@ -138,10 +135,7 @@ func resourceKubernetesCSIDriverV1Beta1Update(ctx context.Context, d *schema.Res
 	name := d.Id()
 	ops := patchMetadata("metadata.0.", "/metadata/", d)
 	if d.HasChange("spec") {
-		diffOps, err := patchCSIDriverSpec("spec.0.", "/spec", d)
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		diffOps := patchCSIDriverSpec("spec.0.", "/spec", d)
 		ops = append(ops, *diffOps...)
 	}
 	data, err := ops.MarshalJSON()

kubernetes/resource_kubernetes_daemonset_migrate.go

@@ -16,5 +16,6 @@ func resourceKubernetesDaemonSetV0() *schema.Resource {
 }
 
 func resourceKubernetesDaemonSetUpgradeV0(ctx context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
-	return upgradeTemplatePodSpecWithResourcesFieldV0(ctx, rawState, meta)
+	// Return a nil error here to satisfy StateUpgradeFunc signature
+	return upgradeTemplatePodSpecWithResourcesFieldV0(ctx, rawState, meta), nil
 }

kubernetes/resource_kubernetes_deployment_migrate.go

@@ -16,5 +16,6 @@ func resourceKubernetesDeploymentV0() *schema.Resource {
 }
 
 func resourceKubernetesDeploymentUpgradeV0(ctx context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
-	return upgradeTemplatePodSpecWithResourcesFieldV0(ctx, rawState, meta)
+	// Return a nil error here to satisfy StateUpgradeFunc signature
+	return upgradeTemplatePodSpecWithResourcesFieldV0(ctx, rawState, meta), nil
 }

kubernetes/resource_kubernetes_ingress_migrate.go

@@ -5,9 +5,10 @@ package kubernetes
 
 import (
 	"context"
+	"log"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	networking "k8s.io/api/networking/v1beta1"
-	"log"
 )
 
 // resourceKubernetesIngressV0 is a copy of the Kubernetes Ingress schema (before migration).
@@ -140,5 +141,6 @@ func resourceKubernetesIngressV0() *schema.Resource {
 func resourceKubernetesIngressStateUpgradeV0(ctx context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
 	log.Println("[INFO] Found Kubernetes Service state v0; upgrading state to v1")
 	delete(rawState, "load_balancer_ingress")
+	// Return a nil error here to satisfy StateUpgradeFunc signature
 	return rawState, nil
 }

kubernetes/resource_kubernetes_job_migrate.go

@@ -16,5 +16,6 @@ func resourceKubernetesJobV0() *schema.Resource {
 }
 
 func resourceKubernetesJobUpgradeV0(ctx context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
-	return upgradeTemplatePodSpecWithResourcesFieldV0(ctx, rawState, meta)
+	// Return a nil error here to satisfy StateUpgradeFunc signature
+	return upgradeTemplatePodSpecWithResourcesFieldV0(ctx, rawState, meta), nil
 }

kubernetes/resource_kubernetes_job_v1.go

@@ -175,10 +175,7 @@ func resourceKubernetesJobV1Update(ctx context.Context, d *schema.ResourceData,
 	ops := patchMetadata("metadata.0.", "/metadata/", d)
 
 	if d.HasChange("spec") {
-		specOps, err := patchJobV1Spec("/spec", "spec.0.", d)
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		specOps := patchJobV1Spec("/spec", "spec.0.", d)
 		ops = append(ops, specOps...)
 	}
 

kubernetes/resource_kubernetes_pod_migrate.go

@@ -16,5 +16,6 @@ func resourceKubernetesPodV0() *schema.Resource {
 }
 
 func resourceKubernetesPodUpgradeV0(ctx context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
-	return upgradePodSpecWithResourcesFieldV0(ctx, rawState, meta)
+	// Return a nil error here to satisfy StateUpgradeFunc signature
+	return upgradePodSpecWithResourcesFieldV0(ctx, rawState, meta), nil
 }