Upgrade Terraform SDK to v2

Use v2 of the Terraform SDK and swap out any deprecated functions
with v2 equivalents where possible.

go.mod

@@ -3,8 +3,7 @@ module github.com/hashicorp/terraform-provider-kubernetes
 require (
 	cloud.google.com/go/storage v1.11.0 // indirect
 	github.com/Azure/go-autorest/autorest v0.11.6 // indirect
-	github.com/Azure/go-autorest/autorest/azure/cli v0.4.1 // indirect
-	github.com/Azure/go-autorest/autorest/validation v0.3.0 // indirect
+	github.com/Azure/go-autorest/autorest/adal v0.9.4 // indirect
 	github.com/Djarvur/go-err113 v0.1.0 // indirect
 	github.com/MakeNowJust/heredoc v1.0.0 // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
@@ -31,26 +30,22 @@ require (
 	github.com/gostaticanalysis/analysisutil v0.2.1 // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/hashicorp/go-hclog v0.14.1 // indirect
+	github.com/hashicorp/go-multierror v1.1.0 // indirect
 	github.com/hashicorp/go-uuid v1.0.2 // indirect
 	github.com/hashicorp/go-version v1.2.1
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/hashicorp/hcl/v2 v2.6.0 // indirect
-	github.com/hashicorp/terraform-config-inspect v0.0.0-20200806211835-c481b8bfa41e // indirect
 	github.com/hashicorp/terraform-json v0.6.0 // indirect
-	github.com/hashicorp/terraform-plugin-sdk v1.15.0
-	github.com/hashicorp/terraform-provider-google v1.20.1-0.20200824213103-e32ba28ec398
-	github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.0.4-0.20200930154456-951f045a9f14
 	github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce // indirect
 	github.com/imdario/mergo v0.3.11 // indirect
 	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
 	github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
 	github.com/katbyte/terrafmt v0.2.1-0.20200303174203-e6a3e82cb21b
-	github.com/keybase/go-crypto v0.0.0-20200123153347-de78d2cb44f4 // indirect
 	github.com/kr/pretty v0.2.1 // indirect
 	github.com/magiconair/properties v1.8.2 // indirect
 	github.com/mailru/easyjson v0.7.6 // indirect
 	github.com/matoous/godox v0.0.0-20200801072554-4fb83dc2941e // indirect
-	github.com/mitchellh/cli v1.1.1 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/mapstructure v1.3.3 // indirect
@@ -65,13 +60,8 @@ require (
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/stretchr/objx v0.3.0 // indirect
 	github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b // indirect
-	github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20200807230610-d5346d47e3af
-	github.com/terraform-providers/terraform-provider-azurerm v1.44.1-0.20200911233120-57b2bfc9d42c
-	github.com/terraform-providers/terraform-provider-random v1.3.2-0.20190925210718-83518d96ae4f // indirect
 	github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94 // indirect
-	github.com/ulikunitz/xz v0.5.8 // indirect
 	github.com/zclconf/go-cty v1.6.1 // indirect
-	github.com/zclconf/go-cty-yaml v1.0.2 // indirect
 	golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a // indirect
 	golang.org/x/net v0.0.0-20200904194848-62affa334b73 // indirect
 	golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 // indirect

kubernetes/data_source_kubernetes_all_namespaces.go

@@ -4,15 +4,16 @@ import (
 	"context"
 	"crypto/sha256"
 	"fmt"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"log"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func dataSourceKubernetesAllNamespaces() *schema.Resource {
 	return &schema.Resource{
-		Read: dataSourceKubernetesAllNamespacesRead,
+		ReadContext: dataSourceKubernetesAllNamespacesRead,
 		Schema: map[string]*schema.Schema{
 			"namespaces": {
 				Type:        schema.TypeList,
@@ -26,18 +27,17 @@ func dataSourceKubernetesAllNamespaces() *schema.Resource {
 	}
 }
 
-func dataSourceKubernetesAllNamespacesRead(d *schema.ResourceData, meta interface{}) error {
+func dataSourceKubernetesAllNamespacesRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	conn, err := meta.(KubeClientsets).MainClientset()
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
-	ctx := context.TODO()
 
 	log.Printf("[INFO] Listing namespaces")
 	nsRaw, err := conn.CoreV1().Namespaces().List(ctx, metav1.ListOptions{})
 	if err != nil {
 		log.Printf("[DEBUG] Received error: %#v", err)
-		return err
+		return diag.FromErr(err)
 	}
 	namespaces := make([]string, len(nsRaw.Items))
 	for i, v := range nsRaw.Items {
@@ -46,13 +46,13 @@ func dataSourceKubernetesAllNamespacesRead(d *schema.ResourceData, meta interfac
 	log.Printf("[INFO] Received namespaces: %#v", namespaces)
 	err = d.Set("namespaces", namespaces)
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 	idsum := sha256.New()
 	for _, v := range namespaces {
 		_, err := idsum.Write([]byte(v))
 		if err != nil {
-			return err
+			return diag.FromErr(err)
 		}
 	}
 	id := fmt.Sprintf("%x", idsum.Sum(nil))

kubernetes/data_source_kubernetes_all_namespaces_test.go

@@ -4,7 +4,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 func TestAccKubernetesDataSourceAllNamespaces_basic(t *testing.T) {

kubernetes/data_source_kubernetes_config_map.go

@@ -1,13 +1,15 @@
 package kubernetes
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"context"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func dataSourceKubernetesConfigMap() *schema.Resource {
 	return &schema.Resource{
-		Read: dataSourceKubernetesConfigMapRead,
+		ReadContext: dataSourceKubernetesConfigMapRead,
 
 		Schema: map[string]*schema.Schema{
 			"metadata": namespacedMetadataSchema("config_map", false),
@@ -25,12 +27,12 @@ func dataSourceKubernetesConfigMap() *schema.Resource {
 	}
 }
 
-func dataSourceKubernetesConfigMapRead(d *schema.ResourceData, meta interface{}) error {
+func dataSourceKubernetesConfigMapRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	om := meta_v1.ObjectMeta{
 		Namespace: d.Get("metadata.0.namespace").(string),
 		Name:      d.Get("metadata.0.name").(string),
 	}
 	d.SetId(buildId(om))
 
-	return resourceKubernetesConfigMapRead(d, meta)
+	return resourceKubernetesConfigMapRead(ctx, d, meta)
 }

kubernetes/data_source_kubernetes_config_map_test.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 // TestAccKubernetesDataSourceConfigMap_basic tests that the data source is able to read

kubernetes/data_source_kubernetes_ingress.go

@@ -1,7 +1,9 @@
 package kubernetes
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"context"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	networking "k8s.io/api/networking/v1beta1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -15,15 +17,14 @@ func dataSourceKubernetesIngress() *schema.Resource {
 	docIngressSpec := networking.IngressSpec{}.SwaggerDoc()
 
 	return &schema.Resource{
-		Read: dataSourceKubernetesIngressRead,
+		ReadContext: dataSourceKubernetesIngressRead,
 
 		Schema: map[string]*schema.Schema{
 			"metadata": namespacedMetadataSchema("ingress", false),
 			"spec": {
 				Type:        schema.TypeList,
 				Description: docIngress["spec"],
 				Computed:    true,
-				MaxItems:    1,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"backend": backendSpecFields(defaultBackendDescription),
@@ -42,7 +43,6 @@ func dataSourceKubernetesIngress() *schema.Resource {
 									"http": {
 										Type:        schema.TypeList,
 										Computed:    true,
-										MaxItems:    1,
 										Description: docIngressRule[""],
 										Elem: &schema.Resource{
 											Schema: map[string]*schema.Schema{
@@ -111,7 +111,7 @@ func dataSourceKubernetesIngress() *schema.Resource {
 	}
 }
 
-func dataSourceKubernetesIngressRead(d *schema.ResourceData, meta interface{}) error {
+func dataSourceKubernetesIngressRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	metadata := expandMetadata(d.Get("metadata").([]interface{}))
 
 	om := meta_v1.ObjectMeta{
@@ -120,5 +120,5 @@ func dataSourceKubernetesIngressRead(d *schema.ResourceData, meta interface{}) e
 	}
 	d.SetId(buildId(om))
 
-	return resourceKubernetesIngressRead(d, meta)
+	return resourceKubernetesIngressRead(ctx, d, meta)
 }

kubernetes/data_source_kubernetes_ingress_test.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 func TestAccKubernetesDataSourceIngress_basic(t *testing.T) {

kubernetes/data_source_kubernetes_namespace.go

@@ -2,23 +2,23 @@ package kubernetes
 
 import (
 	"context"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"log"
 )
 
 func dataSourceKubernetesNamespace() *schema.Resource {
 	return &schema.Resource{
-		Read: dataSourceKubernetesNamespaceRead,
+		ReadContext: dataSourceKubernetesNamespaceRead,
 
 		Schema: map[string]*schema.Schema{
 			"metadata": metadataSchema("namespace", false),
 			"spec": {
 				Type:        schema.TypeList,
 				Description: "Spec defines the behavior of the Namespace.",
 				Computed:    true,
-				MaxItems:    1,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"finalizers": {
@@ -36,29 +36,28 @@ func dataSourceKubernetesNamespace() *schema.Resource {
 	}
 }
 
-func dataSourceKubernetesNamespaceRead(d *schema.ResourceData, meta interface{}) error {
+func dataSourceKubernetesNamespaceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	conn, err := meta.(KubeClientsets).MainClientset()
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
-	ctx := context.TODO()
 
 	metadata := expandMetadata(d.Get("metadata").([]interface{}))
 	d.SetId(metadata.Name)
 
 	namespace, err := conn.CoreV1().Namespaces().Get(ctx, metadata.Name, meta_v1.GetOptions{})
 	if err != nil {
 		log.Printf("[DEBUG] Received error: %#v", err)
-		return err
+		return diag.FromErr(err)
 	}
 	log.Printf("[INFO] Received namespace: %#v", namespace)
 	err = d.Set("metadata", flattenMetadata(namespace.ObjectMeta, d))
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 	err = d.Set("spec", flattenNamespaceSpec(&namespace.Spec))
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 	return nil
 }

kubernetes/data_source_kubernetes_namespace_test.go

@@ -3,7 +3,7 @@ package kubernetes
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 func TestAccKubernetesDataSourceNamespace_basic(t *testing.T) {

kubernetes/data_source_kubernetes_persistent_volume_claim.go

@@ -1,13 +1,15 @@
 package kubernetes
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"context"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func dataSourceKubernetesPersistentVolumeClaim() *schema.Resource {
 	return &schema.Resource{
-		Read: dataSourceKubernetesPersistentVolumeClaimRead,
+		ReadContext: dataSourceKubernetesPersistentVolumeClaimRead,
 
 		Schema: map[string]*schema.Schema{
 			"metadata": namespacedMetadataSchema("persistent volume claim", true),
@@ -32,7 +34,6 @@ func dataSourceKubernetesPersistentVolumeClaim() *schema.Resource {
 							Description: "A list of the minimum resources the volume should have. More info: http://kubernetes.io/docs/user-guide/persistent-volumes#resources",
 							Computed:    true,
 							ForceNew:    true,
-							MaxItems:    1,
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
 									"limits": {
@@ -55,7 +56,6 @@ func dataSourceKubernetesPersistentVolumeClaim() *schema.Resource {
 							Description: "A label query over volumes to consider for binding.",
 							Optional:    true,
 							ForceNew:    true,
-							MaxItems:    1,
 							Elem: &schema.Resource{
 								Schema: labelSelectorFields(false),
 							},
@@ -81,7 +81,7 @@ func dataSourceKubernetesPersistentVolumeClaim() *schema.Resource {
 	}
 }
 
-func dataSourceKubernetesPersistentVolumeClaimRead(d *schema.ResourceData, meta interface{}) error {
+func dataSourceKubernetesPersistentVolumeClaimRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	metadata := expandMetadata(d.Get("metadata").([]interface{}))
 
 	om := meta_v1.ObjectMeta{
@@ -90,5 +90,5 @@ func dataSourceKubernetesPersistentVolumeClaimRead(d *schema.ResourceData, meta
 	}
 	d.SetId(buildId(om))
 
-	return resourceKubernetesPersistentVolumeClaimRead(d, meta)
+	return resourceKubernetesPersistentVolumeClaimRead(ctx, d, meta)
 }

kubernetes/data_source_kubernetes_persistent_volume_claim_test.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 func TestAccKubernetesDataSourcePVC_basic(t *testing.T) {