Skip to content

Commit cfd1573

Browse files
nat-hendersonnat-henderson
authored
Upgrade to provider sdk. (hashicorp#1197)
This change should be a no-op - it only changes a handful of imports.
1 parent dc3fc90 commit cfd1573

File tree

599 files changed

+1213
-1213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

599 files changed

+1213
-1213
lines changed

‎google-beta/common_operation.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"log"
66
"time"
77

8-
"github.com/hashicorp/terraform/helper/resource"
8+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
99
cloudresourcemanager "google.golang.org/api/cloudresourcemanager/v1"
1010
"google.golang.org/api/googleapi"
1111
)

‎google-beta/compute_instance_helpers.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package google
33
import (
44
"fmt"
55

6-
"github.com/hashicorp/terraform/helper/schema"
7-
"github.com/hashicorp/terraform/helper/validation"
6+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
7+
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
88
computeBeta "google.golang.org/api/compute/v0.beta"
99
"google.golang.org/api/googleapi"
1010
)

‎google-beta/config.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"regexp"
99
"time"
1010

11-
"github.com/hashicorp/terraform/helper/logging"
12-
"github.com/hashicorp/terraform/helper/pathorcontents"
13-
"github.com/hashicorp/terraform/httpclient"
11+
"github.com/hashicorp/terraform-plugin-sdk/helper/logging"
12+
"github.com/hashicorp/terraform-plugin-sdk/helper/pathorcontents"
13+
"github.com/hashicorp/terraform-plugin-sdk/httpclient"
1414
"github.com/terraform-providers/terraform-provider-google-beta/version"
1515

1616
"golang.org/x/oauth2"

‎google-beta/config_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"testing"
99
"time"
1010

11-
"github.com/hashicorp/terraform/helper/resource"
11+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
1212
"golang.org/x/oauth2/google"
1313
)
1414

‎google-beta/data_source_compute_lb_ip_ranges.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package google
22

33
import (
4-
"github.com/hashicorp/terraform/helper/schema"
4+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
55
)
66

77
func dataSourceGoogleComputeLbIpRanges() *schema.Resource {

‎google-beta/data_source_compute_lb_ip_ranges_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"regexp"
55
"testing"
66

7-
"github.com/hashicorp/terraform/helper/resource"
7+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
88
)
99

1010
func TestAccDataSourceComputeLbIpRanges_basic(t *testing.T) {

‎google-beta/data_source_compute_network_endpoint_group.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"errors"
55
"fmt"
66

7-
"github.com/hashicorp/terraform/helper/schema"
7+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
88
)
99

1010
func dataSourceGoogleComputeNetworkEndpointGroup() *schema.Resource {

‎google-beta/data_source_compute_network_endpoint_group_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"fmt"
55
"testing"
66

7-
"github.com/hashicorp/terraform/helper/acctest"
8-
"github.com/hashicorp/terraform/helper/resource"
9-
"github.com/hashicorp/terraform/terraform"
7+
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
8+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
9+
"github.com/hashicorp/terraform-plugin-sdk/terraform"
1010
)
1111

1212
func TestAccDataSourceComputeNetworkEndpointGroup(t *testing.T) {

‎google-beta/data_source_container_registry_image.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"strings"
66

7-
"github.com/hashicorp/terraform/helper/schema"
7+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
88
)
99

1010
func dataSourceGoogleContainerImage() *schema.Resource {

‎google-beta/data_source_container_registry_repository.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"strings"
66

7-
"github.com/hashicorp/terraform/helper/schema"
7+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
88
)
99

