Upgrade to provider sdk. (#1197)

This change should be a no-op - it only changes a handful of imports.
hashicorp · Sep 26, 2019 · cfd1573 · cfd1573
1 parent dc3fc90
commit cfd1573
Show file tree

Hide file tree

Showing 599 changed files with 1,213 additions and 1,213 deletions.
diff --git a/google-beta/common_operation.go b/google-beta/common_operation.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	cloudresourcemanager "google.golang.org/api/cloudresourcemanager/v1"
 	"google.golang.org/api/googleapi"
 )

diff --git a/google-beta/compute_instance_helpers.go b/google-beta/compute_instance_helpers.go
@@ -3,8 +3,8 @@ package google
 import (
 	"fmt"
 
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/helper/validation"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 	computeBeta "google.golang.org/api/compute/v0.beta"
 	"google.golang.org/api/googleapi"
 )

diff --git a/google-beta/config.go b/google-beta/config.go
@@ -8,9 +8,9 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/hashicorp/terraform/helper/logging"
-	"github.com/hashicorp/terraform/helper/pathorcontents"
-	"github.com/hashicorp/terraform/httpclient"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/logging"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/pathorcontents"
+	"github.com/hashicorp/terraform-plugin-sdk/httpclient"
 	"github.com/terraform-providers/terraform-provider-google-beta/version"
 
 	"golang.org/x/oauth2"

diff --git a/google-beta/config_test.go b/google-beta/config_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"golang.org/x/oauth2/google"
 )
 

