Remove unnecessary error returns and handlings (#2364)

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
 }

kubernetes/resource_kubernetes_pod_security_policy_v1beta1.go

@@ -448,10 +448,7 @@ func resourceKubernetesPodSecurityPolicyV1Beta1Update(ctx context.Context, d *sc
 	ops := patchMetadata("metadata.0.", "/metadata/", d)
 
 	if d.HasChange("spec") {
-		diffOps, err := patchPodSecurityPolicySpec("spec.0.", "/spec", d)
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		diffOps := patchPodSecurityPolicySpec("spec.0.", "/spec", d)
 		ops = append(ops, *diffOps...)
 	}
 	data, err := ops.MarshalJSON()

kubernetes/resource_kubernetes_replication_controller_migrate.go

@@ -16,5 +16,6 @@ func resourceKubernetesReplicationControllerV0() *schema.Resource {
 }
 
 func resourceKubernetesReplicationControllerUpgradeV0(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_service_migrate.go

@@ -176,5 +176,6 @@ func resourceKubernetesServiceV0() *schema.Resource {
 func resourceKubernetesServiceStateUpgradeV0(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_service_v1.go

@@ -449,10 +449,7 @@ func resourceKubernetesServiceV1Update(ctx context.Context, d *schema.ResourceDa
 		if err != nil {
 			return diag.FromErr(err)
 		}
-		diffOps, err := patchServiceSpec("spec.0.", "/spec/", d, serverVersion)
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		diffOps := patchServiceSpec("spec.0.", "/spec/", d, serverVersion)
 		ops = append(ops, diffOps...)
 	}
 	data, err := ops.MarshalJSON()

kubernetes/resource_kubernetes_stateful_set_migrate.go

@@ -16,5 +16,6 @@ func resourceKubernetesStatefulSetV0() *schema.Resource {
 }
 
 func resourceKubernetesStatefulSetUpgradeV0(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/schema_resources_migrate.go

@@ -42,77 +42,77 @@ func patchPodSpecWithResourcesFieldV0(m map[string]*schema.Schema) map[string]*s
 	return m
 }
 
-func upgradeJobTemplatePodSpecWithResourcesFieldV0(ctx context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
+func upgradeJobTemplatePodSpecWithResourcesFieldV0(ctx context.Context, rawState map[string]interface{}, meta interface{}) map[string]interface{} {
 	s, ok := rawState["spec"].([]interface{})
 	if !ok || len(s) == 0 {
-		return rawState, nil
+		return rawState
 	}
 
 	spec := s[0].(map[string]interface{})
 	jt, ok := spec["job_template"].([]interface{})
 	if !ok || len(jt) == 0 {
-		return rawState, nil
+		return rawState
 	}
 
 	jobTemplate := jt[0].(map[string]interface{})
 	js, ok := jobTemplate["spec"].([]interface{})
 	if !ok || len(js) == 0 {
-		return rawState, nil
+		return rawState
 	}
 
 	jobSpec := js[0].(map[string]interface{})
 	t, ok := jobSpec["template"].([]interface{})
 	if !ok || len(t) == 0 {
-		return rawState, nil
+		return rawState
 	}
 
 	template := t[0].(map[string]interface{})
 	ps, ok := template["spec"].([]interface{})
 	if !ok || len(ps) == 0 {
-		return rawState, nil
+		return rawState
 	}
 
 	podSpec := ps[0].(map[string]interface{})
 	template["spec"] = []interface{}{upgradeContainers(podSpec)}
 
-	return rawState, nil
+	return rawState
 }
 
-func upgradeTemplatePodSpecWithResourcesFieldV0(ctx context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
+func upgradeTemplatePodSpecWithResourcesFieldV0(ctx context.Context, rawState map[string]interface{}, meta interface{}) map[string]interface{} {
 	s, ok := rawState["spec"].([]interface{})
 	if !ok || len(s) == 0 {
-		return rawState, nil
+		return rawState
 	}
 
 	spec := s[0].(map[string]interface{})
 	t, ok := spec["template"].([]interface{})
 	if !ok || len(t) == 0 {
-		return rawState, nil
+		return rawState
 	}
 
 	template := t[0].(map[string]interface{})
 	ps, ok := template["spec"].([]interface{})
 
 	if !ok || len(ps) == 0 {
-		return rawState, nil
+		return rawState
 	}
 
 	podSpec := ps[0].(map[string]interface{})
 	template["spec"] = []interface{}{upgradeContainers(podSpec)}
 
-	return rawState, nil
+	return rawState
 }
 
-func upgradePodSpecWithResourcesFieldV0(ctx context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
+func upgradePodSpecWithResourcesFieldV0(ctx context.Context, rawState map[string]interface{}, meta interface{}) map[string]interface{} {
 	s, ok := rawState["spec"].([]interface{})
 	if !ok || len(s) == 0 {
-		return rawState, nil
+		return rawState
 	}
 
 	spec := s[0].(map[string]interface{})
 	rawState["spec"] = []interface{}{upgradeContainers(spec)}
 
-	return rawState, nil
+	return rawState
 }
 
 func upgradeContainers(rawState map[string]interface{}) map[string]interface{} {

kubernetes/schema_resources_migrate_test.go

@@ -132,7 +132,7 @@ func TestUpgradeTemplatePodSpecWithResourcesFieldV0(t *testing.T) {
 		}},
 	}
 
-	actual, _ := upgradeTemplatePodSpecWithResourcesFieldV0(context.TODO(), v0, nil)
+	actual := upgradeTemplatePodSpecWithResourcesFieldV0(context.TODO(), v0, nil)
 
 	if !reflect.DeepEqual(v1, actual) {
 		t.Fatalf("\n\nexpected:\n\n%#v\n\ngot:\n\n%#v\n\n", v1, actual)
@@ -190,7 +190,7 @@ func TestUpgradeTemplatePodSpecWithResourcesFieldV0_empty(t *testing.T) {
 		}},
 	}
 
-	actual, _ := upgradeTemplatePodSpecWithResourcesFieldV0(context.TODO(), v0, nil)
+	actual := upgradeTemplatePodSpecWithResourcesFieldV0(context.TODO(), v0, nil)
 
 	if !reflect.DeepEqual(v1, actual) {
 		t.Fatalf("\n\nexpected:\n\n%#v\n\ngot:\n\n%#v\n\n", v1, actual)

kubernetes/structure_csi_driver.go

@@ -38,7 +38,7 @@ func expandCSIDriverVolumeLifecycleModes(l []interface{}) []storage.VolumeLifecy
 	return lifecycleModes
 }
 
-func flattenCSIDriverSpec(in storage.CSIDriverSpec) ([]interface{}, error) {
+func flattenCSIDriverSpec(in storage.CSIDriverSpec) []interface{} {
 	att := make(map[string]interface{})
 
 	att["attach_required"] = in.AttachRequired
@@ -51,10 +51,10 @@ func flattenCSIDriverSpec(in storage.CSIDriverSpec) ([]interface{}, error) {
 		att["volume_lifecycle_modes"] = in.VolumeLifecycleModes
 	}
 
-	return []interface{}{att}, nil
+	return []interface{}{att}
 }
 
-func patchCSIDriverSpec(keyPrefix, pathPrefix string, d *schema.ResourceData) (*PatchOperations, error) {
+func patchCSIDriverSpec(keyPrefix, pathPrefix string, d *schema.ResourceData) *PatchOperations {
 	ops := make(PatchOperations, 0)
 	if d.HasChange(keyPrefix + "attach_required") {
 		ops = append(ops, &ReplaceOperation{
@@ -77,5 +77,5 @@ func patchCSIDriverSpec(keyPrefix, pathPrefix string, d *schema.ResourceData) (*
 		})
 	}
 
-	return &ops, nil
+	return &ops
 }

kubernetes/structure_csi_driver_v1.go

@@ -38,7 +38,7 @@ func expandCSIDriverV1VolumeLifecycleModes(l []interface{}) []storage.VolumeLife
 	return lifecycleModes
 }
 
-func flattenCSIDriverV1Spec(in storage.CSIDriverSpec) ([]interface{}, error) {
+func flattenCSIDriverV1Spec(in storage.CSIDriverSpec) []interface{} {
 	att := make(map[string]interface{})
 
 	att["attach_required"] = in.AttachRequired
@@ -51,10 +51,10 @@ func flattenCSIDriverV1Spec(in storage.CSIDriverSpec) ([]interface{}, error) {
 		att["volume_lifecycle_modes"] = in.VolumeLifecycleModes
 	}
 
-	return []interface{}{att}, nil
+	return []interface{}{att}
 }
 
-func patchCSIDriverV1Spec(keyPrefix, pathPrefix string, d *schema.ResourceData) (*PatchOperations, error) {
+func patchCSIDriverV1Spec(keyPrefix, pathPrefix string, d *schema.ResourceData) *PatchOperations {
 	ops := make(PatchOperations, 0)
 	if d.HasChange(keyPrefix + "attach_required") {
 		ops = append(ops, &ReplaceOperation{
@@ -77,5 +77,5 @@ func patchCSIDriverV1Spec(keyPrefix, pathPrefix string, d *schema.ResourceData)
 		})
 	}
 
-	return &ops, nil
+	return &ops
 }

kubernetes/structure_hostalias.go

@@ -3,9 +3,9 @@
 
 package kubernetes
 
-import "k8s.io/api/core/v1"
+import corev1 "k8s.io/api/core/v1"
 
-func flattenHostaliases(in []v1.HostAlias) []interface{} {
+func flattenHostaliases(in []corev1.HostAlias) []interface{} {
 	att := make([]interface{}, len(in))
 	for i, v := range in {
 		ha := make(map[string]interface{})
@@ -17,12 +17,12 @@ func flattenHostaliases(in []v1.HostAlias) []interface{} {
 	}
 	return att
 }
-func expandHostaliases(hostalias []interface{}) ([]v1.HostAlias, error) {
+func expandHostaliases(hostalias []interface{}) []corev1.HostAlias {
 	if len(hostalias) == 0 {
-		return []v1.HostAlias{}, nil
+		return []corev1.HostAlias{}
 	}
 
-	hs := make([]v1.HostAlias, len(hostalias))
+	hs := make([]corev1.HostAlias, len(hostalias))
 	for i, ha := range hostalias {
 		hoas := ha.(map[string]interface{})
 
@@ -34,5 +34,5 @@ func expandHostaliases(hostalias []interface{}) ([]v1.HostAlias, error) {
 			hs[i].Hostnames = expandStringSlice(hostnames)
 		}
 	}
-	return hs, nil
+	return hs
 }

kubernetes/structure_job.go

@@ -111,7 +111,7 @@ func expandJobV1Spec(j []interface{}) (batchv1.JobSpec, error) {
 	return obj, nil
 }
 
-func patchJobV1Spec(pathPrefix, prefix string, d *schema.ResourceData) (PatchOperations, error) {
+func patchJobV1Spec(pathPrefix, prefix string, d *schema.ResourceData) PatchOperations {
 	ops := make([]PatchOperation, 0)
 
 	if d.HasChange(prefix + "active_deadline_seconds") {
@@ -146,7 +146,7 @@ func patchJobV1Spec(pathPrefix, prefix string, d *schema.ResourceData) (PatchOpe
 		})
 	}
 
-	return ops, nil
+	return ops
 }
 
 // removeGeneratedLabels removes server-generated labels