1010
func dataSourceGoogleContainerRepo() *schema.Resource {

‎google-beta/data_source_container_registry_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package google
33
import (
44
"testing"
55

6-
"github.com/hashicorp/terraform/helper/resource"
6+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
77
)
88

99
func TestDataSourceGoogleContainerRegistryRepository(t *testing.T) {

‎google-beta/data_source_dns_managed_zone.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package google
22

3-
import "github.com/hashicorp/terraform/helper/schema"
3+
import "github.com/hashicorp/terraform-plugin-sdk/helper/schema"
44

55
func dataSourceDnsManagedZone() *schema.Resource {
66
return &schema.Resource{

‎google-beta/data_source_dns_managed_zone_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"fmt"
55
"testing"
66

7-
"github.com/hashicorp/terraform/helper/acctest"
8-
"github.com/hashicorp/terraform/helper/resource"
7+
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
8+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
99
)
1010

1111
func TestAccDataSourceDnsManagedZone_basic(t *testing.T) {

‎google-beta/data_source_google_active_folder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"net/url"
66

7-
"github.com/hashicorp/terraform/helper/schema"
7+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
88
resourceManagerV2Beta1 "google.golang.org/api/cloudresourcemanager/v2beta1"
99
)
1010

‎google-beta/data_source_google_active_folder_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"fmt"
55
"testing"
66

7-
"github.com/hashicorp/terraform/helper/acctest"
8-
"github.com/hashicorp/terraform/helper/resource"
9-
"github.com/hashicorp/terraform/terraform"
7+
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
8+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
9+
"github.com/hashicorp/terraform-plugin-sdk/terraform"
1010
)
1111

1212
func TestAccDataSourceGoogleActiveFolder_default(t *testing.T) {

‎google-beta/data_source_google_billing_account.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"strings"
66

7-
"github.com/hashicorp/terraform/helper/schema"
7+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
88

99
"google.golang.org/api/cloudbilling/v1"
1010
)

‎google-beta/data_source_google_billing_account_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"regexp"
66
"testing"
77

8-
"github.com/hashicorp/terraform/helper/acctest"
8+
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
99

10-
"github.com/hashicorp/terraform/helper/resource"
10+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
1111
)
1212

1313
func TestAccDataSourceGoogleBillingAccount_byFullName(t *testing.T) {

‎google-beta/data_source_google_client_config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package google
33
import (
44
"time"
55

6-
"github.com/hashicorp/terraform/helper/schema"
6+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
77
)
88

99
func dataSourceGoogleClientConfig() *schema.Resource {

‎google-beta/data_source_google_client_config_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package google
33
import (
44
"testing"
55

6-
"github.com/hashicorp/terraform/helper/resource"
6+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
77
)
88

99
func TestAccDataSourceGoogleClientConfig_basic(t *testing.T) {

‎google-beta/data_source_google_client_openid_userinfo.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"time"
66

7-
"github.com/hashicorp/terraform/helper/schema"
7+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
88
)
99

1010
func dataSourceGoogleClientOpenIDUserinfo() *schema.Resource {

‎google-beta/data_source_google_client_openid_userinfo_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package google
33
import (
44
"testing"
55

6-
"github.com/hashicorp/terraform/helper/resource"
6+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
77
)
88

99
func TestAccDataSourceGoogleClientOpenIDUserinfo_basic(t *testing.T) {

‎google-beta/data_source_google_cloudfunctions_function.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package google
22

33
import (
4-
"github.com/hashicorp/terraform/helper/schema"
4+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
55
)
66

77
func dataSourceGoogleCloudFunctionsFunction() *schema.Resource {

‎google-beta/data_source_google_cloudfunctions_function_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"os"
66
"testing"
77

8-
"github.com/hashicorp/terraform/helper/acctest"
9-
"github.com/hashicorp/terraform/helper/resource"
8+
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
9+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
1010
)
1111

1212
func TestAccDataSourceGoogleCloudFunctionsFunction_basic(t *testing.T) {

‎google-beta/data_source_google_composer_image_versions.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"log"
66
"time"
77

8-
"github.com/hashicorp/terraform/helper/schema"
8+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
99
)
1010

1111
func dataSourceGoogleComposerImageVersions() *schema.Resource {

‎google-beta/data_source_google_composer_image_versions_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"strconv"
77
"testing"
88

9-
"github.com/hashicorp/terraform/helper/resource"
10-
"github.com/hashicorp/terraform/terraform"
9+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
10+
"github.com/hashicorp/terraform-plugin-sdk/terraform"
1111
)
1212

1313
func TestAccDataSourceComposerImageVersions_basic(t *testing.T) {

‎google-beta/data_source_google_compute_address.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"strconv"
77
"strings"
88

9-
"github.com/hashicorp/terraform/helper/schema"
9+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
1010
)
1111

1212
var (

‎google-beta/data_source_google_compute_address_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"fmt"
55
"testing"
66

7-
"github.com/hashicorp/terraform/helper/resource"
8-
"github.com/hashicorp/terraform/terraform"
7+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
8+
"github.com/hashicorp/terraform-plugin-sdk/terraform"
99
)
1010

1111
func TestComputeAddressIdParsing(t *testing.T) {

‎google-beta/data_source_google_compute_backend_service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package google
22

33
import (
4-
"github.com/hashicorp/terraform/helper/schema"
4+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
55
)
66

77
func dataSourceGoogleComputeBackendService() *schema.Resource {

‎google-beta/data_source_google_compute_backend_service_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"fmt"
55
"testing"
66

7-
"github.com/hashicorp/terraform/helper/acctest"
8-
"github.com/hashicorp/terraform/helper/resource"
7+
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
8+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
99
)
1010

1111
func TestAccDataSourceComputeBackendService_basic(t *testing.T) {

‎google-beta/data_source_google_compute_default_service_account.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package google
22

33
import (
44
"fmt"
5-
"github.com/hashicorp/terraform/helper/schema"
5+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
66
)
77

88
func dataSourceGoogleComputeDefaultServiceAccount() *schema.Resource {

‎google-beta/data_source_google_compute_default_service_account_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package google
33
import (
44
"testing"
55

6-
"github.com/hashicorp/terraform/helper/resource"
6+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
77
)
88

99
func TestAccDataSourceGoogleComputeDefaultServiceAccount_basic(t *testing.T) {

‎google-beta/data_source_google_compute_forwarding_rule.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package google
33
import (
44
"fmt"
55

6-
"github.com/hashicorp/terraform/helper/schema"
6+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
77
)
88

99
func dataSourceGoogleComputeForwardingRule() *schema.Resource {

‎google-beta/data_source_google_compute_forwarding_rule_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"fmt"
55
"testing"
66

7-
"github.com/hashicorp/terraform/helper/acctest"
8-
"github.com/hashicorp/terraform/helper/resource"
9-
"github.com/hashicorp/terraform/terraform"
7+
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
8+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
9+
"github.com/hashicorp/terraform-plugin-sdk/terraform"
1010
)
1111

1212
func TestAccDataSourceGoogleForwardingRule(t *testing.T) {

‎google-beta/data_source_google_compute_global_address.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"strconv"
66

7-
"github.com/hashicorp/terraform/helper/schema"
7+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
88
)
99

1010
func dataSourceGoogleComputeGlobalAddress() *schema.Resource {

‎google-beta/data_source_google_compute_global_address_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"fmt"
55
"testing"
66

7-
"github.com/hashicorp/terraform/helper/resource"
8-
"github.com/hashicorp/terraform/terraform"
7+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
8+
"github.com/hashicorp/terraform-plugin-sdk/terraform"
99
)
1010

1111
func TestAccDataSourceComputeGlobalAddress(t *testing.T) {

‎google-beta/data_source_google_compute_image.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"strconv"
77
"strings"
88

9-
"github.com/hashicorp/terraform/helper/schema"
9+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
1010
compute "google.golang.org/api/compute/v1"
1111
)
1212

‎google-beta/data_source_google_compute_image_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"fmt"
55
"testing"
66

7-
"github.com/hashicorp/terraform/helper/acctest"
8-
"github.com/hashicorp/terraform/helper/resource"
9-
"github.com/hashicorp/terraform/terraform"
7+
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
8+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
9+
"github.com/hashicorp/terraform-plugin-sdk/terraform"
1010
)
1111

1212
func TestAccDataSourceComputeImage(t *testing.T) {

‎google-beta/data_source_google_compute_instance.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package google
33
import (
44
"fmt"
55

6-
"github.com/hashicorp/terraform/helper/schema"
6+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
77
)
88

99
func dataSourceGoogleComputeInstance() *schema.Resource {

‎google-beta/data_source_google_compute_instance_group.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"errors"
55
"fmt"
66

7-
"github.com/hashicorp/terraform/helper/schema"
7+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
88
)
99

1010
func dataSourceGoogleComputeInstanceGroup() *schema.Resource {

‎google-beta/data_source_google_compute_instance_group_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"strings"
1010
"testing"
1111

12-
"github.com/hashicorp/terraform/helper/acctest"
13-
"github.com/hashicorp/terraform/helper/resource"
14-
"github.com/hashicorp/terraform/terraform"
12+
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
13+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
14+
"github.com/hashicorp/terraform-plugin-sdk/terraform"
1515
)
1616

1717
func TestAccDataSourceGoogleComputeInstanceGroup_basic(t *testing.T) {

0 commit comments

Comments
 (0)