Update Terraform SDK to V2

Use v2.4.1 version of terraform-plugin-sdk.

Cleanup imports.

Change `validation.SingleIP()` -> `validation.IsIPAddress`,
`validation.ValidateRFC3339TimeString` -> `validation.IsRFC3339Time`.

Replace `Removed` Schema property with `Deprecated`.

Provide context into CustomizeDiff functions.

Use functions with the new signatures to configure the Provider with
Terraform SDK V2.

Add context into resourceImagesImageV2UpdateComputedAttributes.

Fix gofmt in pathorcontents package.

Fix networking_port_v2 datasource issue: "profile: StateFunc is
extraneous, value should just be changed before setting on computed-only
field" by removing custom StateFunc.

Fix containerinfra_cluster_v1 resource issuze: "kubeconfig: TypeMap with
Elem *Resource not supported, use TypeList/TypeSet with Elem *Resource
or TypeMap with Elem *Schema" by changing type to Type.Schema and
updating flattenContainerInfraV1Kubeconfig function.

Change the deprecated "Providers" field of resource.Test to
"ProviderFactories".

Use CreateContext, ReadContext, UpdateContext, DeleteContext instead of
deprecated resource functions. Use diag.Diagnostics and Context for
those functions.

go.mod

@@ -5,8 +5,8 @@ go 1.15
 require (
 	github.com/gophercloud/gophercloud v0.16.0
 	github.com/gophercloud/utils v0.0.0-20210216074907-f6de111f2eae
-	github.com/hashicorp/terraform-plugin-sdk v1.16.0
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.4
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/stretchr/testify v1.4.0
+	github.com/stretchr/testify v1.6.1
 	gopkg.in/yaml.v2 v2.4.0
 )

main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/plugin"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/plugin"
 	"github.com/terraform-provider-openstack/terraform-provider-openstack/openstack"
 )
 

openstack/blockstorage_extensions.go