diff --git a/google-beta/data_source_compute_lb_ip_ranges.go b/google-beta/data_source_compute_lb_ip_ranges.go
@@ -1,7 +1,7 @@
 package google
 
 import (
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceGoogleComputeLbIpRanges() *schema.Resource {

diff --git a/google-beta/data_source_compute_lb_ip_ranges_test.go b/google-beta/data_source_compute_lb_ip_ranges_test.go
@@ -4,7 +4,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccDataSourceComputeLbIpRanges_basic(t *testing.T) {

diff --git a/google-beta/data_source_compute_network_endpoint_group.go b/google-beta/data_source_compute_network_endpoint_group.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceGoogleComputeNetworkEndpointGroup() *schema.Resource {

diff --git a/google-beta/data_source_compute_network_endpoint_group_test.go b/google-beta/data_source_compute_network_endpoint_group_test.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/acctest"
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccDataSourceComputeNetworkEndpointGroup(t *testing.T) {

diff --git a/google-beta/data_source_container_registry_image.go b/google-beta/data_source_container_registry_image.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceGoogleContainerImage() *schema.Resource {

diff --git a/google-beta/data_source_container_registry_repository.go b/google-beta/data_source_container_registry_repository.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceGoogleContainerRepo() *schema.Resource {

diff --git a/google-beta/data_source_container_registry_test.go b/google-beta/data_source_container_registry_test.go
@@ -3,7 +3,7 @@ package google
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestDataSourceGoogleContainerRegistryRepository(t *testing.T) {

diff --git a/google-beta/data_source_dns_managed_zone.go b/google-beta/data_source_dns_managed_zone.go
@@ -1,6 +1,6 @@
 package google
 
-import "github.com/hashicorp/terraform/helper/schema"
+import "github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 
 func dataSourceDnsManagedZone() *schema.Resource {
 	return &schema.Resource{

diff --git a/google-beta/data_source_dns_managed_zone_test.go b/google-beta/data_source_dns_managed_zone_test.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/acctest"
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccDataSourceDnsManagedZone_basic(t *testing.T) {

diff --git a/google-beta/data_source_google_active_folder.go b/google-beta/data_source_google_active_folder.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	resourceManagerV2Beta1 "google.golang.org/api/cloudresourcemanager/v2beta1"
 )
 

diff --git a/google-beta/data_source_google_active_folder_test.go b/google-beta/data_source_google_active_folder_test.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/acctest"
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccDataSourceGoogleActiveFolder_default(t *testing.T) {

diff --git a/google-beta/data_source_google_billing_account.go b/google-beta/data_source_google_billing_account.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 
 	"google.golang.org/api/cloudbilling/v1"
 )

diff --git a/google-beta/data_source_google_billing_account_test.go b/google-beta/data_source_google_billing_account_test.go
@@ -5,9 +5,9 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccDataSourceGoogleBillingAccount_byFullName(t *testing.T) {

diff --git a/google-beta/data_source_google_client_config.go b/google-beta/data_source_google_client_config.go
@@ -3,7 +3,7 @@ package google
 import (
 	"time"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceGoogleClientConfig() *schema.Resource {

diff --git a/google-beta/data_source_google_client_config_test.go b/google-beta/data_source_google_client_config_test.go
@@ -3,7 +3,7 @@ package google
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccDataSourceGoogleClientConfig_basic(t *testing.T) {

diff --git a/google-beta/data_source_google_client_openid_userinfo.go b/google-beta/data_source_google_client_openid_userinfo.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceGoogleClientOpenIDUserinfo() *schema.Resource {

diff --git a/google-beta/data_source_google_client_openid_userinfo_test.go b/google-beta/data_source_google_client_openid_userinfo_test.go
@@ -3,7 +3,7 @@ package google
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccDataSourceGoogleClientOpenIDUserinfo_basic(t *testing.T) {

diff --git a/google-beta/data_source_google_cloudfunctions_function.go b/google-beta/data_source_google_cloudfunctions_function.go
@@ -1,7 +1,7 @@
 package google
 
 import (
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceGoogleCloudFunctionsFunction() *schema.Resource {

diff --git a/google-beta/data_source_google_cloudfunctions_function_test.go b/google-beta/data_source_google_cloudfunctions_function_test.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/acctest"
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccDataSourceGoogleCloudFunctionsFunction_basic(t *testing.T) {

diff --git a/google-beta/data_source_google_composer_image_versions.go b/google-beta/data_source_google_composer_image_versions.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceGoogleComposerImageVersions() *schema.Resource {

diff --git a/google-beta/data_source_google_composer_image_versions_test.go b/google-beta/data_source_google_composer_image_versions_test.go
@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccDataSourceComposerImageVersions_basic(t *testing.T) {

diff --git a/google-beta/data_source_google_compute_address.go b/google-beta/data_source_google_compute_address.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 var (

diff --git a/google-beta/data_source_google_compute_address_test.go b/google-beta/data_source_google_compute_address_test.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestComputeAddressIdParsing(t *testing.T) {

diff --git a/google-beta/data_source_google_compute_backend_service.go b/google-beta/data_source_google_compute_backend_service.go
@@ -1,7 +1,7 @@
 package google
 
 import (
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceGoogleComputeBackendService() *schema.Resource {

diff --git a/google-beta/data_source_google_compute_backend_service_test.go b/google-beta/data_source_google_compute_backend_service_test.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/acctest"
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccDataSourceComputeBackendService_basic(t *testing.T) {

diff --git a/google-beta/data_source_google_compute_default_service_account.go b/google-beta/data_source_google_compute_default_service_account.go
@@ -2,7 +2,7 @@ package google
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceGoogleComputeDefaultServiceAccount() *schema.Resource {

diff --git a/google-beta/data_source_google_compute_default_service_account_test.go b/google-beta/data_source_google_compute_default_service_account_test.go
@@ -3,7 +3,7 @@ package google
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccDataSourceGoogleComputeDefaultServiceAccount_basic(t *testing.T) {

diff --git a/google-beta/data_source_google_compute_forwarding_rule.go b/google-beta/data_source_google_compute_forwarding_rule.go
@@ -3,7 +3,7 @@ package google
 import (
 	"fmt"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceGoogleComputeForwardingRule() *schema.Resource {

diff --git a/google-beta/data_source_google_compute_forwarding_rule_test.go b/google-beta/data_source_google_compute_forwarding_rule_test.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/acctest"
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccDataSourceGoogleForwardingRule(t *testing.T) {

diff --git a/google-beta/data_source_google_compute_global_address.go b/google-beta/data_source_google_compute_global_address.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceGoogleComputeGlobalAddress() *schema.Resource {

diff --git a/google-beta/data_source_google_compute_global_address_test.go b/google-beta/data_source_google_compute_global_address_test.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccDataSourceComputeGlobalAddress(t *testing.T) {

diff --git a/google-beta/data_source_google_compute_image.go b/google-beta/data_source_google_compute_image.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	compute "google.golang.org/api/compute/v1"
 )
 

diff --git a/google-beta/data_source_google_compute_image_test.go b/google-beta/data_source_google_compute_image_test.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/acctest"
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccDataSourceComputeImage(t *testing.T) {

diff --git a/google-beta/data_source_google_compute_instance.go b/google-beta/data_source_google_compute_instance.go
@@ -3,7 +3,7 @@ package google
 import (
 	"fmt"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceGoogleComputeInstance() *schema.Resource {

diff --git a/google-beta/data_source_google_compute_instance_group.go b/google-beta/data_source_google_compute_instance_group.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceGoogleComputeInstanceGroup() *schema.Resource {

diff --git a/google-beta/data_source_google_compute_instance_group_test.go b/google-beta/data_source_google_compute_instance_group_test.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/acctest"
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccDataSourceGoogleComputeInstanceGroup_basic(t *testing.T) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"fmt"
     	"time"
-    	"github.com/hashicorp/terraform/helper/schema"
+    	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
     )
     func dataSourceGoogleClientOpenIDUserinfo() *schema.Resource {
@@ Expand Down @@