@@ -5,8 +5,7 @@ import (
 	"fmt"
 
 	"github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/schedulerhints"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/hashcode"
+	"github.com/gophercloud/utils/terraform/hashcode"
 )
 
 func expandBlockStorageExtensionsSchedulerHints(v schedulerhints.SchedulerHints) map[string]interface{} {

openstack/blockstorage_extensions_test.go

@@ -3,8 +3,9 @@ package openstack
 import (
 	"testing"
 
-	"github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/schedulerhints"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/schedulerhints"
 )
 
 func blockStorageExtensionsSchedulerHints() schedulerhints.SchedulerHints {

openstack/blockstorage_volume_attach_v2_test.go

@@ -3,8 +3,9 @@ package openstack
 import (
 	"testing"
 
-	"github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/volumeactions"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/volumeactions"
 )
 
 func TestExpandBlockStorageV2AttachMode(t *testing.T) {

openstack/blockstorage_volume_attach_v3_test.go

@@ -3,8 +3,9 @@ package openstack
 import (
 	"testing"
 
-	"github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/volumeactions"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/volumeactions"
 )
 
 func TestExpandBlockStorageV3AttachMode(t *testing.T) {

openstack/blockstorage_volume_v1.go

@@ -4,11 +4,11 @@ import (
 	"bytes"
 	"fmt"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack/blockstorage/v1/volumes"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/hashcode"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/gophercloud/utils/terraform/hashcode"
 )
 
 func flattenBlockStorageVolumeV1Attachments(v []map[string]interface{}) []map[string]interface{} {

openstack/blockstorage_volume_v1_test.go

@@ -4,9 +4,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gophercloud/gophercloud/openstack/blockstorage/v1/volumes"
-
 	"github.com/stretchr/testify/assert"
+
+	"github.com/gophercloud/gophercloud/openstack/blockstorage/v1/volumes"
 )
 
 func blockStorageVolumeV1VolumeFixture() *volumes.Volume {

openstack/blockstorage_volume_v2.go

@@ -4,11 +4,11 @@ import (
 	"bytes"
 	"fmt"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack/blockstorage/v2/volumes"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/hashcode"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/gophercloud/utils/terraform/hashcode"
 )
 
 func flattenBlockStorageVolumeV2Attachments(v []volumes.Attachment) []map[string]interface{} {

openstack/blockstorage_volume_v2_test.go

@@ -4,9 +4,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gophercloud/gophercloud/openstack/blockstorage/v2/volumes"
-
 	"github.com/stretchr/testify/assert"
+
+	"github.com/gophercloud/gophercloud/openstack/blockstorage/v2/volumes"
 )
 
 func blockStorageVolumeV2VolumeFixture() volumes.Volume {

openstack/blockstorage_volume_v3.go

@@ -4,11 +4,11 @@ import (
 	"bytes"
 	"fmt"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/hashcode"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/gophercloud/utils/terraform/hashcode"
 )
 
 func flattenBlockStorageVolumeV3Attachments(v []volumes.Attachment) []map[string]interface{} {

openstack/blockstorage_volume_v3_test.go

@@ -4,9 +4,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes"
-
 	"github.com/stretchr/testify/assert"
+
+	"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes"
 )
 
 func blockStorageVolumeV3VolumeFixture() volumes.Volume {

openstack/compute_flavor_v2.go

@@ -1,8 +1,6 @@
 package openstack
 
-import (
-	"github.com/gophercloud/gophercloud/openstack/compute/v2/flavors"
-)
+import "github.com/gophercloud/gophercloud/openstack/compute/v2/flavors"
 
 func expandComputeFlavorV2ExtraSpecs(raw map[string]interface{}) flavors.ExtraSpecsOpts {
 	extraSpecs := make(flavors.ExtraSpecsOpts, len(raw))

openstack/compute_floatingip_associate_v2.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/floatingips"

openstack/compute_instance_v2.go

@@ -14,12 +14,13 @@ import (
 	"log"
 	"os"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/tenantnetworks"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/ports"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 const (

openstack/compute_interface_attach_v2.go

@@ -5,10 +5,10 @@ import (
 	"log"
 	"strings"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/attachinterfaces"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func computeInterfaceAttachV2AttachFunc(

openstack/compute_keypair_v2.go

@@ -1,8 +1,6 @@
 package openstack
 
-import (
-	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs"
-)
+import "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs"
 
 // ComputeKeyPairV2CreateOpts is a custom KeyPair struct to include the ValueSpecs field.
 type ComputeKeyPairV2CreateOpts struct {

openstack/compute_secgroup_v2.go

@@ -6,11 +6,12 @@ import (
 	"log"
 	"strings"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/secgroups"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/hashcode"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/gophercloud/utils/terraform/hashcode"
 )
 
 func computeSecGroupV2RulesCheckForErrors(d *schema.ResourceData) error {

openstack/compute_servergroup_v2_test.go

@@ -3,10 +3,11 @@ package openstack
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/servergroups"
 	th "github.com/gophercloud/gophercloud/testhelper"
 	thclient "github.com/gophercloud/gophercloud/testhelper/client"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestComputeServerGroupV2CreateOpts(t *testing.T) {

openstack/compute_volume_attach_v2.go

@@ -5,11 +5,11 @@ import (
 	"log"
 	"strings"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/volumeattach"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func computeVolumeAttachV2ParseID(id string) (string, string, error) {

openstack/compute_volume_attach_v2_test.go

@@ -1,8 +1,6 @@
 package openstack
 
-import (
-	"testing"
-)
+import "testing"
 
 func TestComputeVolumeAttachV2ParseID(t *testing.T) {
 	id := "foo/bar"

openstack/containerinfra_shared_v1.go

@@ -11,15 +11,14 @@ import (
 	"os"
 	"strings"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"gopkg.in/yaml.v2"
+
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack/containerinfra/v1/certificates"
 	"github.com/gophercloud/gophercloud/openstack/containerinfra/v1/clusters"
 	"github.com/gophercloud/gophercloud/openstack/containerinfra/v1/clustertemplates"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-
-	yaml "gopkg.in/yaml.v2"
 )
 
 const (
@@ -170,13 +169,10 @@ type kubernetesConfigUserData struct {
 	ClientCertificateData string `yaml:"client-certificate-data"`
 }
 
-func flattenContainerInfraV1Kubeconfig(d *schema.ResourceData, containerInfraClient *gophercloud.ServiceClient) (map[string]interface{}, error) {
-	var kubeconfig map[string]interface{}
-	name := d.Get("name").(string)
-	host := d.Get("api_address").(string)
-
-	if d.Get("kubeconfig.client_certificate").(string) != "" {
-		return d.Get("kubeconfig").(map[string]interface{}), nil
+func flattenContainerInfraV1Kubeconfig(d *schema.ResourceData, containerInfraClient *gophercloud.ServiceClient) (map[string]string, error) {
+	clientSert, ok := d.Get("kubeconfig.client_certificate").(string)
+	if ok && clientSert != "" {
+		return d.Get("kubeconfig").(map[string]string), nil
 	}
 
 	certificateAuthority, err := certificates.Get(containerInfraClient, d.Id()).Extract()
@@ -228,20 +224,20 @@ func flattenContainerInfraV1Kubeconfig(d *schema.ResourceData, containerInfraCli
 		return nil, fmt.Errorf("Error requesting client certificate: %s", err)
 	}
 
+	name := d.Get("name").(string)
+	host := d.Get("api_address").(string)
 	rawKubeconfig, err := renderKubeconfig(name, host, []byte(certificateAuthority.PEM), []byte(clientCertificate.PEM), pemClientKey)
 	if err != nil {
 		return nil, fmt.Errorf("Error rendering kubeconfig: %s", err)
 	}
 
-	kubeconfig = map[string]interface{}{
+	return map[string]string{
 		"raw_config":             string(rawKubeconfig),
 		"host":                   host,
 		"cluster_ca_certificate": certificateAuthority.PEM,
 		"client_certificate":     clientCertificate.PEM,
 		"client_key":             string(pemClientKey),
-	}
-
-	return kubeconfig, nil
+	}, nil
 }
 
 func renderKubeconfig(name string, host string, clusterCaCertificate []byte, clientCertificate []byte, clientKey []byte) ([]byte, error) {

openstack/containerinfra_shared_v1_test.go

@@ -3,9 +3,9 @@ package openstack
 import (
 	"testing"
 
-	"github.com/gophercloud/gophercloud/openstack/containerinfra/v1/clustertemplates"
-
 	"github.com/stretchr/testify/assert"
+
+	"github.com/gophercloud/gophercloud/openstack/containerinfra/v1/clustertemplates"
 )
 
 func TestExpandContainerInfraV1LabelsMap(t *testing.T) {

openstack/data_source_openstack_blockstorage_availability_zones_v3.go

@@ -1,18 +1,20 @@
 package openstack
 
 import (
-	"fmt"
+	"context"
 	"sort"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/availabilityzones"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/hashcode"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
+	"github.com/gophercloud/utils/terraform/hashcode"
 )
 
 func dataSourceBlockStorageAvailabilityZonesV3() *schema.Resource {
 	return &schema.Resource{
-		Read: dataSourceBlockStorageAvailabilityZonesV3Read,
+		ReadContext: dataSourceBlockStorageAvailabilityZonesV3Read,
 		Schema: map[string]*schema.Schema{
 			"region": {
 				Type:     schema.TypeString,
@@ -38,20 +40,20 @@ func dataSourceBlockStorageAvailabilityZonesV3() *schema.Resource {
 	}
 }
 
-func dataSourceBlockStorageAvailabilityZonesV3Read(d *schema.ResourceData, meta interface{}) error {
+func dataSourceBlockStorageAvailabilityZonesV3Read(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	config := meta.(*Config)
 	client, err := config.BlockStorageV3Client(GetRegion(d, config))
 	if err != nil {
-		return fmt.Errorf("Error creating OpenStack block storage client: %s", err)
+		return diag.Errorf("Error creating OpenStack block storage client: %s", err)
 	}
 
 	allPages, err := availabilityzones.List(client).AllPages()
 	if err != nil {
-		return fmt.Errorf("Error retrieving openstack_blockstorage_availability_zones_v3: %s", err)
+		return diag.Errorf("Error retrieving openstack_blockstorage_availability_zones_v3: %s", err)
 	}
 	zoneInfo, err := availabilityzones.ExtractAvailabilityZones(allPages)
 	if err != nil {
-		return fmt.Errorf("Error extracting openstack_blockstorage_availability_zones_v3 from response: %s", err)
+		return diag.Errorf("Error extracting openstack_blockstorage_availability_zones_v3 from response: %s", err)
 	}
 
 	stateBool := d.Get("state").(string) == "available"

openstack/data_source_openstack_blockstorage_availability_zones_v3_test.go

@@ -4,13 +4,13 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 func TestAccBlockStorageV3AvailabilityZonesV3_basic(t *testing.T) {
 	resource.Test(t, resource.TestCase{
-		PreCheck:  func() { testAccPreCheck(t) },
-		Providers: testAccProviders,
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: testAccProviders,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccBlockStorageV3AvailabilityZonesConfig,