diff --git a/mmv1/templates/terraform/examples/base_configs/iam_test_file.go.erb b/mmv1/templates/terraform/examples/base_configs/iam_test_file.go.erb index 62f4113e92ec..4b293b66a68f 100644 --- a/mmv1/templates/terraform/examples/base_configs/iam_test_file.go.erb +++ b/mmv1/templates/terraform/examples/base_configs/iam_test_file.go.erb @@ -10,7 +10,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "<%= import_path() -%>/acctest" "<%= import_path() -%>/envvar" diff --git a/mmv1/templates/terraform/examples/base_configs/iam_test_file.go.tmpl b/mmv1/templates/terraform/examples/base_configs/iam_test_file.go.tmpl index 226135d466c4..99d20d6bc122 100644 --- a/mmv1/templates/terraform/examples/base_configs/iam_test_file.go.tmpl +++ b/mmv1/templates/terraform/examples/base_configs/iam_test_file.go.tmpl @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "{{ $.ImportPath }}/acctest" "{{ $.ImportPath }}/envvar" diff --git a/mmv1/templates/terraform/examples/base_configs/test_file.go.erb b/mmv1/templates/terraform/examples/base_configs/test_file.go.erb index 298046969e4f..7be98a22c943 100644 --- a/mmv1/templates/terraform/examples/base_configs/test_file.go.erb +++ b/mmv1/templates/terraform/examples/base_configs/test_file.go.erb @@ -15,9 +15,9 @@ import ( <% end -%> "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" <% unless object.skip_delete -%> - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/terraform" <% end -%> "<%= import_path() -%>/acctest" diff --git a/mmv1/templates/terraform/examples/base_configs/test_file.go.tmpl b/mmv1/templates/terraform/examples/base_configs/test_file.go.tmpl index 5f7a441a23d7..0ebe1bc6ac11 100644 --- a/mmv1/templates/terraform/examples/base_configs/test_file.go.tmpl +++ b/mmv1/templates/terraform/examples/base_configs/test_file.go.tmpl @@ -26,9 +26,9 @@ import ( {{- end }} "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" {{- if not $.Res.SkipDelete }} - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/terraform" {{- end }} "{{ $.ImportPath }}/acctest" diff --git a/mmv1/templates/terraform/resource.go.tmpl b/mmv1/templates/terraform/resource.go.tmpl index f110361ca13e..a49d8874697c 100644 --- a/mmv1/templates/terraform/resource.go.tmpl +++ b/mmv1/templates/terraform/resource.go.tmpl @@ -47,7 +47,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/structure" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" diff --git a/mmv1/third_party/terraform/acctest/framework_test_utils.go.erb b/mmv1/third_party/terraform/acctest/framework_test_utils.go.erb index aab75cd01021..be56be2d4db0 100644 --- a/mmv1/third_party/terraform/acctest/framework_test_utils.go.erb +++ b/mmv1/third_party/terraform/acctest/framework_test_utils.go.erb @@ -3,14 +3,10 @@ package acctest import ( "context" - "fmt" "log" "testing" "github.com/hashicorp/terraform-plugin-framework/diag" - - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func GetFwTestProvider(t *testing.T) *frameworkTestProvider { @@ -30,47 +26,3 @@ func GetFwTestProvider(t *testing.T) *frameworkTestProvider { return p } - -// General test utils - -// TestExtractResourceAttr navigates a test's state to find the specified resource (or data source) attribute and makes the value -// accessible via the attributeValue string pointer. -func TestExtractResourceAttr(resourceName string, attributeName string, attributeValue *string) resource.TestCheckFunc { - return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] // To find a datasource, include `data.` at the start of the resourceName value - - if !ok { - return fmt.Errorf("resource name %s not found in state", resourceName) - } - - attrValue, ok := rs.Primary.Attributes[attributeName] - - if !ok { - return fmt.Errorf("attribute %s not found in resource %s state", attributeName, resourceName) - } - - *attributeValue = attrValue - - return nil - } -} - -// TestCheckAttributeValuesEqual compares two string pointers, which have been used to retrieve attribute values from the test's state. -func TestCheckAttributeValuesEqual(i *string, j *string) resource.TestCheckFunc { - return func(s *terraform.State) error { - if testStringValue(i) != testStringValue(j) { - return fmt.Errorf("attribute values are different, got %s and %s", testStringValue(i), testStringValue(j)) - } - - return nil - } -} - -// testStringValue returns string values from string pointers, handling nil pointers. -func testStringValue(sPtr *string) string { - if sPtr == nil { - return "" - } - - return *sPtr -} diff --git a/mmv1/third_party/terraform/acctest/provider_test_utils.go b/mmv1/third_party/terraform/acctest/provider_test_utils.go index 651b6371f682..f30086539c1d 100644 --- a/mmv1/third_party/terraform/acctest/provider_test_utils.go +++ b/mmv1/third_party/terraform/acctest/provider_test_utils.go @@ -2,18 +2,15 @@ package acctest import ( "context" - "fmt" "io/ioutil" "os" "strings" "testing" - "time" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/provider" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) @@ -102,41 +99,3 @@ func AccTestPreCheck_AdcCredentialsOnly(t *testing.T) { t.Fatalf("One of %s must be set for acceptance tests", strings.Join(envvar.ZoneEnvVars, ", ")) } } - -// GetTestRegion has the same logic as the provider's GetRegion, to be used in tests. -func GetTestRegion(is *terraform.InstanceState, config *transport_tpg.Config) (string, error) { - if res, ok := is.Attributes["region"]; ok { - return res, nil - } - if config.Region != "" { - return config.Region, nil - } - return "", fmt.Errorf("%q: required field is not set", "region") -} - -// GetTestProject has the same logic as the provider's GetProject, to be used in tests. -func GetTestProject(is *terraform.InstanceState, config *transport_tpg.Config) (string, error) { - if res, ok := is.Attributes["project"]; ok { - return res, nil - } - if config.Project != "" { - return config.Project, nil - } - return "", fmt.Errorf("%q: required field is not set", "project") -} - -// Some tests fail during VCR. One common case is race conditions when creating resources. -// If a test config adds two fine-grained resources with the same parent it is undefined -// which will be created first, causing VCR to fail ~50% of the time -func SkipIfVcr(t *testing.T) { - if IsVcrEnabled() { - t.Skipf("VCR enabled, skipping test: %s", t.Name()) - } -} - -func SleepInSecondsForTest(t int) resource.TestCheckFunc { - return func(s *terraform.State) error { - time.Sleep(time.Duration(t) * time.Second) - return nil - } -} diff --git a/mmv1/third_party/terraform/acctest/resource_test_utils.go b/mmv1/third_party/terraform/acctest/resource_test_utils.go new file mode 100644 index 000000000000..58371fd89cb5 --- /dev/null +++ b/mmv1/third_party/terraform/acctest/resource_test_utils.go @@ -0,0 +1,93 @@ +package acctest + +import ( + "fmt" + "testing" + "time" + + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" + transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" +) + +// General test utils + +// TestExtractResourceAttr navigates a test's state to find the specified resource (or data source) attribute and makes the value +// accessible via the attributeValue string pointer. +func TestExtractResourceAttr(resourceName string, attributeName string, attributeValue *string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[resourceName] // To find a datasource, include `data.` at the start of the resourceName value + + if !ok { + return fmt.Errorf("resource name %s not found in state", resourceName) + } + + attrValue, ok := rs.Primary.Attributes[attributeName] + + if !ok { + return fmt.Errorf("attribute %s not found in resource %s state", attributeName, resourceName) + } + + *attributeValue = attrValue + + return nil + } +} + +// GetTestRegion has the same logic as the provider's GetRegion, to be used in tests. +func GetTestRegion(is *terraform.InstanceState, config *transport_tpg.Config) (string, error) { + if res, ok := is.Attributes["region"]; ok { + return res, nil + } + if config.Region != "" { + return config.Region, nil + } + return "", fmt.Errorf("%q: required field is not set", "region") +} + +// GetTestProject has the same logic as the provider's GetProject, to be used in tests. +func GetTestProject(is *terraform.InstanceState, config *transport_tpg.Config) (string, error) { + if res, ok := is.Attributes["project"]; ok { + return res, nil + } + if config.Project != "" { + return config.Project, nil + } + return "", fmt.Errorf("%q: required field is not set", "project") +} + +// Some tests fail during VCR. One common case is race conditions when creating resources. +// If a test config adds two fine-grained resources with the same parent it is undefined +// which will be created first, causing VCR to fail ~50% of the time +func SkipIfVcr(t *testing.T) { + if IsVcrEnabled() { + t.Skipf("VCR enabled, skipping test: %s", t.Name()) + } +} + +func SleepInSecondsForTest(t int) resource.TestCheckFunc { + return func(s *terraform.State) error { + time.Sleep(time.Duration(t) * time.Second) + return nil + } +} + +// TestCheckAttributeValuesEqual compares two string pointers, which have been used to retrieve attribute values from the test's state. +func TestCheckAttributeValuesEqual(i *string, j *string) resource.TestCheckFunc { + return func(s *terraform.State) error { + if testStringValue(i) != testStringValue(j) { + return fmt.Errorf("attribute values are different, got %s and %s", testStringValue(i), testStringValue(j)) + } + + return nil + } +} + +// testStringValue returns string values from string pointers, handling nil pointers. +func testStringValue(sPtr *string) string { + if sPtr == nil { + return "" + } + + return *sPtr +} diff --git a/mmv1/third_party/terraform/acctest/test_utils.go.erb b/mmv1/third_party/terraform/acctest/test_utils.go.erb index 3fc319222497..ae0ecaaf40e0 100644 --- a/mmv1/third_party/terraform/acctest/test_utils.go.erb +++ b/mmv1/third_party/terraform/acctest/test_utils.go.erb @@ -17,8 +17,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/providerserver" "github.com/hashicorp/terraform-plugin-go/tfprotov5" "github.com/hashicorp/terraform-plugin-mux/tf5muxserver" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/acctest/vcr_utils.go b/mmv1/third_party/terraform/acctest/vcr_utils.go index 9cd6670c2e55..feea805d5999 100644 --- a/mmv1/third_party/terraform/acctest/vcr_utils.go +++ b/mmv1/third_party/terraform/acctest/vcr_utils.go @@ -36,8 +36,8 @@ import ( "github.com/hashicorp/terraform-plugin-go/tfprotov5" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func IsVcrEnabled() bool { diff --git a/mmv1/third_party/terraform/functions/location_from_id_test.go b/mmv1/third_party/terraform/functions/location_from_id_test.go index 209fc794ae9a..8c50952ab746 100644 --- a/mmv1/third_party/terraform/functions/location_from_id_test.go +++ b/mmv1/third_party/terraform/functions/location_from_id_test.go @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/functions/name_from_id_test.go b/mmv1/third_party/terraform/functions/name_from_id_test.go index f5084cb1d230..291cdec4a336 100644 --- a/mmv1/third_party/terraform/functions/name_from_id_test.go +++ b/mmv1/third_party/terraform/functions/name_from_id_test.go @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/functions/project_from_id_test.go b/mmv1/third_party/terraform/functions/project_from_id_test.go index 0677aa783747..4439bb31a742 100644 --- a/mmv1/third_party/terraform/functions/project_from_id_test.go +++ b/mmv1/third_party/terraform/functions/project_from_id_test.go @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/functions/region_from_id_test.go b/mmv1/third_party/terraform/functions/region_from_id_test.go index 96f6661c38fb..7e7ba815a0a0 100644 --- a/mmv1/third_party/terraform/functions/region_from_id_test.go +++ b/mmv1/third_party/terraform/functions/region_from_id_test.go @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/functions/region_from_zone_test.go b/mmv1/third_party/terraform/functions/region_from_zone_test.go index 5ce3679d104f..9a01201bae82 100644 --- a/mmv1/third_party/terraform/functions/region_from_zone_test.go +++ b/mmv1/third_party/terraform/functions/region_from_zone_test.go @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/functions/zone_from_id_test.go b/mmv1/third_party/terraform/functions/zone_from_id_test.go index 45247ef1aee0..46064a66c532 100644 --- a/mmv1/third_party/terraform/functions/zone_from_id_test.go +++ b/mmv1/third_party/terraform/functions/zone_from_id_test.go @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/fwprovider/framework_provider_test.go.erb b/mmv1/third_party/terraform/fwprovider/framework_provider_test.go.erb index a486ea29e510..116acd7fca0f 100644 --- a/mmv1/third_party/terraform/fwprovider/framework_provider_test.go.erb +++ b/mmv1/third_party/terraform/fwprovider/framework_provider_test.go.erb @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/fwresource" diff --git a/mmv1/third_party/terraform/fwprovider/go/framework_provider_test.go.tmpl b/mmv1/third_party/terraform/fwprovider/go/framework_provider_test.go.tmpl index c5a53d10d2ec..488c19c15632 100644 --- a/mmv1/third_party/terraform/fwprovider/go/framework_provider_test.go.tmpl +++ b/mmv1/third_party/terraform/fwprovider/go/framework_provider_test.go.tmpl @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/fwresource" diff --git a/mmv1/third_party/terraform/fwresource/field_helpers.go b/mmv1/third_party/terraform/fwresource/field_helpers.go index a33b5802b881..cfc09b5337a7 100644 --- a/mmv1/third_party/terraform/fwresource/field_helpers.go +++ b/mmv1/third_party/terraform/fwresource/field_helpers.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/fwtransport" "github.com/hashicorp/terraform-provider-google/google/tpgresource" ) diff --git a/mmv1/third_party/terraform/go.mod.erb b/mmv1/third_party/terraform/go.mod.erb index 20470932ebef..41eb8f25e711 100644 --- a/mmv1/third_party/terraform/go.mod.erb +++ b/mmv1/third_party/terraform/go.mod.erb @@ -19,10 +19,11 @@ require ( github.com/hashicorp/go-version v1.6.0 github.com/hashicorp/terraform-plugin-framework v1.7.0 github.com/hashicorp/terraform-plugin-framework-validators v0.9.0 - github.com/hashicorp/terraform-plugin-go v0.22.1 + github.com/hashicorp/terraform-plugin-go v0.23.0 github.com/hashicorp/terraform-plugin-log v0.9.0 github.com/hashicorp/terraform-plugin-mux v0.15.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0 + github.com/hashicorp/terraform-plugin-testing v1.5.1 github.com/mitchellh/go-homedir v1.1.0 github.com/mitchellh/hashstructure v1.1.0 github.com/sirupsen/logrus v1.8.1 @@ -44,7 +45,7 @@ require ( cloud.google.com/go/compute/metadata v0.3.0 // indirect cloud.google.com/go/iam v1.1.8 // indirect cloud.google.com/go/longrunning v0.5.7 // indirect - github.com/ProtonMail/go-crypto v1.1.0-alpha.0 // indirect + github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect github.com/agext/levenshtein v1.2.2 // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect @@ -68,14 +69,14 @@ require ( github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/googleapis/gax-go/v2 v2.12.4 // indirect github.com/hashicorp/go-checkpoint v0.5.0 // indirect - github.com/hashicorp/go-hclog v1.5.0 // indirect + github.com/hashicorp/go-hclog v1.6.3 // indirect github.com/hashicorp/go-plugin v1.6.0 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect - github.com/hashicorp/hc-install v0.6.3 // indirect - github.com/hashicorp/hcl/v2 v2.19.1 // indirect + github.com/hashicorp/hc-install v0.6.4 // indirect + github.com/hashicorp/hcl/v2 v2.20.1 // indirect github.com/hashicorp/logutils v1.0.0 // indirect - github.com/hashicorp/terraform-exec v0.20.0 // indirect - github.com/hashicorp/terraform-json v0.21.0 // indirect + github.com/hashicorp/terraform-exec v0.21.0 // indirect + github.com/hashicorp/terraform-json v0.22.1 // indirect github.com/hashicorp/terraform-registry-address v0.2.3 // indirect github.com/hashicorp/terraform-svchost v0.1.1 // indirect github.com/hashicorp/yamux v0.1.1 // indirect @@ -92,7 +93,7 @@ require ( github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect - github.com/zclconf/go-cty v1.14.2 // indirect + github.com/zclconf/go-cty v1.14.4 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect @@ -105,6 +106,7 @@ require ( golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect golang.org/x/time v0.5.0 // indirect + golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240617180043-68d350f18fd4 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240610135401-a8a62080eff3 // indirect diff --git a/mmv1/third_party/terraform/go.sum b/mmv1/third_party/terraform/go.sum index 04ec71650cc1..4912869c1bf4 100644 --- a/mmv1/third_party/terraform/go.sum +++ b/mmv1/third_party/terraform/go.sum @@ -22,8 +22,8 @@ github.com/GoogleCloudPlatform/declarative-resource-client-library v1.68.0 h1:LI github.com/GoogleCloudPlatform/declarative-resource-client-library v1.68.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= -github.com/ProtonMail/go-crypto v1.1.0-alpha.0 h1:nHGfwXmFvJrSR9xu8qL7BkO4DqTHXE9N5vPhgY2I+j0= -github.com/ProtonMail/go-crypto v1.1.0-alpha.0/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= +github.com/ProtonMail/go-crypto v1.1.0-alpha.2 h1:bkyFVUP+ROOARdgCiJzNQo2V2kiB97LyUpzH9P6Hrlg= +github.com/ProtonMail/go-crypto v1.1.0-alpha.2/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE= github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/apparentlymart/go-cidr v1.1.0 h1:2mAhrMoF+nhXqxTzSZMUzDHkLjmIHC+Zzn4tdgBZjnU= @@ -77,8 +77,8 @@ github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66D github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU= github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow= -github.com/go-git/go-git/v5 v5.11.0 h1:XIZc1p+8YzypNr34itUfSvYJcv+eYdTnTvOZ2vD3cA4= -github.com/go-git/go-git/v5 v5.11.0/go.mod h1:6GFcX2P3NM7FPBfpePbpLd21XxsgdAt+lKqXmCUiUCY= +github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZtys= +github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -146,8 +146,8 @@ github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9n github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 h1:1/D3zfFHttUKaCaGKZ/dR2roBXv0vKbSCnssIldfQdI= github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320/go.mod h1:EiZBMaudVLy8fmjf9Npq1dq9RalhveqZG5w/yz3mHWs= -github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= -github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= +github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-plugin v1.6.0 h1:wgd4KxHJTVGGqWBq4QPB1i5BZNEx9BR8+OFmHDmTk8A= @@ -157,28 +157,30 @@ github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/C github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/hc-install v0.6.3 h1:yE/r1yJvWbtrJ0STwScgEnCanb0U9v7zp0Gbkmcoxqs= -github.com/hashicorp/hc-install v0.6.3/go.mod h1:KamGdbodYzlufbWh4r9NRo8y6GLHWZP2GBtdnms1Ln0= -github.com/hashicorp/hcl/v2 v2.19.1 h1://i05Jqznmb2EXqa39Nsvyan2o5XyMowW5fnCKW5RPI= -github.com/hashicorp/hcl/v2 v2.19.1/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE= +github.com/hashicorp/hc-install v0.6.4 h1:QLqlM56/+SIIGvGcfFiwMY3z5WGXT066suo/v9Km8e0= +github.com/hashicorp/hc-install v0.6.4/go.mod h1:05LWLy8TD842OtgcfBbOT0WMoInBMUSHjmDx10zuBIA= +github.com/hashicorp/hcl/v2 v2.20.1 h1:M6hgdyz7HYt1UN9e61j+qKJBqR3orTWbI1HKBJEdxtc= +github.com/hashicorp/hcl/v2 v2.20.1/go.mod h1:TZDqQ4kNKCbh1iJp99FdPiUaVDDUPivbqxZulxDYqL4= github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/terraform-exec v0.20.0 h1:DIZnPsqzPGuUnq6cH8jWcPunBfY+C+M8JyYF3vpnuEo= -github.com/hashicorp/terraform-exec v0.20.0/go.mod h1:ckKGkJWbsNqFKV1itgMnE0hY9IYf1HoiekpuN0eWoDw= -github.com/hashicorp/terraform-json v0.21.0 h1:9NQxbLNqPbEMze+S6+YluEdXgJmhQykRyRNd+zTI05U= -github.com/hashicorp/terraform-json v0.21.0/go.mod h1:qdeBs11ovMzo5puhrRibdD6d2Dq6TyE/28JiU4tIQxk= +github.com/hashicorp/terraform-exec v0.21.0 h1:uNkLAe95ey5Uux6KJdua6+cv8asgILFVWkd/RG0D2XQ= +github.com/hashicorp/terraform-exec v0.21.0/go.mod h1:1PPeMYou+KDUSSeRE9szMZ/oHf4fYUmB923Wzbq1ICg= +github.com/hashicorp/terraform-json v0.22.1 h1:xft84GZR0QzjPVWs4lRUwvTcPnegqlyS7orfb5Ltvec= +github.com/hashicorp/terraform-json v0.22.1/go.mod h1:JbWSQCLFSXFFhg42T7l9iJwdGXBYV8fmmD6o/ML4p3A= github.com/hashicorp/terraform-plugin-framework v1.7.0 h1:wOULbVmfONnJo9iq7/q+iBOBJul5vRovaYJIu2cY/Pw= github.com/hashicorp/terraform-plugin-framework v1.7.0/go.mod h1:jY9Id+3KbZ17OMpulgnWLSfwxNVYSoYBQFTgsx044CI= github.com/hashicorp/terraform-plugin-framework-validators v0.9.0 h1:LYz4bXh3t7bTEydXOmPDPupRRnA480B/9+jV8yZvxBA= github.com/hashicorp/terraform-plugin-framework-validators v0.9.0/go.mod h1:+BVERsnfdlhYR2YkXMBtPnmn9UsL19U3qUtSZ+Y/5MY= -github.com/hashicorp/terraform-plugin-go v0.22.1 h1:iTS7WHNVrn7uhe3cojtvWWn83cm2Z6ryIUDTRO0EV7w= -github.com/hashicorp/terraform-plugin-go v0.22.1/go.mod h1:qrjnqRghvQ6KnDbB12XeZ4FluclYwptntoWCr9QaXTI= +github.com/hashicorp/terraform-plugin-go v0.23.0 h1:AALVuU1gD1kPb48aPQUjug9Ir/125t+AAurhqphJ2Co= +github.com/hashicorp/terraform-plugin-go v0.23.0/go.mod h1:1E3Cr9h2vMlahWMbsSEcNrOCxovCZhOOIXjFHbjc/lQ= github.com/hashicorp/terraform-plugin-log v0.9.0 h1:i7hOA+vdAItN1/7UrfBqBwvYPQ9TFvymaRGZED3FCV0= github.com/hashicorp/terraform-plugin-log v0.9.0/go.mod h1:rKL8egZQ/eXSyDqzLUuwUYLVdlYeamldAHSxjUFADow= github.com/hashicorp/terraform-plugin-mux v0.15.0 h1:+/+lDx0WUsIOpkAmdwBIoFU8UP9o2eZASoOnLsWbKME= github.com/hashicorp/terraform-plugin-mux v0.15.0/go.mod h1:9ezplb1Dyq394zQ+ldB0nvy/qbNAz3mMoHHseMTMaKo= github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0 h1:qHprzXy/As0rxedphECBEQAh3R4yp6pKksKHcqZx5G8= github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0/go.mod h1:H+8tjs9TjV2w57QFVSMBQacf8k/E1XwLXGCARgViC6A= +github.com/hashicorp/terraform-plugin-testing v1.5.1 h1:T4aQh9JAhmWo4+t1A7x+rnxAJHCDIYW9kXyo4sVO92c= +github.com/hashicorp/terraform-plugin-testing v1.5.1/go.mod h1:dg8clO6K59rZ8w9EshBmDp1CxTIPu3yA4iaDpX1h5u0= github.com/hashicorp/terraform-registry-address v0.2.3 h1:2TAiKJ1A3MAkZlH1YI/aTVcLZRu7JseiXNRHbOAyoTI= github.com/hashicorp/terraform-registry-address v0.2.3/go.mod h1:lFHA76T8jfQteVfT7caREqguFrW3c4MFSPhZB7HHgUM= github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ= @@ -237,13 +239,13 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= -github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= +github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ= -github.com/skeema/knownhosts v1.2.1/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= +github.com/skeema/knownhosts v1.2.2 h1:Iug2P4fLmDw9f41PB6thxUkNUkJzB5i+1/exaj40L3A= +github.com/skeema/knownhosts v1.2.2/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= @@ -268,8 +270,10 @@ github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/zclconf/go-cty v1.14.2 h1:kTG7lqmBou0Zkx35r6HJHUQTvaRPr5bIAf3AoHS0izI= -github.com/zclconf/go-cty v1.14.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +github.com/zclconf/go-cty v1.14.4 h1:uXXczd9QDGsgu0i/QFR/hzI5NYCHLf6NQw/atrbnhq8= +github.com/zclconf/go-cty v1.14.4/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b h1:FosyBZYxY34Wul7O/MSKey3txpPYyCqVO5ZyceuQJEI= +github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= diff --git a/mmv1/third_party/terraform/go/go.mod b/mmv1/third_party/terraform/go/go.mod index 5fa8af5fb7ca..e892895f1be9 100644 --- a/mmv1/third_party/terraform/go/go.mod +++ b/mmv1/third_party/terraform/go/go.mod @@ -18,10 +18,11 @@ require ( github.com/hashicorp/go-version v1.6.0 github.com/hashicorp/terraform-plugin-framework v1.7.0 github.com/hashicorp/terraform-plugin-framework-validators v0.9.0 - github.com/hashicorp/terraform-plugin-go v0.22.1 + github.com/hashicorp/terraform-plugin-go v0.23.0 github.com/hashicorp/terraform-plugin-log v0.9.0 github.com/hashicorp/terraform-plugin-mux v0.15.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0 + github.com/hashicorp/terraform-plugin-testing v1.5.1 github.com/mitchellh/go-homedir v1.1.0 github.com/mitchellh/hashstructure v1.1.0 github.com/sirupsen/logrus v1.8.1 @@ -43,7 +44,7 @@ require ( cloud.google.com/go/compute/metadata v0.3.0 // indirect cloud.google.com/go/iam v1.1.8 // indirect cloud.google.com/go/longrunning v0.5.7 // indirect - github.com/ProtonMail/go-crypto v1.1.0-alpha.0 // indirect + github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect github.com/agext/levenshtein v1.2.2 // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect @@ -67,14 +68,14 @@ require ( github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/googleapis/gax-go/v2 v2.12.4 // indirect github.com/hashicorp/go-checkpoint v0.5.0 // indirect - github.com/hashicorp/go-hclog v1.5.0 // indirect + github.com/hashicorp/go-hclog v1.6.3 // indirect github.com/hashicorp/go-plugin v1.6.0 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect - github.com/hashicorp/hc-install v0.6.3 // indirect - github.com/hashicorp/hcl/v2 v2.19.1 // indirect + github.com/hashicorp/hc-install v0.6.4 // indirect + github.com/hashicorp/hcl/v2 v2.20.1 // indirect github.com/hashicorp/logutils v1.0.0 // indirect - github.com/hashicorp/terraform-exec v0.20.0 // indirect - github.com/hashicorp/terraform-json v0.21.0 // indirect + github.com/hashicorp/terraform-exec v0.21.0 // indirect + github.com/hashicorp/terraform-json v0.22.1 // indirect github.com/hashicorp/terraform-registry-address v0.2.3 // indirect github.com/hashicorp/terraform-svchost v0.1.1 // indirect github.com/hashicorp/yamux v0.1.1 // indirect @@ -91,7 +92,7 @@ require ( github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect - github.com/zclconf/go-cty v1.14.2 // indirect + github.com/zclconf/go-cty v1.14.4 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect @@ -104,6 +105,7 @@ require ( golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect golang.org/x/time v0.5.0 // indirect + golang.org/x/tools v0.20.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240617180043-68d350f18fd4 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240610135401-a8a62080eff3 // indirect diff --git a/mmv1/third_party/terraform/provider/go/provider_test.go.tmpl b/mmv1/third_party/terraform/provider/go/provider_test.go.tmpl index 13fc3693271d..eaab031e0383 100644 --- a/mmv1/third_party/terraform/provider/go/provider_test.go.tmpl +++ b/mmv1/third_party/terraform/provider/go/provider_test.go.tmpl @@ -12,9 +12,9 @@ import ( "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestProvider(t *testing.T) { diff --git a/mmv1/third_party/terraform/provider/provider_test.go.erb b/mmv1/third_party/terraform/provider/provider_test.go.erb index 4072b9b1246f..3295e541aac5 100644 --- a/mmv1/third_party/terraform/provider/provider_test.go.erb +++ b/mmv1/third_party/terraform/provider/provider_test.go.erb @@ -13,9 +13,9 @@ import ( "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestProvider(t *testing.T) { diff --git a/mmv1/third_party/terraform/provider/universe/universe_domain_compute_test.go b/mmv1/third_party/terraform/provider/universe/universe_domain_compute_test.go index f345ac3d1968..8ea474505ac4 100644 --- a/mmv1/third_party/terraform/provider/universe/universe_domain_compute_test.go +++ b/mmv1/third_party/terraform/provider/universe/universe_domain_compute_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/provider/universe/universe_domain_pubsub_test.go b/mmv1/third_party/terraform/provider/universe/universe_domain_pubsub_test.go index ac1bbbffec01..92a55e5d2b72 100644 --- a/mmv1/third_party/terraform/provider/universe/universe_domain_pubsub_test.go +++ b/mmv1/third_party/terraform/provider/universe/universe_domain_pubsub_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/provider/universe/universe_domain_storage_test.go b/mmv1/third_party/terraform/provider/universe/universe_domain_storage_test.go index 934b3e83ef41..889edc716a57 100644 --- a/mmv1/third_party/terraform/provider/universe/universe_domain_storage_test.go +++ b/mmv1/third_party/terraform/provider/universe/universe_domain_storage_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/accessapproval/data_source_access_approval_folder_service_account_test.go b/mmv1/third_party/terraform/services/accessapproval/data_source_access_approval_folder_service_account_test.go index 46111971b9ac..b8d5438a9cf2 100644 --- a/mmv1/third_party/terraform/services/accessapproval/data_source_access_approval_folder_service_account_test.go +++ b/mmv1/third_party/terraform/services/accessapproval/data_source_access_approval_folder_service_account_test.go @@ -3,7 +3,7 @@ package accessapproval_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/accessapproval/data_source_access_approval_organization_service_account_test.go b/mmv1/third_party/terraform/services/accessapproval/data_source_access_approval_organization_service_account_test.go index c337e51cf4ca..c53984349960 100644 --- a/mmv1/third_party/terraform/services/accessapproval/data_source_access_approval_organization_service_account_test.go +++ b/mmv1/third_party/terraform/services/accessapproval/data_source_access_approval_organization_service_account_test.go @@ -3,7 +3,7 @@ package accessapproval_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/accessapproval/data_source_access_approval_project_service_account_test.go b/mmv1/third_party/terraform/services/accessapproval/data_source_access_approval_project_service_account_test.go index f7b23570f0c0..c7261f5e75e9 100644 --- a/mmv1/third_party/terraform/services/accessapproval/data_source_access_approval_project_service_account_test.go +++ b/mmv1/third_party/terraform/services/accessapproval/data_source_access_approval_project_service_account_test.go @@ -3,7 +3,7 @@ package accessapproval_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/accessapproval/resource_access_approval_folder_settings_test.go b/mmv1/third_party/terraform/services/accessapproval/resource_access_approval_folder_settings_test.go index 352477fd0473..d6515f0a1f01 100644 --- a/mmv1/third_party/terraform/services/accessapproval/resource_access_approval_folder_settings_test.go +++ b/mmv1/third_party/terraform/services/accessapproval/resource_access_approval_folder_settings_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) // Since access approval settings are hierarchical, and only one can exist per folder/project/org, diff --git a/mmv1/third_party/terraform/services/accessapproval/resource_access_approval_organization_settings_test.go b/mmv1/third_party/terraform/services/accessapproval/resource_access_approval_organization_settings_test.go index a7b2f44611db..6dee51236aca 100644 --- a/mmv1/third_party/terraform/services/accessapproval/resource_access_approval_organization_settings_test.go +++ b/mmv1/third_party/terraform/services/accessapproval/resource_access_approval_organization_settings_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) // Since access approval settings are hierarchical, and only one can exist per folder/project/org, diff --git a/mmv1/third_party/terraform/services/accessapproval/resource_access_approval_project_settings_test.go b/mmv1/third_party/terraform/services/accessapproval/resource_access_approval_project_settings_test.go index 4839af9d5fc6..9f39d767937e 100644 --- a/mmv1/third_party/terraform/services/accessapproval/resource_access_approval_project_settings_test.go +++ b/mmv1/third_party/terraform/services/accessapproval/resource_access_approval_project_settings_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) // Since access approval settings are hierarchical, and only one can exist per folder/project/org, diff --git a/mmv1/third_party/terraform/services/accesscontextmanager/go/resource_access_context_manager_access_level_test.go.tmpl b/mmv1/third_party/terraform/services/accesscontextmanager/go/resource_access_context_manager_access_level_test.go.tmpl index 65d60f762176..f2d5dd34bec7 100644 --- a/mmv1/third_party/terraform/services/accesscontextmanager/go/resource_access_context_manager_access_level_test.go.tmpl +++ b/mmv1/third_party/terraform/services/accesscontextmanager/go/resource_access_context_manager_access_level_test.go.tmpl @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/accesscontextmanager/go/resource_access_context_manager_access_policy_test.go.tmpl b/mmv1/third_party/terraform/services/accesscontextmanager/go/resource_access_context_manager_access_policy_test.go.tmpl index 64b32f9390a6..9a45445de045 100644 --- a/mmv1/third_party/terraform/services/accesscontextmanager/go/resource_access_context_manager_access_policy_test.go.tmpl +++ b/mmv1/third_party/terraform/services/accesscontextmanager/go/resource_access_context_manager_access_policy_test.go.tmpl @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/accesscontextmanager/go/resource_access_context_manager_service_perimeter_test.go.tmpl b/mmv1/third_party/terraform/services/accesscontextmanager/go/resource_access_context_manager_service_perimeter_test.go.tmpl index d87947ff8187..a896226b53ff 100644 --- a/mmv1/third_party/terraform/services/accesscontextmanager/go/resource_access_context_manager_service_perimeter_test.go.tmpl +++ b/mmv1/third_party/terraform/services/accesscontextmanager/go/resource_access_context_manager_service_perimeter_test.go.tmpl @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_level_condition_test.go b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_level_condition_test.go index 047e93801469..9c9ec415ebb2 100644 --- a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_level_condition_test.go +++ b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_level_condition_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_level_test.go.erb b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_level_test.go.erb index fd21c8ed60d7..7b7fa62f6ebc 100644 --- a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_level_test.go.erb +++ b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_level_test.go.erb @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_levels_test.go b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_levels_test.go index 21e782058d6f..8710e8d8627c 100644 --- a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_levels_test.go +++ b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_levels_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_policy_iam_test.go b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_policy_iam_test.go index d6c1008943c2..493fdd7c385f 100644 --- a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_policy_iam_test.go +++ b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_policy_iam_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_policy_test.go.erb b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_policy_test.go.erb index 76ea6244cbfd..c588f8d2d450 100644 --- a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_policy_test.go.erb @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_authorized_orgs_desc_test.go b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_authorized_orgs_desc_test.go index 264287678ce9..82e7eea20bdd 100644 --- a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_authorized_orgs_desc_test.go +++ b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_authorized_orgs_desc_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_gcp_user_access_binding_test.go b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_gcp_user_access_binding_test.go index 9862b41c7393..f49a9ad18ed3 100644 --- a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_gcp_user_access_binding_test.go +++ b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_gcp_user_access_binding_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_resource_test.go b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_resource_test.go index 3c240fdd5d85..c475e1e04c01 100644 --- a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_resource_test.go +++ b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_resource_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_service_perimeter_egress_policy_test.go b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_service_perimeter_egress_policy_test.go index d6c2db7e0771..4da90d018860 100644 --- a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_service_perimeter_egress_policy_test.go +++ b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_service_perimeter_egress_policy_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_service_perimeter_ingress_policy_test.go b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_service_perimeter_ingress_policy_test.go index 09f2cf27b3d5..053a5b2c2829 100644 --- a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_service_perimeter_ingress_policy_test.go +++ b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_service_perimeter_ingress_policy_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_service_perimeter_resource_test.go b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_service_perimeter_resource_test.go index 5505816c1826..13e4e394fc2d 100644 --- a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_service_perimeter_resource_test.go +++ b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_service_perimeter_resource_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_service_perimeter_test.go.erb b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_service_perimeter_test.go.erb index 4281966ca65a..2b2cdeebf3e2 100644 --- a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_service_perimeter_test.go.erb +++ b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_service_perimeter_test.go.erb @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_services_perimeters_test.go b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_services_perimeters_test.go index 2b451a7b3a0e..b62aa5b65bc4 100644 --- a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_services_perimeters_test.go +++ b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_services_perimeters_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/activedirectory/resource_active_directory_domain_trust_test.go b/mmv1/third_party/terraform/services/activedirectory/resource_active_directory_domain_trust_test.go index eacf8b2353d9..53d1d9516f2e 100644 --- a/mmv1/third_party/terraform/services/activedirectory/resource_active_directory_domain_trust_test.go +++ b/mmv1/third_party/terraform/services/activedirectory/resource_active_directory_domain_trust_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/activedirectory/resource_active_directory_domain_update_test.go b/mmv1/third_party/terraform/services/activedirectory/resource_active_directory_domain_update_test.go index de9069c50cc4..ca16715704e8 100644 --- a/mmv1/third_party/terraform/services/activedirectory/resource_active_directory_domain_update_test.go +++ b/mmv1/third_party/terraform/services/activedirectory/resource_active_directory_domain_update_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/alloydb/data_source_alloydb_locations_test.go b/mmv1/third_party/terraform/services/alloydb/data_source_alloydb_locations_test.go index fe5f2c996b38..b1c25556008d 100644 --- a/mmv1/third_party/terraform/services/alloydb/data_source_alloydb_locations_test.go +++ b/mmv1/third_party/terraform/services/alloydb/data_source_alloydb_locations_test.go @@ -6,8 +6,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/alloydb/data_source_alloydb_supported_database_flags_test.go b/mmv1/third_party/terraform/services/alloydb/data_source_alloydb_supported_database_flags_test.go index c8b499facb37..188351332c04 100644 --- a/mmv1/third_party/terraform/services/alloydb/data_source_alloydb_supported_database_flags_test.go +++ b/mmv1/third_party/terraform/services/alloydb/data_source_alloydb_supported_database_flags_test.go @@ -6,8 +6,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/alloydb/resource_alloydb_backup_test.go b/mmv1/third_party/terraform/services/alloydb/resource_alloydb_backup_test.go index aafa42a7eb83..f26a57f986b6 100644 --- a/mmv1/third_party/terraform/services/alloydb/resource_alloydb_backup_test.go +++ b/mmv1/third_party/terraform/services/alloydb/resource_alloydb_backup_test.go @@ -3,7 +3,7 @@ package alloydb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/alloydb/resource_alloydb_cluster_restore_test.go b/mmv1/third_party/terraform/services/alloydb/resource_alloydb_cluster_restore_test.go index 5288d8ea62f8..c59d8a8c1029 100644 --- a/mmv1/third_party/terraform/services/alloydb/resource_alloydb_cluster_restore_test.go +++ b/mmv1/third_party/terraform/services/alloydb/resource_alloydb_cluster_restore_test.go @@ -4,7 +4,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/alloydb/resource_alloydb_cluster_test.go b/mmv1/third_party/terraform/services/alloydb/resource_alloydb_cluster_test.go index 7950ec9885fe..f1ed5a5614e7 100644 --- a/mmv1/third_party/terraform/services/alloydb/resource_alloydb_cluster_test.go +++ b/mmv1/third_party/terraform/services/alloydb/resource_alloydb_cluster_test.go @@ -4,7 +4,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/alloydb/resource_alloydb_instance_test.go b/mmv1/third_party/terraform/services/alloydb/resource_alloydb_instance_test.go index 8924c4d234d9..37d9cd7309a5 100644 --- a/mmv1/third_party/terraform/services/alloydb/resource_alloydb_instance_test.go +++ b/mmv1/third_party/terraform/services/alloydb/resource_alloydb_instance_test.go @@ -3,7 +3,7 @@ package alloydb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/alloydb/resource_alloydb_secondary_cluster_test.go b/mmv1/third_party/terraform/services/alloydb/resource_alloydb_secondary_cluster_test.go index 43d5d6ae85cf..649014e4b7d5 100644 --- a/mmv1/third_party/terraform/services/alloydb/resource_alloydb_secondary_cluster_test.go +++ b/mmv1/third_party/terraform/services/alloydb/resource_alloydb_secondary_cluster_test.go @@ -4,7 +4,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/alloydb/resource_alloydb_secondary_instance_test.go b/mmv1/third_party/terraform/services/alloydb/resource_alloydb_secondary_instance_test.go index 6cb158429e11..a167c4a1d69c 100644 --- a/mmv1/third_party/terraform/services/alloydb/resource_alloydb_secondary_instance_test.go +++ b/mmv1/third_party/terraform/services/alloydb/resource_alloydb_secondary_instance_test.go @@ -3,7 +3,7 @@ package alloydb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/alloydb/resource_alloydb_user_test.go b/mmv1/third_party/terraform/services/alloydb/resource_alloydb_user_test.go index d13b3bd44b8c..73d18bb4fb7e 100644 --- a/mmv1/third_party/terraform/services/alloydb/resource_alloydb_user_test.go +++ b/mmv1/third_party/terraform/services/alloydb/resource_alloydb_user_test.go @@ -3,7 +3,7 @@ package alloydb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/apigateway/go/resource_api_gateway_api_config_test.go.tmpl b/mmv1/third_party/terraform/services/apigateway/go/resource_api_gateway_api_config_test.go.tmpl index 6a8d4d14f407..7ff6a0d99191 100644 --- a/mmv1/third_party/terraform/services/apigateway/go/resource_api_gateway_api_config_test.go.tmpl +++ b/mmv1/third_party/terraform/services/apigateway/go/resource_api_gateway_api_config_test.go.tmpl @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccApiGatewayApiConfig_apigatewayApiConfigBasicExampleUpdated(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/apigateway/go/resource_api_gateway_api_test.go.tmpl b/mmv1/third_party/terraform/services/apigateway/go/resource_api_gateway_api_test.go.tmpl index 3ceb89719d95..e74beb25820c 100644 --- a/mmv1/third_party/terraform/services/apigateway/go/resource_api_gateway_api_test.go.tmpl +++ b/mmv1/third_party/terraform/services/apigateway/go/resource_api_gateway_api_test.go.tmpl @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccApiGatewayApi_apigatewayApiBasicExampleUpdated(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/apigateway/go/resource_api_gateway_gateway_test.go.tmpl b/mmv1/third_party/terraform/services/apigateway/go/resource_api_gateway_gateway_test.go.tmpl index ea707d273b4e..f10a3d3c88fa 100644 --- a/mmv1/third_party/terraform/services/apigateway/go/resource_api_gateway_gateway_test.go.tmpl +++ b/mmv1/third_party/terraform/services/apigateway/go/resource_api_gateway_gateway_test.go.tmpl @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccApiGatewayGateway_apigatewayGatewayBasicExampleUpdated(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/apigateway/resource_api_gateway_api_config_test.go.erb b/mmv1/third_party/terraform/services/apigateway/resource_api_gateway_api_config_test.go.erb index 47aeddddab70..8c6e6ecae0d6 100644 --- a/mmv1/third_party/terraform/services/apigateway/resource_api_gateway_api_config_test.go.erb +++ b/mmv1/third_party/terraform/services/apigateway/resource_api_gateway_api_config_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccApiGatewayApiConfig_apigatewayApiConfigBasicExampleUpdated(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/apigateway/resource_api_gateway_api_test.go.erb b/mmv1/third_party/terraform/services/apigateway/resource_api_gateway_api_test.go.erb index c4e21c36fe61..059f0f25f179 100644 --- a/mmv1/third_party/terraform/services/apigateway/resource_api_gateway_api_test.go.erb +++ b/mmv1/third_party/terraform/services/apigateway/resource_api_gateway_api_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccApiGatewayApi_apigatewayApiBasicExampleUpdated(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/apigateway/resource_api_gateway_gateway_test.go.erb b/mmv1/third_party/terraform/services/apigateway/resource_api_gateway_gateway_test.go.erb index 3dac3449c3b5..b74a7e6b285e 100644 --- a/mmv1/third_party/terraform/services/apigateway/resource_api_gateway_gateway_test.go.erb +++ b/mmv1/third_party/terraform/services/apigateway/resource_api_gateway_gateway_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccApiGatewayGateway_apigatewayGatewayBasicExampleUpdated(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/apigee/go/resource_apigee_environment_type_test.go.tmpl b/mmv1/third_party/terraform/services/apigee/go/resource_apigee_environment_type_test.go.tmpl index b284e49aee61..3742eb83d05f 100644 --- a/mmv1/third_party/terraform/services/apigee/go/resource_apigee_environment_type_test.go.tmpl +++ b/mmv1/third_party/terraform/services/apigee/go/resource_apigee_environment_type_test.go.tmpl @@ -4,7 +4,7 @@ package apigee_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/apigee/resource_apigee_env_keystore_alias_pkcs12_test.go b/mmv1/third_party/terraform/services/apigee/resource_apigee_env_keystore_alias_pkcs12_test.go index 683fa0e29385..dc31cf1e22f9 100644 --- a/mmv1/third_party/terraform/services/apigee/resource_apigee_env_keystore_alias_pkcs12_test.go +++ b/mmv1/third_party/terraform/services/apigee/resource_apigee_env_keystore_alias_pkcs12_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/apigee/resource_apigee_environment_type_test.go.erb b/mmv1/third_party/terraform/services/apigee/resource_apigee_environment_type_test.go.erb index 103b51f86bfe..075ac5bd3911 100644 --- a/mmv1/third_party/terraform/services/apigee/resource_apigee_environment_type_test.go.erb +++ b/mmv1/third_party/terraform/services/apigee/resource_apigee_environment_type_test.go.erb @@ -5,7 +5,7 @@ package apigee_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/apigee/resource_apigee_flowhook_test.go b/mmv1/third_party/terraform/services/apigee/resource_apigee_flowhook_test.go index de941dc3062a..bef990185f2f 100644 --- a/mmv1/third_party/terraform/services/apigee/resource_apigee_flowhook_test.go +++ b/mmv1/third_party/terraform/services/apigee/resource_apigee_flowhook_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/apigee/resource_apigee_keystores_aliases_key_cert_file_test.go b/mmv1/third_party/terraform/services/apigee/resource_apigee_keystores_aliases_key_cert_file_test.go index 84628f5b5b70..e55b29ffeee0 100644 --- a/mmv1/third_party/terraform/services/apigee/resource_apigee_keystores_aliases_key_cert_file_test.go +++ b/mmv1/third_party/terraform/services/apigee/resource_apigee_keystores_aliases_key_cert_file_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/apigee/resource_apigee_sharedflow_deployment_test.go b/mmv1/third_party/terraform/services/apigee/resource_apigee_sharedflow_deployment_test.go index 0fee8deb19ef..036d39673ce2 100644 --- a/mmv1/third_party/terraform/services/apigee/resource_apigee_sharedflow_deployment_test.go +++ b/mmv1/third_party/terraform/services/apigee/resource_apigee_sharedflow_deployment_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccApigeeSharedflowDeployment_apigeeSharedflowDeploymentTestExample(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/apigee/resource_apigee_sharedflow_test.go b/mmv1/third_party/terraform/services/apigee/resource_apigee_sharedflow_test.go index 51fd28cb7473..d4ef8ef4289a 100644 --- a/mmv1/third_party/terraform/services/apigee/resource_apigee_sharedflow_test.go +++ b/mmv1/third_party/terraform/services/apigee/resource_apigee_sharedflow_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/apigee/resource_apigee_sync_authorization_test.go b/mmv1/third_party/terraform/services/apigee/resource_apigee_sync_authorization_test.go index 015329242913..97d0a8830f32 100644 --- a/mmv1/third_party/terraform/services/apigee/resource_apigee_sync_authorization_test.go +++ b/mmv1/third_party/terraform/services/apigee/resource_apigee_sync_authorization_test.go @@ -3,7 +3,7 @@ package apigee_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/apigee/resource_apigee_target_server_test.go b/mmv1/third_party/terraform/services/apigee/resource_apigee_target_server_test.go index adfe2cb56e1e..6387d6828a6b 100644 --- a/mmv1/third_party/terraform/services/apigee/resource_apigee_target_server_test.go +++ b/mmv1/third_party/terraform/services/apigee/resource_apigee_target_server_test.go @@ -3,7 +3,7 @@ package apigee_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/appengine/data_source_google_app_engine_default_service_account_test.go b/mmv1/third_party/terraform/services/appengine/data_source_google_app_engine_default_service_account_test.go index 54c83c38f577..3bb894a95151 100644 --- a/mmv1/third_party/terraform/services/appengine/data_source_google_app_engine_default_service_account_test.go +++ b/mmv1/third_party/terraform/services/appengine/data_source_google_app_engine_default_service_account_test.go @@ -3,7 +3,7 @@ package appengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/appengine/resource_app_engine_application_test.go b/mmv1/third_party/terraform/services/appengine/resource_app_engine_application_test.go index 3d90a21eaac8..bf13977689b8 100644 --- a/mmv1/third_party/terraform/services/appengine/resource_app_engine_application_test.go +++ b/mmv1/third_party/terraform/services/appengine/resource_app_engine_application_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/appengine/resource_app_engine_domain_mapping_test.go b/mmv1/third_party/terraform/services/appengine/resource_app_engine_domain_mapping_test.go index 952fc0e57d88..118c339ec465 100644 --- a/mmv1/third_party/terraform/services/appengine/resource_app_engine_domain_mapping_test.go +++ b/mmv1/third_party/terraform/services/appengine/resource_app_engine_domain_mapping_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/appengine/resource_app_engine_flexible_app_version_test.go b/mmv1/third_party/terraform/services/appengine/resource_app_engine_flexible_app_version_test.go index c851367ba49a..79e7f8fee378 100644 --- a/mmv1/third_party/terraform/services/appengine/resource_app_engine_flexible_app_version_test.go +++ b/mmv1/third_party/terraform/services/appengine/resource_app_engine_flexible_app_version_test.go @@ -3,7 +3,7 @@ package appengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/appengine/resource_app_engine_service_network_settings_test.go b/mmv1/third_party/terraform/services/appengine/resource_app_engine_service_network_settings_test.go index 35e35974c066..d70178f5a40b 100644 --- a/mmv1/third_party/terraform/services/appengine/resource_app_engine_service_network_settings_test.go +++ b/mmv1/third_party/terraform/services/appengine/resource_app_engine_service_network_settings_test.go @@ -3,7 +3,7 @@ package appengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/appengine/resource_app_engine_standard_app_version_test.go b/mmv1/third_party/terraform/services/appengine/resource_app_engine_standard_app_version_test.go index 024b3d6a5931..aa6619ab958e 100644 --- a/mmv1/third_party/terraform/services/appengine/resource_app_engine_standard_app_version_test.go +++ b/mmv1/third_party/terraform/services/appengine/resource_app_engine_standard_app_version_test.go @@ -3,7 +3,7 @@ package appengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/apphub/data_source_apphub_application_test.go b/mmv1/third_party/terraform/services/apphub/data_source_apphub_application_test.go index a8c41f868b96..cc5abd7d3ba4 100644 --- a/mmv1/third_party/terraform/services/apphub/data_source_apphub_application_test.go +++ b/mmv1/third_party/terraform/services/apphub/data_source_apphub_application_test.go @@ -3,7 +3,7 @@ package apphub_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/apphub/data_source_apphub_discovered_service_test.go b/mmv1/third_party/terraform/services/apphub/data_source_apphub_discovered_service_test.go index 6aaeabd5b908..be4d994d6ec0 100644 --- a/mmv1/third_party/terraform/services/apphub/data_source_apphub_discovered_service_test.go +++ b/mmv1/third_party/terraform/services/apphub/data_source_apphub_discovered_service_test.go @@ -3,7 +3,7 @@ package apphub_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/apphub/data_source_apphub_discovered_workload_test.go b/mmv1/third_party/terraform/services/apphub/data_source_apphub_discovered_workload_test.go index 58a56b1fb664..0a8ba2ec4253 100644 --- a/mmv1/third_party/terraform/services/apphub/data_source_apphub_discovered_workload_test.go +++ b/mmv1/third_party/terraform/services/apphub/data_source_apphub_discovered_workload_test.go @@ -3,7 +3,7 @@ package apphub_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/apphub/resource_apphub_application_test.go b/mmv1/third_party/terraform/services/apphub/resource_apphub_application_test.go index 3e68916cc73e..d2ab0bae46c2 100644 --- a/mmv1/third_party/terraform/services/apphub/resource_apphub_application_test.go +++ b/mmv1/third_party/terraform/services/apphub/resource_apphub_application_test.go @@ -3,7 +3,7 @@ package apphub_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/apphub/resource_apphub_service_test.go b/mmv1/third_party/terraform/services/apphub/resource_apphub_service_test.go index 0ea290f3992e..943f03bb5900 100644 --- a/mmv1/third_party/terraform/services/apphub/resource_apphub_service_test.go +++ b/mmv1/third_party/terraform/services/apphub/resource_apphub_service_test.go @@ -3,7 +3,7 @@ package apphub_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/apphub/resource_apphub_workload_test.go b/mmv1/third_party/terraform/services/apphub/resource_apphub_workload_test.go index e5be61d33afe..7f03b3d35ea7 100644 --- a/mmv1/third_party/terraform/services/apphub/resource_apphub_workload_test.go +++ b/mmv1/third_party/terraform/services/apphub/resource_apphub_workload_test.go @@ -3,7 +3,7 @@ package apphub_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/artifactregistry/data_source_artifact_registry_docker_image_test.go b/mmv1/third_party/terraform/services/artifactregistry/data_source_artifact_registry_docker_image_test.go index 30dd01e71ba3..b71e1c66428e 100644 --- a/mmv1/third_party/terraform/services/artifactregistry/data_source_artifact_registry_docker_image_test.go +++ b/mmv1/third_party/terraform/services/artifactregistry/data_source_artifact_registry_docker_image_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/artifactregistry/data_source_artifact_registry_repository_test.go b/mmv1/third_party/terraform/services/artifactregistry/data_source_artifact_registry_repository_test.go index 22c2f610e1e8..f42229cb0be2 100644 --- a/mmv1/third_party/terraform/services/artifactregistry/data_source_artifact_registry_repository_test.go +++ b/mmv1/third_party/terraform/services/artifactregistry/data_source_artifact_registry_repository_test.go @@ -3,7 +3,7 @@ package artifactregistry_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/artifactregistry/go/resource_artifact_registry_repository_test.go.tmpl b/mmv1/third_party/terraform/services/artifactregistry/go/resource_artifact_registry_repository_test.go.tmpl index 7219203924be..11dcb645a795 100644 --- a/mmv1/third_party/terraform/services/artifactregistry/go/resource_artifact_registry_repository_test.go.tmpl +++ b/mmv1/third_party/terraform/services/artifactregistry/go/resource_artifact_registry_repository_test.go.tmpl @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccArtifactRegistryRepository_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/artifactregistry/resource_artifact_registry_repository_test.go.erb b/mmv1/third_party/terraform/services/artifactregistry/resource_artifact_registry_repository_test.go.erb index 6f409d267936..5519d7574d1e 100644 --- a/mmv1/third_party/terraform/services/artifactregistry/resource_artifact_registry_repository_test.go.erb +++ b/mmv1/third_party/terraform/services/artifactregistry/resource_artifact_registry_repository_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccArtifactRegistryRepository_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/backupdr/data_source_backup_dr_management_server_test.go.erb b/mmv1/third_party/terraform/services/backupdr/data_source_backup_dr_management_server_test.go.erb index 27d30f5aa659..326883ee3bb8 100644 --- a/mmv1/third_party/terraform/services/backupdr/data_source_backup_dr_management_server_test.go.erb +++ b/mmv1/third_party/terraform/services/backupdr/data_source_backup_dr_management_server_test.go.erb @@ -6,11 +6,11 @@ import ( "testing" "fmt" "strings" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) diff --git a/mmv1/third_party/terraform/services/backupdr/go/data_source_backup_dr_management_server_test.go.tmpl b/mmv1/third_party/terraform/services/backupdr/go/data_source_backup_dr_management_server_test.go.tmpl index 722300dd9262..9b0f5b380d2f 100644 --- a/mmv1/third_party/terraform/services/backupdr/go/data_source_backup_dr_management_server_test.go.tmpl +++ b/mmv1/third_party/terraform/services/backupdr/go/data_source_backup_dr_management_server_test.go.tmpl @@ -5,11 +5,11 @@ import ( "testing" "fmt" "strings" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) diff --git a/mmv1/third_party/terraform/services/beyondcorp/data_source_google_beyondcorp_app_connection_test.go b/mmv1/third_party/terraform/services/beyondcorp/data_source_google_beyondcorp_app_connection_test.go index 44288c2a5eca..49c4057c5b3d 100644 --- a/mmv1/third_party/terraform/services/beyondcorp/data_source_google_beyondcorp_app_connection_test.go +++ b/mmv1/third_party/terraform/services/beyondcorp/data_source_google_beyondcorp_app_connection_test.go @@ -1,7 +1,7 @@ package beyondcorp_test import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "testing" diff --git a/mmv1/third_party/terraform/services/beyondcorp/data_source_google_beyondcorp_app_connector_test.go b/mmv1/third_party/terraform/services/beyondcorp/data_source_google_beyondcorp_app_connector_test.go index 4a8274f905bc..1b59f280ddad 100644 --- a/mmv1/third_party/terraform/services/beyondcorp/data_source_google_beyondcorp_app_connector_test.go +++ b/mmv1/third_party/terraform/services/beyondcorp/data_source_google_beyondcorp_app_connector_test.go @@ -3,7 +3,7 @@ package beyondcorp_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/beyondcorp/data_source_google_beyondcorp_app_gateway_test.go b/mmv1/third_party/terraform/services/beyondcorp/data_source_google_beyondcorp_app_gateway_test.go index ca345530c263..5aebf887c5f0 100644 --- a/mmv1/third_party/terraform/services/beyondcorp/data_source_google_beyondcorp_app_gateway_test.go +++ b/mmv1/third_party/terraform/services/beyondcorp/data_source_google_beyondcorp_app_gateway_test.go @@ -3,7 +3,7 @@ package beyondcorp_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/beyondcorp/resource_beyondcorp_app_connection_test.go b/mmv1/third_party/terraform/services/beyondcorp/resource_beyondcorp_app_connection_test.go index d21dfd5791c8..dc666edf0855 100644 --- a/mmv1/third_party/terraform/services/beyondcorp/resource_beyondcorp_app_connection_test.go +++ b/mmv1/third_party/terraform/services/beyondcorp/resource_beyondcorp_app_connection_test.go @@ -3,7 +3,7 @@ package beyondcorp_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/beyondcorp/resource_beyondcorp_app_connector_test.go b/mmv1/third_party/terraform/services/beyondcorp/resource_beyondcorp_app_connector_test.go index d3ef7960485e..bbdc44c38696 100644 --- a/mmv1/third_party/terraform/services/beyondcorp/resource_beyondcorp_app_connector_test.go +++ b/mmv1/third_party/terraform/services/beyondcorp/resource_beyondcorp_app_connector_test.go @@ -3,7 +3,7 @@ package beyondcorp_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/biglake/resource_biglake_database_test.go b/mmv1/third_party/terraform/services/biglake/resource_biglake_database_test.go index ed3dc19c9514..65db06c8d9e2 100644 --- a/mmv1/third_party/terraform/services/biglake/resource_biglake_database_test.go +++ b/mmv1/third_party/terraform/services/biglake/resource_biglake_database_test.go @@ -3,7 +3,7 @@ package biglake_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/biglake/resource_biglake_table_test.go b/mmv1/third_party/terraform/services/biglake/resource_biglake_table_test.go index a63eafb18097..9dfc7ae8e788 100644 --- a/mmv1/third_party/terraform/services/biglake/resource_biglake_table_test.go +++ b/mmv1/third_party/terraform/services/biglake/resource_biglake_table_test.go @@ -3,7 +3,7 @@ package biglake_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/bigquery/data_source_google_bigquery_dataset_test.go b/mmv1/third_party/terraform/services/bigquery/data_source_google_bigquery_dataset_test.go index a734217b9024..a0fce6be02ce 100644 --- a/mmv1/third_party/terraform/services/bigquery/data_source_google_bigquery_dataset_test.go +++ b/mmv1/third_party/terraform/services/bigquery/data_source_google_bigquery_dataset_test.go @@ -5,7 +5,7 @@ package bigquery_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/bigquery/data_source_google_bigquery_default_service_account_test.go b/mmv1/third_party/terraform/services/bigquery/data_source_google_bigquery_default_service_account_test.go index e95ef7e5b52f..daf8c2c3b1ff 100644 --- a/mmv1/third_party/terraform/services/bigquery/data_source_google_bigquery_default_service_account_test.go +++ b/mmv1/third_party/terraform/services/bigquery/data_source_google_bigquery_default_service_account_test.go @@ -3,7 +3,7 @@ package bigquery_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/bigquery/go/resource_bigquery_dataset_test.go.tmpl b/mmv1/third_party/terraform/services/bigquery/go/resource_bigquery_dataset_test.go.tmpl index e8471dd74584..880e625ff419 100644 --- a/mmv1/third_party/terraform/services/bigquery/go/resource_bigquery_dataset_test.go.tmpl +++ b/mmv1/third_party/terraform/services/bigquery/go/resource_bigquery_dataset_test.go.tmpl @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "google.golang.org/api/bigquery/v2" diff --git a/mmv1/third_party/terraform/services/bigquery/go/resource_bigquery_table_test.go.tmpl b/mmv1/third_party/terraform/services/bigquery/go/resource_bigquery_table_test.go.tmpl index 30b7e6c34804..20439416efb3 100644 --- a/mmv1/third_party/terraform/services/bigquery/go/resource_bigquery_table_test.go.tmpl +++ b/mmv1/third_party/terraform/services/bigquery/go/resource_bigquery_table_test.go.tmpl @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/bigquery/resource_bigquery_dataset_access_test.go b/mmv1/third_party/terraform/services/bigquery/resource_bigquery_dataset_access_test.go index 9d31032e783e..b59dc1f2dffb 100644 --- a/mmv1/third_party/terraform/services/bigquery/resource_bigquery_dataset_access_test.go +++ b/mmv1/third_party/terraform/services/bigquery/resource_bigquery_dataset_access_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/bigquery/resource_bigquery_dataset_iam_member_test.go b/mmv1/third_party/terraform/services/bigquery/resource_bigquery_dataset_iam_member_test.go index 0ab43e371d9d..583985fe1c4b 100644 --- a/mmv1/third_party/terraform/services/bigquery/resource_bigquery_dataset_iam_member_test.go +++ b/mmv1/third_party/terraform/services/bigquery/resource_bigquery_dataset_iam_member_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/bigquery/resource_bigquery_dataset_iam_test.go b/mmv1/third_party/terraform/services/bigquery/resource_bigquery_dataset_iam_test.go index 0b0cf42067a7..36c23fd4291a 100644 --- a/mmv1/third_party/terraform/services/bigquery/resource_bigquery_dataset_iam_test.go +++ b/mmv1/third_party/terraform/services/bigquery/resource_bigquery_dataset_iam_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/bigquery/resource_bigquery_dataset_test.go b/mmv1/third_party/terraform/services/bigquery/resource_bigquery_dataset_test.go index 1344d8df6395..52c52f5eab07 100644 --- a/mmv1/third_party/terraform/services/bigquery/resource_bigquery_dataset_test.go +++ b/mmv1/third_party/terraform/services/bigquery/resource_bigquery_dataset_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "google.golang.org/api/bigquery/v2" diff --git a/mmv1/third_party/terraform/services/bigquery/resource_bigquery_job_test.go b/mmv1/third_party/terraform/services/bigquery/resource_bigquery_job_test.go index 3e8b4b832e3f..678150dbdec5 100644 --- a/mmv1/third_party/terraform/services/bigquery/resource_bigquery_job_test.go +++ b/mmv1/third_party/terraform/services/bigquery/resource_bigquery_job_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/bigquery/resource_bigquery_routine_test.go b/mmv1/third_party/terraform/services/bigquery/resource_bigquery_routine_test.go index 00f5763b505b..a71019023bf2 100644 --- a/mmv1/third_party/terraform/services/bigquery/resource_bigquery_routine_test.go +++ b/mmv1/third_party/terraform/services/bigquery/resource_bigquery_routine_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/bigquery/resource_bigquery_table_test.go b/mmv1/third_party/terraform/services/bigquery/resource_bigquery_table_test.go index 2a58ef514cb5..4406dceaa061 100644 --- a/mmv1/third_party/terraform/services/bigquery/resource_bigquery_table_test.go +++ b/mmv1/third_party/terraform/services/bigquery/resource_bigquery_table_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_test.go b/mmv1/third_party/terraform/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_test.go index 5b9ff747af36..095bd50a0476 100644 --- a/mmv1/third_party/terraform/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_test.go +++ b/mmv1/third_party/terraform/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_test.go @@ -3,7 +3,7 @@ package bigqueryanalyticshub_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/bigqueryconnection/resource_bigquery_connection_test.go b/mmv1/third_party/terraform/services/bigqueryconnection/resource_bigquery_connection_test.go index 16080ebd7cd5..07d67bee341f 100644 --- a/mmv1/third_party/terraform/services/bigqueryconnection/resource_bigquery_connection_test.go +++ b/mmv1/third_party/terraform/services/bigqueryconnection/resource_bigquery_connection_test.go @@ -3,7 +3,7 @@ package bigqueryconnection_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy_test.go b/mmv1/third_party/terraform/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy_test.go index 7725a32b062b..97c085024780 100644 --- a/mmv1/third_party/terraform/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy_test.go +++ b/mmv1/third_party/terraform/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy_test.go @@ -3,7 +3,7 @@ package bigquerydatapolicy_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/bigquerydatatransfer/resource_bigquery_data_transfer_config_test.go b/mmv1/third_party/terraform/services/bigquerydatatransfer/resource_bigquery_data_transfer_config_test.go index 28c19084d473..df3894a8b6e6 100644 --- a/mmv1/third_party/terraform/services/bigquerydatatransfer/resource_bigquery_data_transfer_config_test.go +++ b/mmv1/third_party/terraform/services/bigquerydatatransfer/resource_bigquery_data_transfer_config_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/bigquerydatatransfer" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/bigqueryreservation/resource_bigquery_bi_reservation_test.go b/mmv1/third_party/terraform/services/bigqueryreservation/resource_bigquery_bi_reservation_test.go index 6ae11298ba37..9e40e56a3783 100644 --- a/mmv1/third_party/terraform/services/bigqueryreservation/resource_bigquery_bi_reservation_test.go +++ b/mmv1/third_party/terraform/services/bigqueryreservation/resource_bigquery_bi_reservation_test.go @@ -3,7 +3,7 @@ package bigqueryreservation_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/bigtable/resource_bigtable_app_profile_test.go b/mmv1/third_party/terraform/services/bigtable/resource_bigtable_app_profile_test.go index 295faf718263..29bc41ae3eb1 100644 --- a/mmv1/third_party/terraform/services/bigtable/resource_bigtable_app_profile_test.go +++ b/mmv1/third_party/terraform/services/bigtable/resource_bigtable_app_profile_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/bigtable/resource_bigtable_authorized_view_test.go b/mmv1/third_party/terraform/services/bigtable/resource_bigtable_authorized_view_test.go index 15e87531b051..6cf4c1d4f673 100644 --- a/mmv1/third_party/terraform/services/bigtable/resource_bigtable_authorized_view_test.go +++ b/mmv1/third_party/terraform/services/bigtable/resource_bigtable_authorized_view_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccBigtableAuthorizedView_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/bigtable/resource_bigtable_gc_policy_test.go b/mmv1/third_party/terraform/services/bigtable/resource_bigtable_gc_policy_test.go index 6176e4bbd64f..fbdf4dc0c9de 100644 --- a/mmv1/third_party/terraform/services/bigtable/resource_bigtable_gc_policy_test.go +++ b/mmv1/third_party/terraform/services/bigtable/resource_bigtable_gc_policy_test.go @@ -8,8 +8,8 @@ import ( "time" "cloud.google.com/go/bigtable" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" tpgbigtable "github.com/hashicorp/terraform-provider-google/google/services/bigtable" ) diff --git a/mmv1/third_party/terraform/services/bigtable/resource_bigtable_instance_iam_test.go b/mmv1/third_party/terraform/services/bigtable/resource_bigtable_instance_iam_test.go index bdd80fcc2fb0..8e2b4b331ca4 100644 --- a/mmv1/third_party/terraform/services/bigtable/resource_bigtable_instance_iam_test.go +++ b/mmv1/third_party/terraform/services/bigtable/resource_bigtable_instance_iam_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/bigtable/resource_bigtable_instance_test.go b/mmv1/third_party/terraform/services/bigtable/resource_bigtable_instance_test.go index 65ae6dc5b2bf..f4585a5923ca 100644 --- a/mmv1/third_party/terraform/services/bigtable/resource_bigtable_instance_test.go +++ b/mmv1/third_party/terraform/services/bigtable/resource_bigtable_instance_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccBigtableInstance_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/bigtable/resource_bigtable_table_iam_test.go b/mmv1/third_party/terraform/services/bigtable/resource_bigtable_table_iam_test.go index e63f82426a22..e729f0a49a81 100644 --- a/mmv1/third_party/terraform/services/bigtable/resource_bigtable_table_iam_test.go +++ b/mmv1/third_party/terraform/services/bigtable/resource_bigtable_table_iam_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/bigtable/resource_bigtable_table_test.go b/mmv1/third_party/terraform/services/bigtable/resource_bigtable_table_test.go index f42fc570c1d3..3fc2f5c3faf5 100644 --- a/mmv1/third_party/terraform/services/bigtable/resource_bigtable_table_test.go +++ b/mmv1/third_party/terraform/services/bigtable/resource_bigtable_table_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/bigtable" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccBigtableTable_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/billing/data_source_google_billing_account_test.go b/mmv1/third_party/terraform/services/billing/data_source_google_billing_account_test.go index 248d13ec6aee..dc355f9f7e3b 100644 --- a/mmv1/third_party/terraform/services/billing/data_source_google_billing_account_test.go +++ b/mmv1/third_party/terraform/services/billing/data_source_google_billing_account_test.go @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/billing/iam_billing_account_test.go b/mmv1/third_party/terraform/services/billing/iam_billing_account_test.go index c09e67852dcd..1989d7e5c33c 100644 --- a/mmv1/third_party/terraform/services/billing/iam_billing_account_test.go +++ b/mmv1/third_party/terraform/services/billing/iam_billing_account_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccBillingAccountIam(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/billing/resource_billing_budget_test.go b/mmv1/third_party/terraform/services/billing/resource_billing_budget_test.go index 642651d983d3..04d809e94ef9 100644 --- a/mmv1/third_party/terraform/services/billing/resource_billing_budget_test.go +++ b/mmv1/third_party/terraform/services/billing/resource_billing_budget_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/billing" diff --git a/mmv1/third_party/terraform/services/binaryauthorization/go/resource_binary_authorization_attestor_test.go.tmpl b/mmv1/third_party/terraform/services/binaryauthorization/go/resource_binary_authorization_attestor_test.go.tmpl index c0ed5642f486..5abd3db02ad2 100644 --- a/mmv1/third_party/terraform/services/binaryauthorization/go/resource_binary_authorization_attestor_test.go.tmpl +++ b/mmv1/third_party/terraform/services/binaryauthorization/go/resource_binary_authorization_attestor_test.go.tmpl @@ -2,10 +2,10 @@ package binaryauthorization_test import ( "fmt" - "testing" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/binaryauthorization" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "testing" ) func TestSignatureAlgorithmDiffSuppress(t *testing.T) { @@ -14,33 +14,33 @@ func TestSignatureAlgorithmDiffSuppress(t *testing.T) { ExpectDiffSuppress bool }{ "ECDSA_P256 equivalent": { - Old: "ECDSA_P256_SHA256", - New: "EC_SIGN_P256_SHA256", + Old: "ECDSA_P256_SHA256", + New: "EC_SIGN_P256_SHA256", ExpectDiffSuppress: true, }, "ECDSA_P384 equivalent": { - Old: "ECDSA_P384_SHA384", - New: "EC_SIGN_P384_SHA384", + Old: "ECDSA_P384_SHA384", + New: "EC_SIGN_P384_SHA384", ExpectDiffSuppress: true, }, "ECDSA_P521 equivalent": { - Old: "ECDSA_P521_SHA512", - New: "EC_SIGN_P521_SHA512", + Old: "ECDSA_P521_SHA512", + New: "EC_SIGN_P521_SHA512", ExpectDiffSuppress: true, }, "not equivalent 1": { - Old: "ECDSA_P256", - New: "EC_SIGN_P384_SHA384", + Old: "ECDSA_P256", + New: "EC_SIGN_P384_SHA384", ExpectDiffSuppress: false, }, "not equivalent 2": { - Old: "ECDSA_P384_SHA384", - New: "EC_SIGN_P521_SHA512", + Old: "ECDSA_P384_SHA384", + New: "EC_SIGN_P521_SHA512", ExpectDiffSuppress: false, }, "not equivalent 3": { - Old: "ECDSA_P521_SHA512", - New: "EC_SIGN_P256_SHA256", + Old: "ECDSA_P521_SHA512", + New: "EC_SIGN_P256_SHA256", ExpectDiffSuppress: false, }, } diff --git a/mmv1/third_party/terraform/services/binaryauthorization/go/resource_binary_authorization_policy_test.go b/mmv1/third_party/terraform/services/binaryauthorization/go/resource_binary_authorization_policy_test.go index e998b9ed09af..685b0bb58743 100644 --- a/mmv1/third_party/terraform/services/binaryauthorization/go/resource_binary_authorization_policy_test.go +++ b/mmv1/third_party/terraform/services/binaryauthorization/go/resource_binary_authorization_policy_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" @@ -21,7 +21,7 @@ func TestAccBinaryAuthorizationPolicy_basic(t *testing.T) { pid := "tf-test-" + acctest.RandString(t, 10) billingId := envvar.GetTestBillingAccountFromEnv(t) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { @@ -165,9 +165,9 @@ func testAccCheckBinaryAuthorizationPolicyDefault(t *testing.T, pid string) reso config := acctest.GoogleProviderConfig(t) url := fmt.Sprintf("https://binaryauthorization.googleapis.com/v1/projects/%s/policy", pid) pol, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ - Config: config, - Method: "GET", - RawURL: url, + Config: config, + Method: "GET", + RawURL: url, UserAgent: config.UserAgent, }) if err != nil { diff --git a/mmv1/third_party/terraform/services/binaryauthorization/resource_binary_authorization_attestor_test.go.erb b/mmv1/third_party/terraform/services/binaryauthorization/resource_binary_authorization_attestor_test.go.erb index e9a9f99643bf..060411a92d86 100644 --- a/mmv1/third_party/terraform/services/binaryauthorization/resource_binary_authorization_attestor_test.go.erb +++ b/mmv1/third_party/terraform/services/binaryauthorization/resource_binary_authorization_attestor_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/binaryauthorization" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestSignatureAlgorithmDiffSuppress(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/binaryauthorization/resource_binary_authorization_policy_test.go.erb b/mmv1/third_party/terraform/services/binaryauthorization/resource_binary_authorization_policy_test.go.erb index de83906bf246..05f407a52f10 100644 --- a/mmv1/third_party/terraform/services/binaryauthorization/resource_binary_authorization_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/binaryauthorization/resource_binary_authorization_policy_test.go.erb @@ -6,8 +6,8 @@ import ( "reflect" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/certificatemanager/data_source_google_certificate_manager_certificate_map_test.go b/mmv1/third_party/terraform/services/certificatemanager/data_source_google_certificate_manager_certificate_map_test.go index 7ca8c9c1f20d..a40e7b577139 100644 --- a/mmv1/third_party/terraform/services/certificatemanager/data_source_google_certificate_manager_certificate_map_test.go +++ b/mmv1/third_party/terraform/services/certificatemanager/data_source_google_certificate_manager_certificate_map_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/certificatemanager/resource_certificate_manager_certificate_upgrade_test.go b/mmv1/third_party/terraform/services/certificatemanager/resource_certificate_manager_certificate_upgrade_test.go index 7e08d0d29817..5fb626aa3123 100644 --- a/mmv1/third_party/terraform/services/certificatemanager/resource_certificate_manager_certificate_upgrade_test.go +++ b/mmv1/third_party/terraform/services/certificatemanager/resource_certificate_manager_certificate_upgrade_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/certificatemanager/resource_certificate_manager_dns_authorization_test.go b/mmv1/third_party/terraform/services/certificatemanager/resource_certificate_manager_dns_authorization_test.go index c25f72515e87..a50e4e6d66a7 100644 --- a/mmv1/third_party/terraform/services/certificatemanager/resource_certificate_manager_dns_authorization_test.go +++ b/mmv1/third_party/terraform/services/certificatemanager/resource_certificate_manager_dns_authorization_test.go @@ -3,7 +3,7 @@ package certificatemanager_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/certificatemanager/resource_certificate_manager_dns_authorization_upgrade_test.go b/mmv1/third_party/terraform/services/certificatemanager/resource_certificate_manager_dns_authorization_upgrade_test.go index 293628ee322b..90f48d4c04d8 100644 --- a/mmv1/third_party/terraform/services/certificatemanager/resource_certificate_manager_dns_authorization_upgrade_test.go +++ b/mmv1/third_party/terraform/services/certificatemanager/resource_certificate_manager_dns_authorization_upgrade_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/certificatemanager/resource_certificate_manager_trust_config_test.go b/mmv1/third_party/terraform/services/certificatemanager/resource_certificate_manager_trust_config_test.go index d976cb10fa39..70a64eb55b9c 100644 --- a/mmv1/third_party/terraform/services/certificatemanager/resource_certificate_manager_trust_config_test.go +++ b/mmv1/third_party/terraform/services/certificatemanager/resource_certificate_manager_trust_config_test.go @@ -3,7 +3,7 @@ package certificatemanager_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_resources_search_all_test.go.erb b/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_resources_search_all_test.go.erb index 1a009219876b..a7a97299bade 100644 --- a/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_resources_search_all_test.go.erb +++ b/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_resources_search_all_test.go.erb @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceGoogleCloudAssetResourcesSearchAll_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources_test.go.erb b/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources_test.go.erb index 111e49a4d5c4..2c5d6483fa38 100644 --- a/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources_test.go.erb +++ b/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources_test.go.erb @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceGoogleCloudAssetSearchAllResources_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/cloudasset/go/data_source_google_cloud_asset_resources_search_all_test.go.tmpl b/mmv1/third_party/terraform/services/cloudasset/go/data_source_google_cloud_asset_resources_search_all_test.go.tmpl index a5a66df751c8..acba9ec6b5fc 100644 --- a/mmv1/third_party/terraform/services/cloudasset/go/data_source_google_cloud_asset_resources_search_all_test.go.tmpl +++ b/mmv1/third_party/terraform/services/cloudasset/go/data_source_google_cloud_asset_resources_search_all_test.go.tmpl @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceGoogleCloudAssetResourcesSearchAll_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/cloudasset/go/data_source_google_cloud_asset_search_all_resources_test.go b/mmv1/third_party/terraform/services/cloudasset/go/data_source_google_cloud_asset_search_all_resources_test.go index fe5fe3e53e45..9b30ddb5b382 100644 --- a/mmv1/third_party/terraform/services/cloudasset/go/data_source_google_cloud_asset_search_all_resources_test.go +++ b/mmv1/third_party/terraform/services/cloudasset/go/data_source_google_cloud_asset_search_all_resources_test.go @@ -5,9 +5,9 @@ import ( "regexp" "testing" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) func TestAccDataSourceGoogleCloudAssetSearchAllResources_basic(t *testing.T) { @@ -46,4 +46,3 @@ data google_cloud_asset_search_all_resources resources { } `, project) } - diff --git a/mmv1/third_party/terraform/services/cloudbuild/data_source_google_cloudbuild_trigger_test.go b/mmv1/third_party/terraform/services/cloudbuild/data_source_google_cloudbuild_trigger_test.go index 72a60a97e81b..fd4bac3ed768 100644 --- a/mmv1/third_party/terraform/services/cloudbuild/data_source_google_cloudbuild_trigger_test.go +++ b/mmv1/third_party/terraform/services/cloudbuild/data_source_google_cloudbuild_trigger_test.go @@ -3,7 +3,7 @@ package cloudbuild_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/cloudbuild/go/resource_cloudbuild_worker_pool_test.go.tmpl b/mmv1/third_party/terraform/services/cloudbuild/go/resource_cloudbuild_worker_pool_test.go.tmpl index 91678db8c888..3497bf908742 100644 --- a/mmv1/third_party/terraform/services/cloudbuild/go/resource_cloudbuild_worker_pool_test.go.tmpl +++ b/mmv1/third_party/terraform/services/cloudbuild/go/resource_cloudbuild_worker_pool_test.go.tmpl @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/cloudbuild/resource_cloudbuild_trigger_test.go b/mmv1/third_party/terraform/services/cloudbuild/resource_cloudbuild_trigger_test.go index b95e5c518351..2e90d9a0fd0e 100644 --- a/mmv1/third_party/terraform/services/cloudbuild/resource_cloudbuild_trigger_test.go +++ b/mmv1/third_party/terraform/services/cloudbuild/resource_cloudbuild_trigger_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccCloudBuildTrigger_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/cloudbuild/resource_cloudbuild_trigger_upgrade_test.go b/mmv1/third_party/terraform/services/cloudbuild/resource_cloudbuild_trigger_upgrade_test.go index b0c442cbab59..e0614a4af60e 100644 --- a/mmv1/third_party/terraform/services/cloudbuild/resource_cloudbuild_trigger_upgrade_test.go +++ b/mmv1/third_party/terraform/services/cloudbuild/resource_cloudbuild_trigger_upgrade_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/cloudbuild/resource_cloudbuild_worker_pool_test.go.erb b/mmv1/third_party/terraform/services/cloudbuild/resource_cloudbuild_worker_pool_test.go.erb index 73d952177b0b..1faf954f6048 100644 --- a/mmv1/third_party/terraform/services/cloudbuild/resource_cloudbuild_worker_pool_test.go.erb +++ b/mmv1/third_party/terraform/services/cloudbuild/resource_cloudbuild_worker_pool_test.go.erb @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/cloudbuildv2/resource_cloudbuildv2_connection_test.go b/mmv1/third_party/terraform/services/cloudbuildv2/resource_cloudbuildv2_connection_test.go index b99f00836e9d..b68965626248 100644 --- a/mmv1/third_party/terraform/services/cloudbuildv2/resource_cloudbuildv2_connection_test.go +++ b/mmv1/third_party/terraform/services/cloudbuildv2/resource_cloudbuildv2_connection_test.go @@ -3,7 +3,7 @@ package cloudbuildv2_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/clouddeploy/resource_clouddeploy_automation_test.go b/mmv1/third_party/terraform/services/clouddeploy/resource_clouddeploy_automation_test.go index 82f1fe3a0e5c..f6dc66c1fe38 100644 --- a/mmv1/third_party/terraform/services/clouddeploy/resource_clouddeploy_automation_test.go +++ b/mmv1/third_party/terraform/services/clouddeploy/resource_clouddeploy_automation_test.go @@ -3,7 +3,7 @@ package clouddeploy_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/clouddeploy/resource_clouddeploy_custom_target_type_test.go b/mmv1/third_party/terraform/services/clouddeploy/resource_clouddeploy_custom_target_type_test.go index 5408a9db8834..e2c062d39363 100644 --- a/mmv1/third_party/terraform/services/clouddeploy/resource_clouddeploy_custom_target_type_test.go +++ b/mmv1/third_party/terraform/services/clouddeploy/resource_clouddeploy_custom_target_type_test.go @@ -3,7 +3,7 @@ package clouddeploy_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/clouddeploy/resource_clouddeploy_target_test.go b/mmv1/third_party/terraform/services/clouddeploy/resource_clouddeploy_target_test.go index 67a8aab5013b..a5f87a96bace 100644 --- a/mmv1/third_party/terraform/services/clouddeploy/resource_clouddeploy_target_test.go +++ b/mmv1/third_party/terraform/services/clouddeploy/resource_clouddeploy_target_test.go @@ -3,7 +3,7 @@ package clouddeploy_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/cloudfunctions/data_source_google_cloudfunctions_function_test.go b/mmv1/third_party/terraform/services/cloudfunctions/data_source_google_cloudfunctions_function_test.go index ee1d0bd66f10..e550080ec75b 100644 --- a/mmv1/third_party/terraform/services/cloudfunctions/data_source_google_cloudfunctions_function_test.go +++ b/mmv1/third_party/terraform/services/cloudfunctions/data_source_google_cloudfunctions_function_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceGoogleCloudFunctionsFunction_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/cloudfunctions/go/resource_cloudfunctions_function_test.go.tmpl b/mmv1/third_party/terraform/services/cloudfunctions/go/resource_cloudfunctions_function_test.go.tmpl index 0e65333fb3c9..244301841877 100644 --- a/mmv1/third_party/terraform/services/cloudfunctions/go/resource_cloudfunctions_function_test.go.tmpl +++ b/mmv1/third_party/terraform/services/cloudfunctions/go/resource_cloudfunctions_function_test.go.tmpl @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" tpgcloudfunctions "github.com/hashicorp/terraform-provider-google/google/services/cloudfunctions" diff --git a/mmv1/third_party/terraform/services/cloudfunctions/resource_cloudfunctions_function_test.go.erb b/mmv1/third_party/terraform/services/cloudfunctions/resource_cloudfunctions_function_test.go.erb index ec2f194d7184..0c752f132f0c 100644 --- a/mmv1/third_party/terraform/services/cloudfunctions/resource_cloudfunctions_function_test.go.erb +++ b/mmv1/third_party/terraform/services/cloudfunctions/resource_cloudfunctions_function_test.go.erb @@ -6,8 +6,8 @@ import ( "os" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" tpgcloudfunctions "github.com/hashicorp/terraform-provider-google/google/services/cloudfunctions" diff --git a/mmv1/third_party/terraform/services/cloudfunctions2/data_source_google_cloudfunctions2_function_test.go b/mmv1/third_party/terraform/services/cloudfunctions2/data_source_google_cloudfunctions2_function_test.go index a1f842ea9fc3..01222feeb71d 100644 --- a/mmv1/third_party/terraform/services/cloudfunctions2/data_source_google_cloudfunctions2_function_test.go +++ b/mmv1/third_party/terraform/services/cloudfunctions2/data_source_google_cloudfunctions2_function_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/cloudfunctions2/resource_cloudfunctions2_function_test.go b/mmv1/third_party/terraform/services/cloudfunctions2/resource_cloudfunctions2_function_test.go index 65e41ed25ee7..e552e9521c08 100644 --- a/mmv1/third_party/terraform/services/cloudfunctions2/resource_cloudfunctions2_function_test.go +++ b/mmv1/third_party/terraform/services/cloudfunctions2/resource_cloudfunctions2_function_test.go @@ -3,7 +3,7 @@ package cloudfunctions2_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/cloudidentity/data_source_cloud_identity_group_lookup_test.go b/mmv1/third_party/terraform/services/cloudidentity/data_source_cloud_identity_group_lookup_test.go index fd1ca06500c3..0409c182ec67 100644 --- a/mmv1/third_party/terraform/services/cloudidentity/data_source_cloud_identity_group_lookup_test.go +++ b/mmv1/third_party/terraform/services/cloudidentity/data_source_cloud_identity_group_lookup_test.go @@ -4,7 +4,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/cloudidentity/data_source_cloud_identity_group_memberships_test.go b/mmv1/third_party/terraform/services/cloudidentity/data_source_cloud_identity_group_memberships_test.go index 2dbf02a3796b..d1ec36bf0f44 100644 --- a/mmv1/third_party/terraform/services/cloudidentity/data_source_cloud_identity_group_memberships_test.go +++ b/mmv1/third_party/terraform/services/cloudidentity/data_source_cloud_identity_group_memberships_test.go @@ -3,7 +3,7 @@ package cloudidentity_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/cloudidentity/data_source_cloud_identity_groups_test.go b/mmv1/third_party/terraform/services/cloudidentity/data_source_cloud_identity_groups_test.go index 644f56f6a31e..edff6b910d86 100644 --- a/mmv1/third_party/terraform/services/cloudidentity/data_source_cloud_identity_groups_test.go +++ b/mmv1/third_party/terraform/services/cloudidentity/data_source_cloud_identity_groups_test.go @@ -4,7 +4,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/cloudidentity/go/resource_cloud_identity_group_membership_test.go.tmpl b/mmv1/third_party/terraform/services/cloudidentity/go/resource_cloud_identity_group_membership_test.go.tmpl index 5e999415ed14..6d03d0d1c2cc 100644 --- a/mmv1/third_party/terraform/services/cloudidentity/go/resource_cloud_identity_group_membership_test.go.tmpl +++ b/mmv1/third_party/terraform/services/cloudidentity/go/resource_cloud_identity_group_membership_test.go.tmpl @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/cloudidentity/go/resource_cloud_identity_group_test.go.tmpl b/mmv1/third_party/terraform/services/cloudidentity/go/resource_cloud_identity_group_test.go.tmpl index 8c0d001b0727..a5fa273186a1 100644 --- a/mmv1/third_party/terraform/services/cloudidentity/go/resource_cloud_identity_group_test.go.tmpl +++ b/mmv1/third_party/terraform/services/cloudidentity/go/resource_cloud_identity_group_test.go.tmpl @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/cloudidentity/resource_cloud_identity_group_membership_test.go.erb b/mmv1/third_party/terraform/services/cloudidentity/resource_cloud_identity_group_membership_test.go.erb index 08cb7d45b924..41c610ba4a59 100644 --- a/mmv1/third_party/terraform/services/cloudidentity/resource_cloud_identity_group_membership_test.go.erb +++ b/mmv1/third_party/terraform/services/cloudidentity/resource_cloud_identity_group_membership_test.go.erb @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/cloudidentity/resource_cloud_identity_group_test.go.erb b/mmv1/third_party/terraform/services/cloudidentity/resource_cloud_identity_group_test.go.erb index 43ea19716b0f..a4ab8746b348 100644 --- a/mmv1/third_party/terraform/services/cloudidentity/resource_cloud_identity_group_test.go.erb +++ b/mmv1/third_party/terraform/services/cloudidentity/resource_cloud_identity_group_test.go.erb @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/cloudids/resource_cloudids_endpoint_test.go b/mmv1/third_party/terraform/services/cloudids/resource_cloudids_endpoint_test.go index 9983e66e0feb..6d0d2df72704 100644 --- a/mmv1/third_party/terraform/services/cloudids/resource_cloudids_endpoint_test.go +++ b/mmv1/third_party/terraform/services/cloudids/resource_cloudids_endpoint_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/cloudquotas/data_source_google_cloud_quotas_quota_info_test.go b/mmv1/third_party/terraform/services/cloudquotas/data_source_google_cloud_quotas_quota_info_test.go index 9a4ff979b47d..eaf8b1c84a57 100644 --- a/mmv1/third_party/terraform/services/cloudquotas/data_source_google_cloud_quotas_quota_info_test.go +++ b/mmv1/third_party/terraform/services/cloudquotas/data_source_google_cloud_quotas_quota_info_test.go @@ -5,7 +5,7 @@ package cloudquotas_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/cloudquotas/data_source_google_cloud_quotas_quota_infos_test.go b/mmv1/third_party/terraform/services/cloudquotas/data_source_google_cloud_quotas_quota_infos_test.go index 99db75f58074..837a184d6e5a 100644 --- a/mmv1/third_party/terraform/services/cloudquotas/data_source_google_cloud_quotas_quota_infos_test.go +++ b/mmv1/third_party/terraform/services/cloudquotas/data_source_google_cloud_quotas_quota_infos_test.go @@ -3,7 +3,7 @@ package cloudquotas_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/cloudquotas/resource_cloud_quotas_quota_preference_test.go b/mmv1/third_party/terraform/services/cloudquotas/resource_cloud_quotas_quota_preference_test.go index 35ea4107eae9..b0c044aded08 100644 --- a/mmv1/third_party/terraform/services/cloudquotas/resource_cloud_quotas_quota_preference_test.go +++ b/mmv1/third_party/terraform/services/cloudquotas/resource_cloud_quotas_quota_preference_test.go @@ -3,7 +3,7 @@ package cloudquotas_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/cloudrun/data_source_cloud_run_locations_test.go b/mmv1/third_party/terraform/services/cloudrun/data_source_cloud_run_locations_test.go index de8207776687..550684d7c781 100644 --- a/mmv1/third_party/terraform/services/cloudrun/data_source_cloud_run_locations_test.go +++ b/mmv1/third_party/terraform/services/cloudrun/data_source_cloud_run_locations_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDataSourceGoogleCloudRunLocations_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/cloudrun/data_source_cloud_run_service_test.go b/mmv1/third_party/terraform/services/cloudrun/data_source_cloud_run_service_test.go index 258d2b3cdb65..12c2876b7261 100644 --- a/mmv1/third_party/terraform/services/cloudrun/data_source_cloud_run_service_test.go +++ b/mmv1/third_party/terraform/services/cloudrun/data_source_cloud_run_service_test.go @@ -3,7 +3,7 @@ package cloudrun_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/cloudrun/go/resource_cloud_run_service_test.go.tmpl b/mmv1/third_party/terraform/services/cloudrun/go/resource_cloud_run_service_test.go.tmpl index 031cf395a22f..327c668975fd 100644 --- a/mmv1/third_party/terraform/services/cloudrun/go/resource_cloud_run_service_test.go.tmpl +++ b/mmv1/third_party/terraform/services/cloudrun/go/resource_cloud_run_service_test.go.tmpl @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccCloudRunService_cloudRunServiceUpdate(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/cloudrun/resource_cloud_run_domain_mapping_test.go b/mmv1/third_party/terraform/services/cloudrun/resource_cloud_run_domain_mapping_test.go index 2fe19c6b500b..e0147440263a 100644 --- a/mmv1/third_party/terraform/services/cloudrun/resource_cloud_run_domain_mapping_test.go +++ b/mmv1/third_party/terraform/services/cloudrun/resource_cloud_run_domain_mapping_test.go @@ -3,7 +3,7 @@ package cloudrun_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/cloudrun/resource_cloud_run_service_test.go.erb b/mmv1/third_party/terraform/services/cloudrun/resource_cloud_run_service_test.go.erb index 0ffb06087aeb..3a15024c8ff7 100644 --- a/mmv1/third_party/terraform/services/cloudrun/resource_cloud_run_service_test.go.erb +++ b/mmv1/third_party/terraform/services/cloudrun/resource_cloud_run_service_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccCloudRunService_cloudRunServiceUpdate(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/cloudrunv2/data_source_google_cloud_run_v2_job_test.go b/mmv1/third_party/terraform/services/cloudrunv2/data_source_google_cloud_run_v2_job_test.go index 482e4a196d18..a3afa67f6769 100644 --- a/mmv1/third_party/terraform/services/cloudrunv2/data_source_google_cloud_run_v2_job_test.go +++ b/mmv1/third_party/terraform/services/cloudrunv2/data_source_google_cloud_run_v2_job_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/cloudrunv2/data_source_google_cloud_run_v2_service_test.go b/mmv1/third_party/terraform/services/cloudrunv2/data_source_google_cloud_run_v2_service_test.go index 64de401e1e0e..4c9cedb3c7e7 100644 --- a/mmv1/third_party/terraform/services/cloudrunv2/data_source_google_cloud_run_v2_service_test.go +++ b/mmv1/third_party/terraform/services/cloudrunv2/data_source_google_cloud_run_v2_service_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/cloudrunv2/go/resource_cloud_run_v2_job_test.go.tmpl b/mmv1/third_party/terraform/services/cloudrunv2/go/resource_cloud_run_v2_job_test.go.tmpl index 44b1e1ab979a..291fc3bd0eec 100644 --- a/mmv1/third_party/terraform/services/cloudrunv2/go/resource_cloud_run_v2_job_test.go.tmpl +++ b/mmv1/third_party/terraform/services/cloudrunv2/go/resource_cloud_run_v2_job_test.go.tmpl @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/cloudrunv2/go/resource_cloud_run_v2_service_test.go.tmpl b/mmv1/third_party/terraform/services/cloudrunv2/go/resource_cloud_run_v2_service_test.go.tmpl index 987729a706f9..27d5611092de 100644 --- a/mmv1/third_party/terraform/services/cloudrunv2/go/resource_cloud_run_v2_service_test.go.tmpl +++ b/mmv1/third_party/terraform/services/cloudrunv2/go/resource_cloud_run_v2_service_test.go.tmpl @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/cloudrunv2" ) diff --git a/mmv1/third_party/terraform/services/cloudrunv2/resource_cloud_run_v2_job_test.go.erb b/mmv1/third_party/terraform/services/cloudrunv2/resource_cloud_run_v2_job_test.go.erb index b272ca36f435..828bef2161d8 100644 --- a/mmv1/third_party/terraform/services/cloudrunv2/resource_cloud_run_v2_job_test.go.erb +++ b/mmv1/third_party/terraform/services/cloudrunv2/resource_cloud_run_v2_job_test.go.erb @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/cloudrunv2/resource_cloud_run_v2_service_test.go.erb b/mmv1/third_party/terraform/services/cloudrunv2/resource_cloud_run_v2_service_test.go.erb index e8e95eeab0e4..f8d1109abe59 100644 --- a/mmv1/third_party/terraform/services/cloudrunv2/resource_cloud_run_v2_service_test.go.erb +++ b/mmv1/third_party/terraform/services/cloudrunv2/resource_cloud_run_v2_service_test.go.erb @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/cloudrunv2" ) diff --git a/mmv1/third_party/terraform/services/cloudscheduler/resource_cloud_scheduler_job_test.go b/mmv1/third_party/terraform/services/cloudscheduler/resource_cloud_scheduler_job_test.go index 26711bb51297..72d52f264057 100644 --- a/mmv1/third_party/terraform/services/cloudscheduler/resource_cloud_scheduler_job_test.go +++ b/mmv1/third_party/terraform/services/cloudscheduler/resource_cloud_scheduler_job_test.go @@ -3,7 +3,7 @@ package cloudscheduler_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/cloudscheduler" ) diff --git a/mmv1/third_party/terraform/services/cloudtasks/go/resource_cloud_tasks_queue_test.go b/mmv1/third_party/terraform/services/cloudtasks/go/resource_cloud_tasks_queue_test.go index e7cda3d2045a..22214bfc6ff6 100644 --- a/mmv1/third_party/terraform/services/cloudtasks/go/resource_cloud_tasks_queue_test.go +++ b/mmv1/third_party/terraform/services/cloudtasks/go/resource_cloud_tasks_queue_test.go @@ -2,10 +2,10 @@ package cloudtasks_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccCloudTasksQueue_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/cloudtasks/resource_cloud_tasks_queue_test.go.erb b/mmv1/third_party/terraform/services/cloudtasks/resource_cloud_tasks_queue_test.go.erb index c6a325dec6b1..cad290d43d27 100644 --- a/mmv1/third_party/terraform/services/cloudtasks/resource_cloud_tasks_queue_test.go.erb +++ b/mmv1/third_party/terraform/services/cloudtasks/resource_cloud_tasks_queue_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccCloudTasksQueue_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/composer/data_source_google_composer_environment_test.go b/mmv1/third_party/terraform/services/composer/data_source_google_composer_environment_test.go index a81eff7b2284..c73feb1b1e63 100644 --- a/mmv1/third_party/terraform/services/composer/data_source_google_composer_environment_test.go +++ b/mmv1/third_party/terraform/services/composer/data_source_google_composer_environment_test.go @@ -6,8 +6,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/composer/data_source_google_composer_image_versions_test.go b/mmv1/third_party/terraform/services/composer/data_source_google_composer_image_versions_test.go index 7d7f32e93829..7531f511b8ed 100644 --- a/mmv1/third_party/terraform/services/composer/data_source_google_composer_image_versions_test.go +++ b/mmv1/third_party/terraform/services/composer/data_source_google_composer_image_versions_test.go @@ -6,8 +6,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/composer/data_source_google_composer_user_workloads_config_map_test.go.erb b/mmv1/third_party/terraform/services/composer/data_source_google_composer_user_workloads_config_map_test.go.erb index 7609bb3b9c76..50be3b24ad68 100644 --- a/mmv1/third_party/terraform/services/composer/data_source_google_composer_user_workloads_config_map_test.go.erb +++ b/mmv1/third_party/terraform/services/composer/data_source_google_composer_user_workloads_config_map_test.go.erb @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/composer/data_source_google_composer_user_workloads_secret_test.go.erb b/mmv1/third_party/terraform/services/composer/data_source_google_composer_user_workloads_secret_test.go.erb index 22535b32eb17..8d9c8ecbaf80 100644 --- a/mmv1/third_party/terraform/services/composer/data_source_google_composer_user_workloads_secret_test.go.erb +++ b/mmv1/third_party/terraform/services/composer/data_source_google_composer_user_workloads_secret_test.go.erb @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/composer/go/data_source_google_composer_user_workloads_config_map_test.go.tmpl b/mmv1/third_party/terraform/services/composer/go/data_source_google_composer_user_workloads_config_map_test.go.tmpl index ee92a7e5501f..eac26bfd11cb 100644 --- a/mmv1/third_party/terraform/services/composer/go/data_source_google_composer_user_workloads_config_map_test.go.tmpl +++ b/mmv1/third_party/terraform/services/composer/go/data_source_google_composer_user_workloads_config_map_test.go.tmpl @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/composer/go/data_source_google_composer_user_workloads_secret_test.go.tmpl b/mmv1/third_party/terraform/services/composer/go/data_source_google_composer_user_workloads_secret_test.go.tmpl index 91bbb1141d5f..3860a8e8c40f 100644 --- a/mmv1/third_party/terraform/services/composer/go/data_source_google_composer_user_workloads_secret_test.go.tmpl +++ b/mmv1/third_party/terraform/services/composer/go/data_source_google_composer_user_workloads_secret_test.go.tmpl @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/composer/go/resource_composer_environment_test.go.tmpl b/mmv1/third_party/terraform/services/composer/go/resource_composer_environment_test.go.tmpl index 8bb76ae8a560..493c49564e0b 100644 --- a/mmv1/third_party/terraform/services/composer/go/resource_composer_environment_test.go.tmpl +++ b/mmv1/third_party/terraform/services/composer/go/resource_composer_environment_test.go.tmpl @@ -13,8 +13,8 @@ import ( "strings" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) const testComposerEnvironmentPrefix = "tf-test-composer-env" diff --git a/mmv1/third_party/terraform/services/composer/go/resource_composer_user_workloads_config_map_test.go.tmpl b/mmv1/third_party/terraform/services/composer/go/resource_composer_user_workloads_config_map_test.go.tmpl index 15261c54b26b..312d8331f75b 100644 --- a/mmv1/third_party/terraform/services/composer/go/resource_composer_user_workloads_config_map_test.go.tmpl +++ b/mmv1/third_party/terraform/services/composer/go/resource_composer_user_workloads_config_map_test.go.tmpl @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/composer/go/resource_composer_user_workloads_secret_test.go.tmpl b/mmv1/third_party/terraform/services/composer/go/resource_composer_user_workloads_secret_test.go.tmpl index d148981f8462..9008bfdc65df 100644 --- a/mmv1/third_party/terraform/services/composer/go/resource_composer_user_workloads_secret_test.go.tmpl +++ b/mmv1/third_party/terraform/services/composer/go/resource_composer_user_workloads_secret_test.go.tmpl @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/composer" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) const testComposerUserWorkloadsSecretPrefix = "tf-test-composer-secret" diff --git a/mmv1/third_party/terraform/services/composer/resource_composer_environment_test.go.erb b/mmv1/third_party/terraform/services/composer/resource_composer_environment_test.go.erb index 1f351dd85350..576cded24877 100644 --- a/mmv1/third_party/terraform/services/composer/resource_composer_environment_test.go.erb +++ b/mmv1/third_party/terraform/services/composer/resource_composer_environment_test.go.erb @@ -14,8 +14,8 @@ import ( "strings" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) const testComposerEnvironmentPrefix = "tf-test-composer-env" diff --git a/mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_config_map_test.go.erb b/mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_config_map_test.go.erb index f5a2c3aaec00..554c51cb5f5e 100644 --- a/mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_config_map_test.go.erb +++ b/mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_config_map_test.go.erb @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_secret_test.go.erb b/mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_secret_test.go.erb index 61d851512140..e71601b047d7 100644 --- a/mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_secret_test.go.erb +++ b/mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_secret_test.go.erb @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/composer" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) const testComposerUserWorkloadsSecretPrefix = "tf-test-composer-secret" diff --git a/mmv1/third_party/terraform/services/compute/data_source_compute_health_check_test.go b/mmv1/third_party/terraform/services/compute/data_source_compute_health_check_test.go index 227ba947b2bd..03bc06893a1b 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_compute_health_check_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_compute_health_check_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_compute_lb_ip_ranges_test.go b/mmv1/third_party/terraform/services/compute/data_source_compute_lb_ip_ranges_test.go index e1d390a4dbf4..8faaa1aeeee4 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_compute_lb_ip_ranges_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_compute_lb_ip_ranges_test.go @@ -4,7 +4,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_compute_network_endpoint_group_test.go b/mmv1/third_party/terraform/services/compute/data_source_compute_network_endpoint_group_test.go index c5eca5ce8554..56b6b27a1d08 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_compute_network_endpoint_group_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_compute_network_endpoint_group_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_compute_network_peering_test.go b/mmv1/third_party/terraform/services/compute/data_source_compute_network_peering_test.go index 74fdc83dbf38..e458765b5b4e 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_compute_network_peering_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_compute_network_peering_test.go @@ -3,7 +3,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_compute_secutity_policy_test.go b/mmv1/third_party/terraform/services/compute/data_source_compute_secutity_policy_test.go index 761fef6ae86d..4617c7b482df 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_compute_secutity_policy_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_compute_secutity_policy_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_address_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_address_test.go index ab4a6799bb0f..70954916e956 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_address_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_address_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_addresses_test.go.erb b/mmv1/third_party/terraform/services/compute/data_source_google_compute_addresses_test.go.erb index 7b496e2f2d5c..bf97e65361e4 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_addresses_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_addresses_test.go.erb @@ -6,8 +6,8 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDataSourceComputeAddresses(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_backend_bucket_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_backend_bucket_test.go index 3d7acce4b3d4..88d99235e8af 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_backend_bucket_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_backend_bucket_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_backend_service_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_backend_service_test.go index d37e644de7a1..d72b71999994 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_backend_service_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_backend_service_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_default_service_account_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_default_service_account_test.go index 0642da014051..ed083a1f1dfc 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_default_service_account_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_default_service_account_test.go @@ -3,7 +3,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_disk_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_disk_test.go index b978a3834c4c..7de5bf838180 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_disk_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_disk_test.go @@ -3,7 +3,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_forwarding_rule_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_forwarding_rule_test.go index b30bb8ce3056..1109ed81347e 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_forwarding_rule_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_forwarding_rule_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_forwarding_rules_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_forwarding_rules_test.go index c0bc3e9004f9..afc8704abc4a 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_forwarding_rules_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_forwarding_rules_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_global_address_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_global_address_test.go index 184f704c8f6b..05d1bb971532 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_global_address_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_global_address_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_ha_vpn_gateway_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_ha_vpn_gateway_test.go index c805fb84c257..a4c5583192b1 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_ha_vpn_gateway_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_ha_vpn_gateway_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_image_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_image_test.go index 8676538512a4..8ddaba7bf035 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_image_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_image_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_group_manager_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_group_manager_test.go index b782d540a58b..9497d8b16641 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_group_manager_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_group_manager_test.go @@ -3,7 +3,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_group_test.go.erb b/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_group_test.go.erb index 92f9df28982f..5167be48e11b 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_group_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_group_test.go.erb @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDataSourceGoogleComputeInstanceGroup_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_serial_port_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_serial_port_test.go index 4e2b9f67fd68..1a8768e457fd 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_serial_port_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_serial_port_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceComputeInstanceSerialPort_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_template_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_template_test.go index ef8e82a26180..57095089d735 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_template_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_template_test.go @@ -3,7 +3,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_test.go.erb b/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_test.go.erb index 7fe68311633c..81dcd6ecca6e 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_test.go.erb @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_machine_types_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_machine_types_test.go index 8158ba5c8224..ee6de96fd576 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_machine_types_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_machine_types_test.go @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_network_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_network_test.go index 6ef6a7c59f50..53b4d5152553 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_network_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_network_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_networks_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_networks_test.go index 52f6cf10ac9b..9e6ec8ef291d 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_networks_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_networks_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_node_types_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_node_types_test.go index fdc3bf16655c..41ec5538d7f4 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_node_types_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_node_types_test.go @@ -8,8 +8,8 @@ import ( "regexp" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_disk_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_disk_test.go index d28025ef857b..e5ce4338f4d3 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_disk_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_disk_test.go @@ -3,7 +3,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_instance_group_test.go.erb b/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_instance_group_test.go.erb index 6dfdc51c626b..eeb6c5dbd245 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_instance_group_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_instance_group_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceRegionInstanceGroup(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_instance_template_test.go.erb b/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_instance_template_test.go.erb index 73a4d1fa09f0..bb844ba2441c 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_instance_template_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_instance_template_test.go.erb @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccRegionInstanceTemplateDatasource_name(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_network_endpoint_group_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_network_endpoint_group_test.go index 764ee739757f..2b98ee9332d5 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_network_endpoint_group_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_network_endpoint_group_test.go @@ -3,7 +3,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_ssl_certificate_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_ssl_certificate_test.go index 705cdebace51..697928767580 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_ssl_certificate_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_ssl_certificate_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_regions_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_regions_test.go index 9ed5fb1ca1bd..b56d1961e56b 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_regions_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_regions_test.go @@ -6,8 +6,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_reservation_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_reservation_test.go index 8cf06e5974af..065d9be51087 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_reservation_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_reservation_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_resource_policy_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_resource_policy_test.go index a5faa5aecd5b..b788c3f15072 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_resource_policy_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_resource_policy_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDataSourceComputeResourcePolicy(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_router_nat_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_router_nat_test.go index 5b83f2a003cd..f5d4ced5527f 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_router_nat_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_router_nat_test.go @@ -3,7 +3,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_router_status_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_router_status_test.go index 26c093540a09..8e9df1a6214b 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_router_status_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_router_status_test.go @@ -3,7 +3,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_router_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_router_test.go index d3daad9b6b10..cefabe64d202 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_router_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_router_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_snapshot_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_snapshot_test.go index 97c0c1111646..17ea06f97502 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_snapshot_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_snapshot_test.go @@ -3,7 +3,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_ssl_certificate_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_ssl_certificate_test.go index e84d4d2b5f1c..70b8fda77c83 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_ssl_certificate_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_ssl_certificate_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_ssl_policy_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_ssl_policy_test.go index 3cfc6ba2f74d..8d0e59fec7d3 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_ssl_policy_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_ssl_policy_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_subnetwork_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_subnetwork_test.go index 0017d287ea90..4b7f39a5979a 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_subnetwork_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_subnetwork_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_subnetworks_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_subnetworks_test.go index 0ea347ed17cc..fa2100690ff1 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_subnetworks_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_subnetworks_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_vpn_gateway_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_vpn_gateway_test.go index 3592a7e961e8..af0354e743f6 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_vpn_gateway_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_vpn_gateway_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_zones_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_zones_test.go index 2043795a8ede..e9b1f7f2ceed 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_zones_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_zones_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_global_compute_forwarding_rule_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_global_compute_forwarding_rule_test.go index bfb94ba7d822..5fd17780520e 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_global_compute_forwarding_rule_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_global_compute_forwarding_rule_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/go/data_source_google_compute_addresses_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/data_source_google_compute_addresses_test.go.tmpl index 6f966110cd8b..687524b0c83f 100644 --- a/mmv1/third_party/terraform/services/compute/go/data_source_google_compute_addresses_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/data_source_google_compute_addresses_test.go.tmpl @@ -5,8 +5,8 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDataSourceComputeAddresses(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/go/data_source_google_compute_instance_group_test.go b/mmv1/third_party/terraform/services/compute/go/data_source_google_compute_instance_group_test.go index bd4c20e755fc..2603417e79f5 100644 --- a/mmv1/third_party/terraform/services/compute/go/data_source_google_compute_instance_group_test.go +++ b/mmv1/third_party/terraform/services/compute/go/data_source_google_compute_instance_group_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccDataSourceGoogleComputeInstanceGroup_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/go/data_source_google_compute_instance_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/data_source_google_compute_instance_test.go.tmpl index 65d3dd7834cf..f868c4ac5dc1 100644 --- a/mmv1/third_party/terraform/services/compute/go/data_source_google_compute_instance_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/data_source_google_compute_instance_test.go.tmpl @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/go/data_source_google_compute_region_instance_group_test.go b/mmv1/third_party/terraform/services/compute/go/data_source_google_compute_region_instance_group_test.go index 7296cd4e9eb9..24bbde48d011 100644 --- a/mmv1/third_party/terraform/services/compute/go/data_source_google_compute_region_instance_group_test.go +++ b/mmv1/third_party/terraform/services/compute/go/data_source_google_compute_region_instance_group_test.go @@ -2,10 +2,10 @@ package compute_test import ( "fmt" - "testing" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "testing" ) func TestAccDataSourceRegionInstanceGroup(t *testing.T) { @@ -14,7 +14,7 @@ func TestAccDataSourceRegionInstanceGroup(t *testing.T) { t.Parallel() name := "tf-test-" + acctest.RandString(t, 6) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { diff --git a/mmv1/third_party/terraform/services/compute/go/data_source_google_compute_region_instance_template_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/data_source_google_compute_region_instance_template_test.go.tmpl index 2d757b86ed70..a935f437ea16 100644 --- a/mmv1/third_party/terraform/services/compute/go/data_source_google_compute_region_instance_template_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/data_source_google_compute_region_instance_template_test.go.tmpl @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccRegionInstanceTemplateDatasource_name(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_autoscaler_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_autoscaler_test.go.tmpl index a6c6ecd2c4d2..eea1a5da5f9d 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_autoscaler_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_autoscaler_test.go.tmpl @@ -2,10 +2,10 @@ package compute_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeAutoscaler_update(t *testing.T) { @@ -37,7 +37,6 @@ func TestAccComputeAutoscaler_update(t *testing.T) { ImportState: true, ImportStateVerify: true, }, - }, }) } diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_backend_service_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_backend_service_test.go.tmpl index 74617a1680e4..ea9579c58f68 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_backend_service_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_backend_service_test.go.tmpl @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeBackendService_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_disk_async_replication_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_disk_async_replication_test.go.tmpl index 57550d48e989..7cea74a407cf 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_disk_async_replication_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_disk_async_replication_test.go.tmpl @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_disk_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_disk_test.go.tmpl index 5545a6709ef2..dcd8c1201ed7 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_disk_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_disk_test.go.tmpl @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_firewall_policy_rule_test.go b/mmv1/third_party/terraform/services/compute/go/resource_compute_firewall_policy_rule_test.go index 51954650ed5d..affdc8b266eb 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_firewall_policy_rule_test.go +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_firewall_policy_rule_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) @@ -66,89 +66,89 @@ func TestAccComputeFirewallPolicyRule_update(t *testing.T) { } func TestAccComputeFirewallPolicyRule_multipleRules(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - "org_name": fmt.Sprintf("organizations/%s", envvar.GetTestOrgFromEnv(t)), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + "org_name": fmt.Sprintf("organizations/%s", envvar.GetTestOrgFromEnv(t)), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccComputeFirewallPolicyRule_multiple(context), - }, - { - ResourceName: "google_compute_firewall_policy_rule.fw_policy_rule1", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - ImportStateVerifyIgnore: []string{"firewall_policy"}, - }, - { - ResourceName: "google_compute_firewall_policy_rule.fw_policy_rule2", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - ImportStateVerifyIgnore: []string{"firewall_policy"}, - }, - { - Config: testAccComputeFirewallPolicyRule_multipleAdd(context), - }, - { - ResourceName: "google_compute_firewall_policy_rule.fw_policy_rule3", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - ImportStateVerifyIgnore: []string{"firewall_policy"}, - }, - { - Config: testAccComputeFirewallPolicyRule_multipleRemove(context), - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccComputeFirewallPolicyRule_multiple(context), + }, + { + ResourceName: "google_compute_firewall_policy_rule.fw_policy_rule1", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + ImportStateVerifyIgnore: []string{"firewall_policy"}, + }, + { + ResourceName: "google_compute_firewall_policy_rule.fw_policy_rule2", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + ImportStateVerifyIgnore: []string{"firewall_policy"}, + }, + { + Config: testAccComputeFirewallPolicyRule_multipleAdd(context), + }, + { + ResourceName: "google_compute_firewall_policy_rule.fw_policy_rule3", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + ImportStateVerifyIgnore: []string{"firewall_policy"}, + }, + { + Config: testAccComputeFirewallPolicyRule_multipleRemove(context), + }, + }, + }) } func TestAccComputeFirewallPolicyRule_securityProfileGroup_update(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - "org_name": fmt.Sprintf("organizations/%s", envvar.GetTestOrgFromEnv(t)), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + "org_name": fmt.Sprintf("organizations/%s", envvar.GetTestOrgFromEnv(t)), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccComputeFirewallPolicyRule_securityProfileGroup_basic(context), - }, - { - ResourceName: "google_compute_firewall_policy_rule.fw_policy_rule1", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - ImportStateVerifyIgnore: []string{"firewall_policy"}, - }, - { - Config: testAccComputeFirewallPolicyRule_securityProfileGroup_update(context), - }, - { - ResourceName: "google_compute_firewall_policy_rule.fw_policy_rule1", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - ImportStateVerifyIgnore: []string{"firewall_policy", "target_resources"}, - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccComputeFirewallPolicyRule_securityProfileGroup_basic(context), + }, + { + ResourceName: "google_compute_firewall_policy_rule.fw_policy_rule1", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + ImportStateVerifyIgnore: []string{"firewall_policy"}, + }, + { + Config: testAccComputeFirewallPolicyRule_securityProfileGroup_update(context), + }, + { + ResourceName: "google_compute_firewall_policy_rule.fw_policy_rule1", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + ImportStateVerifyIgnore: []string{"firewall_policy", "target_resources"}, + }, + }, + }) } func testAccComputeFirewallPolicyRule_securityProfileGroup_basic(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_folder" "folder" { display_name = "tf-test-folder-%{random_suffix}" parent = "%{org_name}" @@ -197,7 +197,7 @@ resource "google_compute_firewall_policy_rule" "fw_policy_rule1" { } func testAccComputeFirewallPolicyRule_securityProfileGroup_update(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_folder" "folder" { display_name = "tf-test-folder-%{random_suffix}" parent = "%{org_name}" diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_firewall_policy_test.go b/mmv1/third_party/terraform/services/compute/go/resource_compute_firewall_policy_test.go index a4f69426b577..119996bdae9e 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_firewall_policy_test.go +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_firewall_policy_test.go @@ -2,11 +2,11 @@ package compute_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeFirewallPolicy_update(t *testing.T) { @@ -50,7 +50,7 @@ func TestAccComputeFirewallPolicy_update(t *testing.T) { } func testAccComputeFirewallPolicy_basic(org, policyName, folderName string) string { - return fmt.Sprintf(` + return fmt.Sprintf(` resource "google_folder" "folder" { display_name = "%s" parent = "%s" @@ -65,7 +65,7 @@ resource "google_compute_firewall_policy" "default" { } func testAccComputeFirewallPolicy_update(org, policyName, folderName string) string { - return fmt.Sprintf(` + return fmt.Sprintf(` resource "google_folder" "folder" { display_name = "%s" parent = "%s" diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_firewall_test.go b/mmv1/third_party/terraform/services/compute/go/resource_compute_firewall_test.go index f729388d4361..2480bdfd4d2f 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_firewall_test.go +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_firewall_test.go @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) @@ -133,7 +133,7 @@ func TestAccComputeFirewall_noSource(t *testing.T) { CheckDestroy: testAccCheckComputeFirewallDestroyProducer(t), Steps: []resource.TestStep{ { - Config: testAccComputeFirewall_noSource(networkName, firewallName), + Config: testAccComputeFirewall_noSource(networkName, firewallName), ExpectError: regexp.MustCompile("one of source_tags, source_ranges, or source_service_accounts must be defined"), }, }, @@ -356,7 +356,6 @@ resource "google_compute_firewall" "foobar" { `, network, firewall) } - func testAccComputeFirewall_localRangesUpdate(network, firewall string) string { return fmt.Sprintf(` resource "google_compute_network" "foobar" { diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_forwarding_rule_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_forwarding_rule_test.go.tmpl index 3c9f8f0598a5..7e75a98ea201 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_forwarding_rule_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_forwarding_rule_test.go.tmpl @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeForwardingRule_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_global_address_test.go b/mmv1/third_party/terraform/services/compute/go/resource_compute_global_address_test.go index fb846d6525dc..1ef231b28c5e 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_global_address_test.go +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_global_address_test.go @@ -2,10 +2,10 @@ package compute_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeGlobalAddress_ipv6(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_global_forwarding_rule_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_global_forwarding_rule_test.go.tmpl index 8d837b9c2062..25002bbfbd70 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_global_forwarding_rule_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_global_forwarding_rule_test.go.tmpl @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/compute" ) diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_global_network_endpoint_test.go b/mmv1/third_party/terraform/services/compute/go/resource_compute_global_network_endpoint_test.go index 1190fb6f9351..73a249356d51 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_global_network_endpoint_test.go +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_global_network_endpoint_test.go @@ -1,11 +1,12 @@ package compute_test + import ( "fmt" "testing" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) func TestAccComputeGlobalNetworkEndpoint_networkEndpointsBasic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_health_check_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_health_check_test.go.tmpl index d762af049515..ef35f4fa53c8 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_health_check_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_health_check_test.go.tmpl @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_http_health_check_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_http_health_check_test.go.tmpl index e7a73fcf10b8..051e9082d8cc 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_http_health_check_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_http_health_check_test.go.tmpl @@ -5,8 +5,8 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" {{ if eq $.TargetVersionName `ga` }} "google.golang.org/api/compute/v1" diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_image_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_image_test.go.tmpl index 3df9f17165f0..727304f7a94f 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_image_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_image_test.go.tmpl @@ -8,8 +8,8 @@ import ( tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" "github.com/hashicorp/terraform-provider-google/google/tpgresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" {{ if eq $.TargetVersionName `ga` }} "google.golang.org/api/compute/v1" diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_from_machine_image_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_from_machine_image_test.go.tmpl index 99107d8a9b65..1ccd74953d44 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_from_machine_image_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_from_machine_image_test.go.tmpl @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_from_template_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_from_template_test.go.tmpl index 2f04be954c0b..27eb5b8f6030 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_from_template_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_from_template_test.go.tmpl @@ -5,8 +5,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" {{ if eq $.TargetVersionName `ga` }} diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_group_manager_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_group_manager_test.go.tmpl index d6e1632ae483..5c7ad1c0f191 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_group_manager_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_group_manager_test.go.tmpl @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" {{- if ne $.TargetVersionName "ga" }} "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_group_membership_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_group_membership_test.go.tmpl index a29af0152a5e..cd851b1ff917 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_group_membership_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_group_membership_test.go.tmpl @@ -5,8 +5,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_group_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_group_test.go.tmpl index d71408949dbe..86971e990012 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_group_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_group_test.go.tmpl @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" {{ if eq $.TargetVersionName `ga` }} "google.golang.org/api/compute/v1" diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_settings_test.go b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_settings_test.go index a4064516cf40..9e049f1cf921 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_settings_test.go +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_settings_test.go @@ -3,7 +3,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) @@ -12,7 +12,7 @@ func TestAccComputeInstanceSettings_update(t *testing.T) { t.Parallel() context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), + "random_suffix": acctest.RandString(t, 10), } acctest.VcrTest(t, resource.TestCase{ diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_template_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_template_test.go.tmpl index 3706902ae507..e29c131cb3b4 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_template_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_template_test.go.tmpl @@ -13,8 +13,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_test.go.tmpl index 574b8de0f02c..f86408396428 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_test.go.tmpl @@ -16,8 +16,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_network_edge_security_service_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_network_edge_security_service_test.go.tmpl index e0110fcc32b8..c88c5002ccf1 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_network_edge_security_service_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_network_edge_security_service_test.go.tmpl @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_network_endpoint_group_test.go b/mmv1/third_party/terraform/services/compute/go/resource_compute_network_endpoint_group_test.go index a42926815467..fd4d0954f704 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_network_endpoint_group_test.go +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_network_endpoint_group_test.go @@ -3,8 +3,8 @@ package compute_test import ( "testing" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) func TestAccComputeNetworkEndpointGroup_networkEndpointGroup(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_network_endpoint_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_network_endpoint_test.go.tmpl index c562bb634bcf..b47804e731d5 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_network_endpoint_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_network_endpoint_test.go.tmpl @@ -5,8 +5,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_network_endpoints_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_network_endpoints_test.go.tmpl index ede80521b872..5b766facb3e6 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_network_endpoints_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_network_endpoints_test.go.tmpl @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_network_firewall_policy_rule_test.go b/mmv1/third_party/terraform/services/compute/go/resource_compute_network_firewall_policy_rule_test.go index 769a3ce51970..02684f9f2374 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_network_firewall_policy_rule_test.go +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_network_firewall_policy_rule_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) @@ -66,89 +66,89 @@ func TestAccComputeNetworkFirewallPolicyRule_update(t *testing.T) { } func TestAccComputeNetworkFirewallPolicyRule_multipleRules(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - "org_name": fmt.Sprintf("organizations/%s", envvar.GetTestOrgFromEnv(t)), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + "org_name": fmt.Sprintf("organizations/%s", envvar.GetTestOrgFromEnv(t)), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccComputeNetworkFirewallPolicyRule_multiple(context), - }, - { - ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule1", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - ImportStateVerifyIgnore: []string{"firewall_policy"}, - }, - { - ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule2", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - ImportStateVerifyIgnore: []string{"firewall_policy"}, - }, - { - Config: testAccComputeNetworkFirewallPolicyRule_multipleAdd(context), - }, - { - ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule3", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - ImportStateVerifyIgnore: []string{"firewall_policy"}, - }, - { - Config: testAccComputeNetworkFirewallPolicyRule_multipleRemove(context), - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccComputeNetworkFirewallPolicyRule_multiple(context), + }, + { + ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule1", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + ImportStateVerifyIgnore: []string{"firewall_policy"}, + }, + { + ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule2", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + ImportStateVerifyIgnore: []string{"firewall_policy"}, + }, + { + Config: testAccComputeNetworkFirewallPolicyRule_multipleAdd(context), + }, + { + ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule3", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + ImportStateVerifyIgnore: []string{"firewall_policy"}, + }, + { + Config: testAccComputeNetworkFirewallPolicyRule_multipleRemove(context), + }, + }, + }) } func TestAccComputeNetworkFirewallPolicyRule_securityProfileGroup_update(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - "org_name": fmt.Sprintf("organizations/%s", envvar.GetTestOrgFromEnv(t)), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + "org_name": fmt.Sprintf("organizations/%s", envvar.GetTestOrgFromEnv(t)), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccComputeNetworkFirewallPolicyRule_securityProfileGroup_basic(context), - }, - { - ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule1", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - ImportStateVerifyIgnore: []string{"firewall_policy"}, - }, - { - Config: testAccComputeNetworkFirewallPolicyRule_securityProfileGroup_update(context), - }, - { - ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule1", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - ImportStateVerifyIgnore: []string{"firewall_policy"}, - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccComputeNetworkFirewallPolicyRule_securityProfileGroup_basic(context), + }, + { + ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule1", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + ImportStateVerifyIgnore: []string{"firewall_policy"}, + }, + { + Config: testAccComputeNetworkFirewallPolicyRule_securityProfileGroup_update(context), + }, + { + ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule1", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + ImportStateVerifyIgnore: []string{"firewall_policy"}, + }, + }, + }) } func testAccComputeNetworkFirewallPolicyRule_securityProfileGroup_basic(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_compute_network" "network1" { name = "tf-test-%{random_suffix}" auto_create_subnetworks = false @@ -201,7 +201,7 @@ resource "google_compute_network_firewall_policy_rule" "fw_policy_rule1" { } func testAccComputeNetworkFirewallPolicyRule_securityProfileGroup_update(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_compute_network" "network1" { name = "tf-test-%{random_suffix}" auto_create_subnetworks = false diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_network_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_network_test.go.tmpl index 19fa69959f83..4fbfa553e07c 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_network_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_network_test.go.tmpl @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" {{ if eq $.TargetVersionName `ga` }} "google.golang.org/api/compute/v1" diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_node_group_test.go b/mmv1/third_party/terraform/services/compute/go/resource_compute_node_group_test.go index 690d749f3eb3..bd3af11881aa 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_node_group_test.go +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_node_group_test.go @@ -9,8 +9,8 @@ import ( "regexp" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_organization_security_policy_rule_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_organization_security_policy_rule_test.go.tmpl index f94f48d7fb6e..e6f4ac117299 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_organization_security_policy_rule_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_organization_security_policy_rule_test.go.tmpl @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeOrganizationSecurityPolicyRule_organizationSecurityPolicyRuleUpdateExample(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_organization_security_policy_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_organization_security_policy_test.go.tmpl index 819603c7b2f6..cdfe1e9894a7 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_organization_security_policy_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_organization_security_policy_test.go.tmpl @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeOrganizationSecurityPolicy_organizationSecurityPolicyUpdateExample(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_per_instance_config_test.go b/mmv1/third_party/terraform/services/compute/go/resource_compute_per_instance_config_test.go index f4a8a997e3a7..5b57791c967f 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_per_instance_config_test.go +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_per_instance_config_test.go @@ -2,12 +2,12 @@ package compute_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) @@ -688,9 +688,9 @@ func testAccComputePerInstanceConfigListInstances(t *testing.T, igmId string) (m url := fmt.Sprintf("%s%s/listManagedInstances", config.ComputeBasePath, igmId) res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ - Config: config, - Method: "POST", - RawURL: url, + Config: config, + Method: "POST", + RawURL: url, UserAgent: config.UserAgent, }) if err != nil { @@ -715,9 +715,9 @@ func testAccComputePerInstanceConfigListNames(t *testing.T, igmId string) (map[s url := fmt.Sprintf("%s%s/listPerInstanceConfigs", config.ComputeBasePath, igmId) res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ - Config: config, - Method: "POST", - RawURL: url, + Config: config, + Method: "POST", + RawURL: url, UserAgent: config.UserAgent, }) if err != nil { diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_autoscaler_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_autoscaler_test.go.tmpl index 0054483dd2a7..797fe36e974a 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_autoscaler_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_autoscaler_test.go.tmpl @@ -2,10 +2,10 @@ package compute_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeRegionAutoscaler_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_backend_service_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_backend_service_test.go.tmpl index 10ed4ec0052d..ddd4243dd38c 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_backend_service_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_backend_service_test.go.tmpl @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_disk_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_disk_test.go.tmpl index 07d3d55a164d..d5d223384eba 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_disk_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_disk_test.go.tmpl @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/tpgresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_health_check_test.go b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_health_check_test.go index 0ce408784596..c874bd24358d 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_health_check_test.go +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_health_check_test.go @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) @@ -156,7 +156,6 @@ func TestAccComputeRegionHealthCheck_tcpAndSsl_shouldFail(t *testing.T) { { Config: testAccComputeRegionHealthCheck_tcpAndSsl_shouldFail(hckName), ExpectError: regexp.MustCompile("only one of\n`grpc_health_check,http2_health_check,http_health_check,https_health_check,ssl_health_check,tcp_health_check`\ncan be specified, but `ssl_health_check,tcp_health_check` were specified"), - }, }, }) diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_instance_group_manager_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_instance_group_manager_test.go.tmpl index e094913cec11..680a4a629675 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_instance_group_manager_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_instance_group_manager_test.go.tmpl @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" {{- if ne $.TargetVersionName "ga" }} "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_instance_template_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_instance_template_test.go.tmpl index c50e4812d084..21fbab93d494 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_instance_template_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_instance_template_test.go.tmpl @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_network_endpoint_group_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_network_endpoint_group_test.go.tmpl index 82aa1567fe05..10bdf7edf45d 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_network_endpoint_group_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_network_endpoint_group_test.go.tmpl @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) {{- end }} diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_network_endpoint_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_network_endpoint_test.go.tmpl index 10ee3c6c45e4..2c3802f15e89 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_network_endpoint_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_network_endpoint_test.go.tmpl @@ -5,8 +5,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_per_instance_config_test.go b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_per_instance_config_test.go index 0b9e84cc5974..2a98a49462f2 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_per_instance_config_test.go +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_per_instance_config_test.go @@ -2,12 +2,12 @@ package compute_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccComputeRegionPerInstanceConfig_statefulBasic(t *testing.T) { @@ -407,7 +407,6 @@ resource "google_compute_region_instance_group_manager" "rigm" { `, context) } - func testAccComputeRegionPerInstanceConfig_removeInstanceOnDestroyBefore(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_compute_network" "default" { diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_security_policy_rule_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_security_policy_rule_test.go.tmpl index 4b161b5c7fe3..084fd7f9fad5 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_security_policy_rule_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_security_policy_rule_test.go.tmpl @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeRegionSecurityPolicyRule_regionSecurityPolicyRuleBasicUpdate(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_security_policy_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_security_policy_test.go.tmpl index 591de2371e5b..90b6a99b6c28 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_security_policy_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_security_policy_test.go.tmpl @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeRegionSecurityPolicy_regionSecurityPolicyBasicUpdateExample(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_ssl_policy_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_ssl_policy_test.go.tmpl index 0b9a504bc192..388814e162a0 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_ssl_policy_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_ssl_policy_test.go.tmpl @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" {{ if eq $.TargetVersionName `ga` }} diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_target_http_proxy_test.go b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_target_http_proxy_test.go index bb480cf9f3b9..e2b982856093 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_target_http_proxy_test.go +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_target_http_proxy_test.go @@ -2,10 +2,10 @@ package compute_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeRegionTargetHttpProxy_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_target_https_proxy_test.go b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_target_https_proxy_test.go index f83a6d4cc6dc..d47712c9f5c4 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_target_https_proxy_test.go +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_target_https_proxy_test.go @@ -2,11 +2,11 @@ package compute_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeRegionTargetHttpsProxy_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_target_tcp_proxy_test.go b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_target_tcp_proxy_test.go index e9bd70a3b702..2d34dbed13a5 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_target_tcp_proxy_test.go +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_target_tcp_proxy_test.go @@ -2,11 +2,11 @@ package compute_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccComputeRegionTargetTcpProxy_update(t *testing.T) { @@ -152,4 +152,4 @@ resource "google_compute_region_health_check" "zero" { region = "us-central1" } `, target, backend, backend, hc) -} \ No newline at end of file +} diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_url_map_test.go b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_url_map_test.go index d2021019146a..2602db0de647 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_url_map_test.go +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_url_map_test.go @@ -2,10 +2,10 @@ package compute_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeRegionUrlMap_update_path_matcher(t *testing.T) { @@ -1204,4 +1204,4 @@ resource "google_compute_region_backend_service" "home" { timeout_sec = 10 } `, randomSuffix, randomSuffix, randomSuffix) -} \ No newline at end of file +} diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_router_bgp_peer_test.go b/mmv1/third_party/terraform/services/compute/go/resource_compute_router_bgp_peer_test.go index 378de9011a09..48672b9f2e9c 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_router_bgp_peer_test.go +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_router_bgp_peer_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) @@ -207,9 +207,9 @@ func TestAccComputeRouterPeer_Ipv6Basic(t *testing.T) { } func TestAccComputeRouterPeer_Ipv4BasicCreateUpdate(t *testing.T) { - t.Parallel() + t.Parallel() - routerName := fmt.Sprintf("tf-test-router-%s", acctest.RandString(t, 10)) + routerName := fmt.Sprintf("tf-test-router-%s", acctest.RandString(t, 10)) resourceName := "google_compute_router_peer.foobar" acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -235,8 +235,8 @@ func TestAccComputeRouterPeer_Ipv4BasicCreateUpdate(t *testing.T) { testAccCheckComputeRouterPeerExists( t, resourceName), resource.TestCheckResourceAttr(resourceName, "enable_ipv4", "true"), - resource.TestCheckResourceAttr(resourceName, "ipv4_nexthop_address", "169.254.1.2"), - resource.TestCheckResourceAttr(resourceName, "peer_ipv4_nexthop_address", "169.254.1.1"), + resource.TestCheckResourceAttr(resourceName, "ipv4_nexthop_address", "169.254.1.2"), + resource.TestCheckResourceAttr(resourceName, "peer_ipv4_nexthop_address", "169.254.1.1"), ), }, { diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_router_interface_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_router_interface_test.go.tmpl index d0e7a44189fc..33721beaaa3d 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_router_interface_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_router_interface_test.go.tmpl @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) @@ -616,4 +616,4 @@ resource "google_compute_router_interface" "foobar" { ip_version = "IPV4" } `, routerName, routerName, routerName, routerName) -} \ No newline at end of file +} diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_router_nat_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_router_nat_test.go.tmpl index c1f4639732bd..963589bdbcfc 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_router_nat_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_router_nat_test.go.tmpl @@ -7,8 +7,8 @@ import ( {{- end }} "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_router_peer_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_router_peer_test.go.tmpl index b61ffbcca595..57f322f6ca05 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_router_peer_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_router_peer_test.go.tmpl @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_router_test.go b/mmv1/third_party/terraform/services/compute/go/resource_compute_router_test.go index 9bb8070b14b7..259bea80f803 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_router_test.go +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_router_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) @@ -337,4 +337,4 @@ resource "google_compute_router" "foobar" { } } `, routerName, routerName) -} \ No newline at end of file +} diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_security_policy_rule_test.go b/mmv1/third_party/terraform/services/compute/go/resource_compute_security_policy_rule_test.go index ea4386d897bb..9f5c8837a273 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_security_policy_rule_test.go +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_security_policy_rule_test.go @@ -1,12 +1,12 @@ package compute_test import ( - "fmt" - "regexp" - "testing" + "fmt" "github.com/hashicorp/terraform-provider-google/google/acctest" + "regexp" + "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeSecurityPolicyRule_basicUpdate(t *testing.T) { @@ -27,7 +27,7 @@ func TestAccComputeSecurityPolicyRule_basicUpdate(t *testing.T) { { ResourceName: "google_compute_security_policy_rule.policy_rule", ImportState: true, - ImportStateVerify: true, + ImportStateVerify: true, }, { Config: testAccComputeSecurityPolicyRule_postBasicUpdate(context), @@ -86,7 +86,7 @@ func TestAccComputeSecurityPolicyRule_extendedUpdate(t *testing.T) { ImportStateVerify: true, }, { - Config: testAccComputeSecurityPolicyRule_extPosUpdateSamePriority(context), + Config: testAccComputeSecurityPolicyRule_extPosUpdateSamePriority(context), ExpectError: regexp.MustCompile("Cannot have rules with the same priorities."), }, { @@ -122,9 +122,9 @@ func TestAccComputeSecurityPolicyRule_withPreconfiguredWafConfig(t *testing.T) { Config: testAccComputeSecurityPolicyRule_withPreconfiguredWafConfig_create(context), }, { - ResourceName: "google_compute_security_policy_rule.policy_rule", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_compute_security_policy_rule.policy_rule", + ImportState: true, + ImportStateVerify: true, }, { Config: testAccComputeSecurityPolicyRule_withPreconfiguredWafConfig_update(context), @@ -164,21 +164,21 @@ func TestAccComputeSecurityPolicyRule_withRateLimitOptions(t *testing.T) { { Config: testAccComputeSecurityPolicyRule_withRateLimitOptionsCreate(context), }, - { - ResourceName: "google_compute_security_policy_rule.policy_rule", - ImportState: true, - ImportStateVerify: true, - }, - { - Config: testAccComputeSecurityPolicyRule_withRateLimitOptionsUpdate(context), - }, - { - ResourceName: "google_compute_security_policy_rule.policy_rule", - ImportState: true, - ImportStateVerify: true, - }, - }, - }) + { + ResourceName: "google_compute_security_policy_rule.policy_rule", + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccComputeSecurityPolicyRule_withRateLimitOptionsUpdate(context), + }, + { + ResourceName: "google_compute_security_policy_rule.policy_rule", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) } func TestAccComputeSecurityPolicyRule_withRateLimit_withEnforceOnKeyConfigs(t *testing.T) { @@ -233,7 +233,6 @@ func TestAccComputeSecurityPolicyRule_withRateLimitOption_withMultipleEnforceOnK }) } - func TestAccComputeSecurityPolicyRule_EnforceOnKeyUpdates(t *testing.T) { t.Parallel() diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_security_policy_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_security_policy_test.go.tmpl index 10a003631fc8..f66d46cc76c0 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_security_policy_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_security_policy_test.go.tmpl @@ -5,8 +5,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_ssl_policy_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_ssl_policy_test.go.tmpl index 37bf28f24afd..a74e48adc23d 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_ssl_policy_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_ssl_policy_test.go.tmpl @@ -5,8 +5,8 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" {{ if eq $.TargetVersionName `ga` }} "google.golang.org/api/compute/v1" diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_subnetwork_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_subnetwork_test.go.tmpl index 964898c6b158..220c69f01509 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_subnetwork_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_subnetwork_test.go.tmpl @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_target_https_proxy_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_target_https_proxy_test.go.tmpl index 7fc12c1b57e9..4d037cfe92f9 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_target_https_proxy_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_target_https_proxy_test.go.tmpl @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/tpgresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" {{- if eq $.TargetVersionName "ga" }} "google.golang.org/api/compute/v1" {{- else }} diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_target_instance_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_target_instance_test.go.tmpl index 644aef35d759..ab65f0eaa39f 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_target_instance_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_target_instance_test.go.tmpl @@ -4,7 +4,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_target_pool_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_target_pool_test.go.tmpl index d1eaf50da0d4..0d30aa4ccd04 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_target_pool_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_target_pool_test.go.tmpl @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/tpgresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_target_ssl_proxy_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_target_ssl_proxy_test.go.tmpl index 246af61a1fd0..5ad06ef7c5da 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_target_ssl_proxy_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_target_ssl_proxy_test.go.tmpl @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" {{ if eq $.TargetVersionName `ga` }} "google.golang.org/api/compute/v1" diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_url_map_test.go b/mmv1/third_party/terraform/services/compute/go/resource_compute_url_map_test.go index 1e54d1a01e05..5eba024b61c8 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_url_map_test.go +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_url_map_test.go @@ -2,11 +2,11 @@ package compute_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccComputeUrlMap_update_path_matcher(t *testing.T) { @@ -67,56 +67,56 @@ func TestAccComputeUrlMap_advanced(t *testing.T) { } func TestAccComputeUrlMap_defaultRouteActionPathUrlRewrite(t *testing.T) { - t.Parallel() - - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckComputeUrlMapDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccComputeUrlMap_defaultRouteActionPathUrlRewrite(acctest.RandString(t, 10)), - Check: resource.ComposeTestCheckFunc( - testAccCheckComputeUrlMapExists( - t, "google_compute_url_map.foobar"), - ), - }, - { - Config: testAccComputeUrlMap_defaultRouteActionPathUrlRewrite_update(acctest.RandString(t, 10)), - Check: resource.ComposeTestCheckFunc( - testAccCheckComputeUrlMapExists( - t, "google_compute_url_map.foobar"), - ), - }, - }, - }) + t.Parallel() + + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckComputeUrlMapDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccComputeUrlMap_defaultRouteActionPathUrlRewrite(acctest.RandString(t, 10)), + Check: resource.ComposeTestCheckFunc( + testAccCheckComputeUrlMapExists( + t, "google_compute_url_map.foobar"), + ), + }, + { + Config: testAccComputeUrlMap_defaultRouteActionPathUrlRewrite_update(acctest.RandString(t, 10)), + Check: resource.ComposeTestCheckFunc( + testAccCheckComputeUrlMapExists( + t, "google_compute_url_map.foobar"), + ), + }, + }, + }) } func TestAccComputeUrlMap_defaultRouteActionUrlRewrite(t *testing.T) { - t.Parallel() - - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckComputeUrlMapDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccComputeUrlMap_defaultRouteActionUrlRewrite(acctest.RandString(t, 10)), - Check: resource.ComposeTestCheckFunc( - testAccCheckComputeUrlMapExists( - t, "google_compute_url_map.foobar"), - ), - }, - - { - Config: testAccComputeUrlMap_defaultRouteActionUrlRewrite_update(acctest.RandString(t, 10)), - Check: resource.ComposeTestCheckFunc( - testAccCheckComputeUrlMapExists( - t, "google_compute_url_map.foobar"), - ), - }, - }, - }) + t.Parallel() + + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckComputeUrlMapDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccComputeUrlMap_defaultRouteActionUrlRewrite(acctest.RandString(t, 10)), + Check: resource.ComposeTestCheckFunc( + testAccCheckComputeUrlMapExists( + t, "google_compute_url_map.foobar"), + ), + }, + + { + Config: testAccComputeUrlMap_defaultRouteActionUrlRewrite_update(acctest.RandString(t, 10)), + Check: resource.ComposeTestCheckFunc( + testAccCheckComputeUrlMapExists( + t, "google_compute_url_map.foobar"), + ), + }, + }, + }) } func TestAccComputeUrlMap_noPathRulesWithUpdate(t *testing.T) { @@ -176,69 +176,69 @@ func testAccCheckComputeUrlMapExists(t *testing.T, n string) resource.TestCheckF } func TestAccComputeUrlMap_defaultRouteActionTrafficDirectorPathUpdate(t *testing.T) { - t.Parallel() - - randString := acctest.RandString(t, 10) - - bsName := fmt.Sprintf("urlmap-test-%s", randString) - hcName := fmt.Sprintf("urlmap-test-%s", randString) - umName := fmt.Sprintf("urlmap-test-%s", randString) - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckComputeUrlMapDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccComputeUrlMap_defaultRouteActionTrafficDirectorPath(bsName, hcName, umName), - }, - { - ResourceName: "google_compute_url_map.foobar", - ImportState: true, - ImportStateVerify: true, - }, - { - Config: testAccComputeUrlMap_defaultRouteActionTrafficDirectorPathUpdate(bsName, hcName, umName), - }, - { - ResourceName: "google_compute_url_map.foobar", - ImportState: true, - ImportStateVerify: true, - }, - }, - }) + t.Parallel() + + randString := acctest.RandString(t, 10) + + bsName := fmt.Sprintf("urlmap-test-%s", randString) + hcName := fmt.Sprintf("urlmap-test-%s", randString) + umName := fmt.Sprintf("urlmap-test-%s", randString) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckComputeUrlMapDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccComputeUrlMap_defaultRouteActionTrafficDirectorPath(bsName, hcName, umName), + }, + { + ResourceName: "google_compute_url_map.foobar", + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccComputeUrlMap_defaultRouteActionTrafficDirectorPathUpdate(bsName, hcName, umName), + }, + { + ResourceName: "google_compute_url_map.foobar", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) } func TestAccComputeUrlMap_defaultRouteActionTrafficDirectorUpdate(t *testing.T) { - t.Parallel() - - randString := acctest.RandString(t, 10) - - bsName := fmt.Sprintf("urlmap-test-%s", randString) - hcName := fmt.Sprintf("urlmap-test-%s", randString) - umName := fmt.Sprintf("urlmap-test-%s", randString) - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckComputeUrlMapDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccComputeUrlMap_defaultRouteActionTrafficDirector(bsName, hcName, umName), - }, - { - ResourceName: "google_compute_url_map.foobar", - ImportState: true, - ImportStateVerify: true, - }, - { - Config: testAccComputeUrlMap_defaultRouteActionTrafficDirectorUpdate(bsName, hcName, umName), - }, - { - ResourceName: "google_compute_url_map.foobar", - ImportState: true, - ImportStateVerify: true, - }, - }, - }) + t.Parallel() + + randString := acctest.RandString(t, 10) + + bsName := fmt.Sprintf("urlmap-test-%s", randString) + hcName := fmt.Sprintf("urlmap-test-%s", randString) + umName := fmt.Sprintf("urlmap-test-%s", randString) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckComputeUrlMapDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccComputeUrlMap_defaultRouteActionTrafficDirector(bsName, hcName, umName), + }, + { + ResourceName: "google_compute_url_map.foobar", + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccComputeUrlMap_defaultRouteActionTrafficDirectorUpdate(bsName, hcName, umName), + }, + { + ResourceName: "google_compute_url_map.foobar", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) } func TestAccComputeUrlMap_trafficDirectorUpdate(t *testing.T) { @@ -569,7 +569,7 @@ resource "google_compute_url_map" "foobar" { } func testAccComputeUrlMap_defaultRouteActionPathUrlRewrite(suffix string) string { - return fmt.Sprintf(` + return fmt.Sprintf(` resource "google_compute_backend_service" "foobar" { name = "urlmap-test-%s" health_checks = [google_compute_http_health_check.zero.self_link] @@ -617,7 +617,7 @@ resource "google_compute_url_map" "foobar" { } func testAccComputeUrlMap_defaultRouteActionPathUrlRewrite_update(suffix string) string { - return fmt.Sprintf(` + return fmt.Sprintf(` resource "google_compute_backend_service" "foobar" { name = "urlmap-test-%s" health_checks = [google_compute_http_health_check.zero.self_link] @@ -665,7 +665,7 @@ resource "google_compute_url_map" "foobar" { } func testAccComputeUrlMap_defaultRouteActionUrlRewrite(suffix string) string { - return fmt.Sprintf(` + return fmt.Sprintf(` resource "google_compute_backend_service" "foobar" { name = "urlmap-test-%s" health_checks = [google_compute_http_health_check.zero.self_link] @@ -693,7 +693,7 @@ resource "google_compute_url_map" "foobar" { } func testAccComputeUrlMap_defaultRouteActionUrlRewrite_update(suffix string) string { - return fmt.Sprintf(` + return fmt.Sprintf(` resource "google_compute_backend_service" "foobar" { name = "urlmap-test-%s" health_checks = [google_compute_http_health_check.zero.self_link] @@ -1236,7 +1236,7 @@ resource "google_compute_health_check" "default" { } func testAccComputeUrlMap_defaultRouteActionTrafficDirectorPath(bsName, hcName, umName string) string { - return fmt.Sprintf(` + return fmt.Sprintf(` resource "google_compute_url_map" "foobar" { name = "%s" description = "a description" @@ -1351,7 +1351,7 @@ resource "google_compute_health_check" "default" { } func testAccComputeUrlMap_defaultRouteActionTrafficDirectorPathUpdate(bsName, hcName, umName string) string { - return fmt.Sprintf(` + return fmt.Sprintf(` resource "google_compute_url_map" "foobar" { name = "%s" description = "a description" @@ -1464,9 +1464,8 @@ resource "google_compute_health_check" "default" { `, umName, bsName, bsName, hcName) } - func testAccComputeUrlMap_defaultRouteActionTrafficDirector(bsName, hcName, umName string) string { - return fmt.Sprintf(` + return fmt.Sprintf(` resource "google_compute_url_map" "foobar" { name = "%s" description = "a description" @@ -1571,7 +1570,7 @@ resource "google_compute_health_check" "default" { } func testAccComputeUrlMap_defaultRouteActionTrafficDirectorUpdate(bsName, hcName, umName string) string { - return fmt.Sprintf(` + return fmt.Sprintf(` resource "google_compute_url_map" "foobar" { name = "%s" description = "a description" diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_url_map_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_url_map_test.go.tmpl index ce955dca24d1..f95431647db6 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_url_map_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_url_map_test.go.tmpl @@ -5,8 +5,8 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccComputeUrlMap_update_path_matcher(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/iam_compute_instance_test.go b/mmv1/third_party/terraform/services/compute/iam_compute_instance_test.go index 5c3452ade3a2..6a8ec4585c33 100644 --- a/mmv1/third_party/terraform/services/compute/iam_compute_instance_test.go +++ b/mmv1/third_party/terraform/services/compute/iam_compute_instance_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/iam_compute_subnetwork_test.go b/mmv1/third_party/terraform/services/compute/iam_compute_subnetwork_test.go index 2b6f2dbf41ab..376c7a5c7cb2 100644 --- a/mmv1/third_party/terraform/services/compute/iam_compute_subnetwork_test.go +++ b/mmv1/third_party/terraform/services/compute/iam_compute_subnetwork_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_address_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_address_test.go index 3df07f234fc1..e9865fdce86a 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_address_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_address_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_attached_disk_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_attached_disk_test.go index f4ba45548e78..1ac2590838ad 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_attached_disk_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_attached_disk_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_autoscaler_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_autoscaler_test.go.erb index 477521c6baed..4c1bdb814334 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_autoscaler_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_autoscaler_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeAutoscaler_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_backend_bucket_signed_url_key_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_backend_bucket_signed_url_key_test.go index 61fef3376e49..5bf280b8d75a 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_backend_bucket_signed_url_key_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_backend_bucket_signed_url_key_test.go @@ -6,8 +6,8 @@ import ( "strings" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_backend_bucket_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_backend_bucket_test.go index 0cc5d12899f6..f515811428fd 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_backend_bucket_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_backend_bucket_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_backend_service_signed_url_key_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_backend_service_signed_url_key_test.go index 9f473a2bcb88..c41d1bf95d5a 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_backend_service_signed_url_key_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_backend_service_signed_url_key_test.go @@ -6,8 +6,8 @@ import ( "strings" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_backend_service_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_backend_service_test.go.erb index 8e1ecf66cb8b..24e98ec027e7 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_backend_service_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_backend_service_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeBackendService_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_disk_async_replication_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_disk_async_replication_test.go.erb index 9d8699f0099b..be86c406e19d 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_disk_async_replication_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_disk_async_replication_test.go.erb @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_disk_resource_policy_attachment_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_disk_resource_policy_attachment_test.go index 101a767f8751..5e1dd7fd129a 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_disk_resource_policy_attachment_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_disk_resource_policy_attachment_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_disk_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_disk_test.go.erb index 44a21a2d7faf..0b549e10562d 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_disk_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_disk_test.go.erb @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_external_vpn_gateway_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_external_vpn_gateway_test.go index 808c39b5c08d..2f348b01014c 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_external_vpn_gateway_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_external_vpn_gateway_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_association_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_association_test.go index 2ea633ec07f8..820991e5ca17 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_association_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_association_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_rule_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_rule_test.go.erb index c63fbaac1476..44c240551ccf 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_rule_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_rule_test.go.erb @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_test.go.erb index 57274476f7cc..49a7697eb998 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeFirewallPolicy_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_firewall_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_firewall_test.go.erb index d00dce225af6..af0ba1d4f1a5 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_firewall_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_firewall_test.go.erb @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_forwarding_rule_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_forwarding_rule_test.go.erb index ce662cf78061..0881422de3a4 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_forwarding_rule_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_forwarding_rule_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeForwardingRule_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_global_address_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_global_address_test.go.erb index a1aae92ed456..d7f2b3fba139 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_global_address_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_global_address_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeGlobalAddress_ipv6(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_global_forwarding_rule_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_global_forwarding_rule_test.go.erb index cbf00c941c03..1a638d1aa2bf 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_global_forwarding_rule_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_global_forwarding_rule_test.go.erb @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/compute" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_global_network_endpoint_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_global_network_endpoint_test.go.erb index 5ea499110655..580f61012ec5 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_global_network_endpoint_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_global_network_endpoint_test.go.erb @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeGlobalNetworkEndpoint_networkEndpointsBasic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_health_check_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_health_check_test.go.erb index 45adf7269b1e..d912e975ed3f 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_health_check_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_health_check_test.go.erb @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_http_health_check_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_http_health_check_test.go.erb index 1b351df31274..1f860cd288f6 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_http_health_check_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_http_health_check_test.go.erb @@ -6,8 +6,8 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" <% if version == "ga" -%> "google.golang.org/api/compute/v1" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_https_health_check_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_https_health_check_test.go index 19597ae39651..e217395fd1cc 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_https_health_check_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_https_health_check_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_image_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_image_test.go.erb index 70405deef327..6ed5430ec8c1 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_image_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_image_test.go.erb @@ -9,8 +9,8 @@ import ( tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" "github.com/hashicorp/terraform-provider-google/google/tpgresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" <% if version == "ga" -%> "google.golang.org/api/compute/v1" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_from_machine_image_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_instance_from_machine_image_test.go.erb index 96ed96c31e34..b708e129d1bf 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_instance_from_machine_image_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_instance_from_machine_image_test.go.erb @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_from_template_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_instance_from_template_test.go.erb index fa31de54ff2e..755193f8aa0f 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_instance_from_template_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_instance_from_template_test.go.erb @@ -6,8 +6,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" <% if version == "ga" -%> diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_group_manager_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_instance_group_manager_test.go.erb index e7ad65047b09..c6bad0db6ca2 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_instance_group_manager_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_instance_group_manager_test.go.erb @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" <% unless version == "ga" -%> "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_group_membership_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_instance_group_membership_test.go.erb index 523b51ca6319..ab8df7f5db6a 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_instance_group_membership_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_instance_group_membership_test.go.erb @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_group_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_instance_group_test.go.erb index e80025eefb50..e33748591070 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_instance_group_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_instance_group_test.go.erb @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" <% if version == "ga" -%> "google.golang.org/api/compute/v1" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_settings_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_instance_settings_test.go.erb index 9e531b882f80..3988bdae0af6 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_instance_settings_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_instance_settings_test.go.erb @@ -4,7 +4,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.erb index 12a109e91711..aa214fb5779b 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.erb @@ -14,8 +14,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_instance_test.go.erb index 67ccf66111c5..66f7003cb4e9 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_instance_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_instance_test.go.erb @@ -17,8 +17,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_network_edge_security_service_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_network_edge_security_service_test.go.erb index 9b9ede922f28..5f0109e80ed4 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_network_edge_security_service_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_network_edge_security_service_test.go.erb @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_network_endpoint_group_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_network_endpoint_group_test.go.erb index b4d8a9cd993f..1c61642909fa 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_network_endpoint_group_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_network_endpoint_group_test.go.erb @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeNetworkEndpointGroup_networkEndpointGroup(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_network_endpoint_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_network_endpoint_test.go.erb index 0a2cdd83f8c6..95400abd3570 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_network_endpoint_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_network_endpoint_test.go.erb @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_network_endpoints_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_network_endpoints_test.go.erb index 664623d84b83..9c21b43a3d3f 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_network_endpoints_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_network_endpoints_test.go.erb @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_network_firewall_policy_rule_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_network_firewall_policy_rule_test.go.erb index 787e570d771a..3abfcf282fe3 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_network_firewall_policy_rule_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_network_firewall_policy_rule_test.go.erb @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_network_firewall_policy_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_network_firewall_policy_test.go index d64047341b36..d7ad8453eb0e 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_network_firewall_policy_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_network_firewall_policy_test.go @@ -1,7 +1,7 @@ package compute_test import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_network_peering_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_network_peering_test.go index eddbf475e12c..928d3566a228 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_network_peering_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_network_peering_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_network_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_network_test.go.erb index 2432f58a2015..88212a53f69e 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_network_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_network_test.go.erb @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" <% if version == "ga" -%> "google.golang.org/api/compute/v1" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_node_group_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_node_group_test.go.erb index a713c5e78e49..5731b3e0dd29 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_node_group_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_node_group_test.go.erb @@ -10,8 +10,8 @@ import ( "regexp" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_organization_security_policy_rule_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_organization_security_policy_rule_test.go.erb index 1e22f18e5459..4159475464f1 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_organization_security_policy_rule_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_organization_security_policy_rule_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeOrganizationSecurityPolicyRule_organizationSecurityPolicyRuleUpdateExample(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_organization_security_policy_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_organization_security_policy_test.go.erb index 6eb2c00074e1..c97dddbb9a04 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_organization_security_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_organization_security_policy_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeOrganizationSecurityPolicy_organizationSecurityPolicyUpdateExample(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_per_instance_config_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_per_instance_config_test.go.erb index a7a50f783525..54c2c5b48679 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_per_instance_config_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_per_instance_config_test.go.erb @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_project_cloud_armor_tier_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_project_cloud_armor_tier_test.go index 35e7b03b881b..7e3e69a82542 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_project_cloud_armor_tier_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_project_cloud_armor_tier_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_project_default_network_tier_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_project_default_network_tier_test.go index 78c7a9b9640c..39bf09aa41ca 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_project_default_network_tier_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_project_default_network_tier_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_project_metadata_item_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_project_metadata_item_test.go index df00a8f1c5d5..5d81401958ee 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_project_metadata_item_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_project_metadata_item_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccComputeProjectMetadataItem_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_project_metadata_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_project_metadata_test.go index 72bf9a78e622..45f001271bb0 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_project_metadata_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_project_metadata_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_public_advertised_prefix_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_public_advertised_prefix_test.go index b8fa4b9aa8a0..da65db1de128 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_public_advertised_prefix_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_public_advertised_prefix_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_autoscaler_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_region_autoscaler_test.go.erb index 842f6792ebe4..b48d097c2892 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_autoscaler_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_autoscaler_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeRegionAutoscaler_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_backend_service_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_region_backend_service_test.go.erb index 029a3dd22ca7..a89e692a2437 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_backend_service_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_backend_service_test.go.erb @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_disk_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_region_disk_test.go.erb index f59bb99bcd46..aceaea4f6ade 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_disk_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_disk_test.go.erb @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/tpgresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_health_check_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_region_health_check_test.go.erb index d9da24b25303..071c06a4f333 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_health_check_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_health_check_test.go.erb @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_group_manager_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_group_manager_test.go.erb index 80d62f7435cc..467f04cbb407 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_group_manager_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_group_manager_test.go.erb @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" <% unless version == "ga" -%> "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template_test.go.erb index 580fc41abe1c..4e1db30ba513 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template_test.go.erb @@ -11,8 +11,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_network_endpoint_group_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_region_network_endpoint_group_test.go.erb index 7c5f12680f80..abf26d2a35dc 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_network_endpoint_group_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_network_endpoint_group_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) <% end -%> diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_network_endpoint_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_region_network_endpoint_test.go.erb index abbeaf7a2dc3..6f62adfbdf9f 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_network_endpoint_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_network_endpoint_test.go.erb @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_network_firewall_policy_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_region_network_firewall_policy_test.go index d9de898f0830..1d787254172c 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_network_firewall_policy_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_network_firewall_policy_test.go @@ -1,7 +1,7 @@ package compute_test import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_per_instance_config_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_region_per_instance_config_test.go.erb index c2191d46be8c..edb2219faedb 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_per_instance_config_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_per_instance_config_test.go.erb @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccComputeRegionPerInstanceConfig_statefulBasic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_security_policy_rule_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_region_security_policy_rule_test.go.erb index 173d028413ae..34bc8eb5bf04 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_security_policy_rule_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_security_policy_rule_test.go.erb @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeRegionSecurityPolicyRule_regionSecurityPolicyRuleBasicUpdate(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_security_policy_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_region_security_policy_test.go.erb index 3911c4cd8285..3d5bc0c97e02 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_security_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_security_policy_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeRegionSecurityPolicy_regionSecurityPolicyBasicUpdateExample(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_ssl_policy_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_region_ssl_policy_test.go.erb index aa160ba3b1ad..0950c2d891d4 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_ssl_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_ssl_policy_test.go.erb @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" <% if version == "ga" -%> diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_target_http_proxy_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_region_target_http_proxy_test.go.erb index e38a413b0808..e7e73bf5fbae 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_target_http_proxy_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_target_http_proxy_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeRegionTargetHttpProxy_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_target_https_proxy_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_region_target_https_proxy_test.go.erb index 5bea2bf23d2e..f1a64104ffaf 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_target_https_proxy_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_target_https_proxy_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeRegionTargetHttpsProxy_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_target_tcp_proxy_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_region_target_tcp_proxy_test.go.erb index 535218117c07..687635dc1178 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_target_tcp_proxy_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_target_tcp_proxy_test.go.erb @@ -6,8 +6,8 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccComputeRegionTargetTcpProxy_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_url_map_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_region_url_map_test.go.erb index b72d6d46e260..28fab6544b11 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_url_map_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_url_map_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeRegionUrlMap_update_path_matcher(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_reservation_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_reservation_test.go index e5507acdeea3..6b72e8d4417d 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_reservation_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_reservation_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_resource_policy_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_resource_policy_test.go index 91d748b835f7..c005fc156075 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_resource_policy_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_resource_policy_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_route_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_route_test.go index 339567e38f12..2d69d740b63f 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_route_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_route_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_router_bgp_peer_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_router_bgp_peer_test.go.erb index 61218ee5b6f7..0186556129c1 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_router_bgp_peer_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_router_bgp_peer_test.go.erb @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_router_interface_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_router_interface_test.go.erb index 01aee5761f66..ddb66ba23d3c 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_router_interface_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_router_interface_test.go.erb @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_router_nat_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_router_nat_test.go.erb index f638bab4861e..b64fde7714e5 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_router_nat_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_router_nat_test.go.erb @@ -8,8 +8,8 @@ import ( <% end -%> "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_router_peer_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_router_peer_test.go.erb index e9545df09dcc..8dd2c8676235 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_router_peer_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_router_peer_test.go.erb @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_router_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_router_test.go.erb index 95f9f34d95fb..c74a6b631f86 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_router_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_router_test.go.erb @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_security_policy_rule_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_security_policy_rule_test.go.erb index 29578b86685b..78da32dbd767 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_security_policy_rule_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_security_policy_rule_test.go.erb @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeSecurityPolicyRule_basicUpdate(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_security_policy_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_security_policy_test.go.erb index 3b2747637f15..1ccf2e226ed7 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_security_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_security_policy_test.go.erb @@ -6,8 +6,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_service_attachment_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_service_attachment_test.go index 9229bb930ff9..110d4b98db5e 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_service_attachment_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_service_attachment_test.go @@ -3,7 +3,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_shared_reservation_update_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_shared_reservation_update_test.go index e28f8d3def33..a5f3f21bfb92 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_shared_reservation_update_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_shared_reservation_update_test.go @@ -3,7 +3,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_shared_vpc_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_shared_vpc_test.go index 61d16cf7fa4f..5b38a6b70156 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_shared_vpc_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_shared_vpc_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_snapshot_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_snapshot_test.go index 4d7f0dfd13d7..5d9c79c1c50a 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_snapshot_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_snapshot_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_ssl_certificate_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_ssl_certificate_test.go index 2df10cc9c932..01b7f423c448 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_ssl_certificate_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_ssl_certificate_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/compute" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_ssl_policy_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_ssl_policy_test.go.erb index d5a440e13ab1..889df5f735ed 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_ssl_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_ssl_policy_test.go.erb @@ -6,8 +6,8 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" <% if version == "ga" -%> "google.golang.org/api/compute/v1" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_subnetwork_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_subnetwork_test.go.erb index a20a1b44d6fd..c74ee2dfdced 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_subnetwork_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_subnetwork_test.go.erb @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_target_grpc_proxy_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_target_grpc_proxy_test.go index 0188fc7a75d3..deaefbbfbc65 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_target_grpc_proxy_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_target_grpc_proxy_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_target_http_proxy_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_target_http_proxy_test.go index 18f9cf631fa8..697fb738107e 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_target_http_proxy_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_target_http_proxy_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_target_https_proxy_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_target_https_proxy_test.go.erb index 6ff35b6b607c..68eefab3d514 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_target_https_proxy_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_target_https_proxy_test.go.erb @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/tpgresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" <% if version == "ga" -%> "google.golang.org/api/compute/v1" <% else -%> diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_target_instance_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_target_instance_test.go.erb index 383162bd2df6..6cd237bfab87 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_target_instance_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_target_instance_test.go.erb @@ -5,7 +5,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_target_pool_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_target_pool_test.go.erb index 0aa5097f4313..1798791857c0 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_target_pool_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_target_pool_test.go.erb @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/tpgresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_target_ssl_proxy_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_target_ssl_proxy_test.go.erb index c2573a8f80fd..6a902284cd71 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_target_ssl_proxy_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_target_ssl_proxy_test.go.erb @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" <% if version == "ga" -%> "google.golang.org/api/compute/v1" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_target_tcp_proxy_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_target_tcp_proxy_test.go index 563215243fec..b952f64f58d5 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_target_tcp_proxy_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_target_tcp_proxy_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_url_map_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_url_map_test.go.erb index dfc72c901701..182797a829ba 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_url_map_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_url_map_test.go.erb @@ -6,8 +6,8 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccComputeUrlMap_update_path_matcher(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_vpn_tunnel_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_vpn_tunnel_test.go index 1f67d5adf3b5..bb4841f8df62 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_vpn_tunnel_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_vpn_tunnel_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_usage_export_bucket_test.go b/mmv1/third_party/terraform/services/compute/resource_usage_export_bucket_test.go index 238cc7a0caa7..fd4feabe6858 100644 --- a/mmv1/third_party/terraform/services/compute/resource_usage_export_bucket_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_usage_export_bucket_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/container/data_source_google_container_cluster_test.go b/mmv1/third_party/terraform/services/container/data_source_google_container_cluster_test.go index 5389d6f15bb0..ee53e5b6cbfe 100644 --- a/mmv1/third_party/terraform/services/container/data_source_google_container_cluster_test.go +++ b/mmv1/third_party/terraform/services/container/data_source_google_container_cluster_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/container/data_source_google_container_engine_versions_test.go b/mmv1/third_party/terraform/services/container/data_source_google_container_engine_versions_test.go index f27f43f7f7cc..a8297604d920 100644 --- a/mmv1/third_party/terraform/services/container/data_source_google_container_engine_versions_test.go +++ b/mmv1/third_party/terraform/services/container/data_source_google_container_engine_versions_test.go @@ -6,8 +6,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/container/go/resource_container_cluster_test.go.tmpl b/mmv1/third_party/terraform/services/container/go/resource_container_cluster_test.go.tmpl index 5b289f0027f4..5b6d4fd4fd88 100644 --- a/mmv1/third_party/terraform/services/container/go/resource_container_cluster_test.go.tmpl +++ b/mmv1/third_party/terraform/services/container/go/resource_container_cluster_test.go.tmpl @@ -6,8 +6,8 @@ import ( "testing" "regexp" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/container" diff --git a/mmv1/third_party/terraform/services/container/go/resource_container_node_pool_test.go.tmpl b/mmv1/third_party/terraform/services/container/go/resource_container_node_pool_test.go.tmpl index b9d633a9c8ce..36517729d107 100644 --- a/mmv1/third_party/terraform/services/container/go/resource_container_node_pool_test.go.tmpl +++ b/mmv1/third_party/terraform/services/container/go/resource_container_node_pool_test.go.tmpl @@ -5,8 +5,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.erb b/mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.erb index 1f018f2a937a..36cdae8fb47b 100644 --- a/mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.erb +++ b/mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.erb @@ -7,8 +7,8 @@ import ( "testing" "regexp" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/container" diff --git a/mmv1/third_party/terraform/services/container/resource_container_node_pool_test.go.erb b/mmv1/third_party/terraform/services/container/resource_container_node_pool_test.go.erb index 6a8498b261d6..49aa5d5db26c 100644 --- a/mmv1/third_party/terraform/services/container/resource_container_node_pool_test.go.erb +++ b/mmv1/third_party/terraform/services/container/resource_container_node_pool_test.go.erb @@ -6,8 +6,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/containeranalysis/data_source_container_registry_test.go b/mmv1/third_party/terraform/services/containeranalysis/data_source_container_registry_test.go index dfdd8b4644b2..03265bc0f20c 100644 --- a/mmv1/third_party/terraform/services/containeranalysis/data_source_container_registry_test.go +++ b/mmv1/third_party/terraform/services/containeranalysis/data_source_container_registry_test.go @@ -3,7 +3,7 @@ package containeranalysis_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/containeranalysis/go/resource_container_analysis_note_test.go.tmpl b/mmv1/third_party/terraform/services/containeranalysis/go/resource_container_analysis_note_test.go.tmpl index 41c61ecbc477..8d2294c6cf78 100644 --- a/mmv1/third_party/terraform/services/containeranalysis/go/resource_container_analysis_note_test.go.tmpl +++ b/mmv1/third_party/terraform/services/containeranalysis/go/resource_container_analysis_note_test.go.tmpl @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/containeranalysis/resource_container_analysis_note_test.go.erb b/mmv1/third_party/terraform/services/containeranalysis/resource_container_analysis_note_test.go.erb index f88e38e48384..8d16a309fa22 100644 --- a/mmv1/third_party/terraform/services/containeranalysis/resource_container_analysis_note_test.go.erb +++ b/mmv1/third_party/terraform/services/containeranalysis/resource_container_analysis_note_test.go.erb @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/containeranalysis/resource_container_analysis_occurrence_test.go b/mmv1/third_party/terraform/services/containeranalysis/resource_container_analysis_occurrence_test.go index d0f73e97df6e..2a57e5e46ed1 100644 --- a/mmv1/third_party/terraform/services/containeranalysis/resource_container_analysis_occurrence_test.go +++ b/mmv1/third_party/terraform/services/containeranalysis/resource_container_analysis_occurrence_test.go @@ -12,7 +12,7 @@ import ( "crypto/sha512" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "google.golang.org/api/cloudkms/v1" ) diff --git a/mmv1/third_party/terraform/services/containeranalysis/resource_container_registry_test.go b/mmv1/third_party/terraform/services/containeranalysis/resource_container_registry_test.go index 9b0734e21ba5..3f40ae33d9d9 100644 --- a/mmv1/third_party/terraform/services/containeranalysis/resource_container_registry_test.go +++ b/mmv1/third_party/terraform/services/containeranalysis/resource_container_registry_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/containerattached/data_source_google_container_attached_install_manifest_test.go b/mmv1/third_party/terraform/services/containerattached/data_source_google_container_attached_install_manifest_test.go index e2cc88a52e47..65020e838825 100644 --- a/mmv1/third_party/terraform/services/containerattached/data_source_google_container_attached_install_manifest_test.go +++ b/mmv1/third_party/terraform/services/containerattached/data_source_google_container_attached_install_manifest_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/containerattached/data_source_google_container_attached_versions_test.go b/mmv1/third_party/terraform/services/containerattached/data_source_google_container_attached_versions_test.go index 40fd1dd0440f..4c10bfc349d7 100644 --- a/mmv1/third_party/terraform/services/containerattached/data_source_google_container_attached_versions_test.go +++ b/mmv1/third_party/terraform/services/containerattached/data_source_google_container_attached_versions_test.go @@ -6,8 +6,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/containerattached/resource_container_attached_cluster_update_test.go b/mmv1/third_party/terraform/services/containerattached/resource_container_attached_cluster_update_test.go index ad10e4f05a1e..e4de49f585d9 100644 --- a/mmv1/third_party/terraform/services/containerattached/resource_container_attached_cluster_update_test.go +++ b/mmv1/third_party/terraform/services/containerattached/resource_container_attached_cluster_update_test.go @@ -3,7 +3,7 @@ package containerattached_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/corebilling/resource_google_billing_project_info_test.go b/mmv1/third_party/terraform/services/corebilling/resource_google_billing_project_info_test.go index feb75b3d7ad6..240bb5453ce2 100644 --- a/mmv1/third_party/terraform/services/corebilling/resource_google_billing_project_info_test.go +++ b/mmv1/third_party/terraform/services/corebilling/resource_google_billing_project_info_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/databasemigrationservice/resource_database_migration_service_connection_profile_test.go b/mmv1/third_party/terraform/services/databasemigrationservice/resource_database_migration_service_connection_profile_test.go index eb4e9a879c0f..771c0b8ca4b2 100644 --- a/mmv1/third_party/terraform/services/databasemigrationservice/resource_database_migration_service_connection_profile_test.go +++ b/mmv1/third_party/terraform/services/databasemigrationservice/resource_database_migration_service_connection_profile_test.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDatabaseMigrationServiceConnectionProfile_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/datacatalog/resource_data_catalog_entry_group_test.go b/mmv1/third_party/terraform/services/datacatalog/resource_data_catalog_entry_group_test.go index 86f3b30ce90a..7055ffad2f57 100644 --- a/mmv1/third_party/terraform/services/datacatalog/resource_data_catalog_entry_group_test.go +++ b/mmv1/third_party/terraform/services/datacatalog/resource_data_catalog_entry_group_test.go @@ -3,7 +3,7 @@ package datacatalog_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/datacatalog/resource_data_catalog_entry_test.go b/mmv1/third_party/terraform/services/datacatalog/resource_data_catalog_entry_test.go index 0a8f3a7b2ac6..f5064b8d2cb7 100644 --- a/mmv1/third_party/terraform/services/datacatalog/resource_data_catalog_entry_test.go +++ b/mmv1/third_party/terraform/services/datacatalog/resource_data_catalog_entry_test.go @@ -3,7 +3,7 @@ package datacatalog_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/datacatalog/resource_data_catalog_tag_template_test.go b/mmv1/third_party/terraform/services/datacatalog/resource_data_catalog_tag_template_test.go index bcd88ba6c127..94d21481d0f1 100644 --- a/mmv1/third_party/terraform/services/datacatalog/resource_data_catalog_tag_template_test.go +++ b/mmv1/third_party/terraform/services/datacatalog/resource_data_catalog_tag_template_test.go @@ -4,7 +4,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/datacatalog/resource_data_catalog_tag_test.go b/mmv1/third_party/terraform/services/datacatalog/resource_data_catalog_tag_test.go index 9569906eae09..369ef4898e71 100644 --- a/mmv1/third_party/terraform/services/datacatalog/resource_data_catalog_tag_test.go +++ b/mmv1/third_party/terraform/services/datacatalog/resource_data_catalog_tag_test.go @@ -3,7 +3,7 @@ package datacatalog_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/dataflow/go/resource_dataflow_flex_template_job_test.go.tmpl b/mmv1/third_party/terraform/services/dataflow/go/resource_dataflow_flex_template_job_test.go.tmpl index 43dae3c6e829..0ae3a078f41b 100644 --- a/mmv1/third_party/terraform/services/dataflow/go/resource_dataflow_flex_template_job_test.go.tmpl +++ b/mmv1/third_party/terraform/services/dataflow/go/resource_dataflow_flex_template_job_test.go.tmpl @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/dataflow/go/resource_dataflow_job_test.go.tmpl b/mmv1/third_party/terraform/services/dataflow/go/resource_dataflow_job_test.go.tmpl index 3f041d25d374..2aa52525e655 100644 --- a/mmv1/third_party/terraform/services/dataflow/go/resource_dataflow_job_test.go.tmpl +++ b/mmv1/third_party/terraform/services/dataflow/go/resource_dataflow_job_test.go.tmpl @@ -8,8 +8,8 @@ import ( "time" "github.com/hashicorp/terraform-provider-google/google/services/dataflow" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/dataflow/resource_dataflow_flex_template_job_test.go.erb b/mmv1/third_party/terraform/services/dataflow/resource_dataflow_flex_template_job_test.go.erb index 0181f58eebc2..16b7950647df 100644 --- a/mmv1/third_party/terraform/services/dataflow/resource_dataflow_flex_template_job_test.go.erb +++ b/mmv1/third_party/terraform/services/dataflow/resource_dataflow_flex_template_job_test.go.erb @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/dataflow/resource_dataflow_job_test.go.erb b/mmv1/third_party/terraform/services/dataflow/resource_dataflow_job_test.go.erb index 88ede5ef376d..9c31218c3647 100644 --- a/mmv1/third_party/terraform/services/dataflow/resource_dataflow_job_test.go.erb +++ b/mmv1/third_party/terraform/services/dataflow/resource_dataflow_job_test.go.erb @@ -9,8 +9,8 @@ import ( "time" "github.com/hashicorp/terraform-provider-google/google/services/dataflow" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/dataform/go/resource_dataform_repository_test.go.tmpl b/mmv1/third_party/terraform/services/dataform/go/resource_dataform_repository_test.go.tmpl index 642456e8efd6..f650c90f298b 100644 --- a/mmv1/third_party/terraform/services/dataform/go/resource_dataform_repository_test.go.tmpl +++ b/mmv1/third_party/terraform/services/dataform/go/resource_dataform_repository_test.go.tmpl @@ -4,7 +4,7 @@ package dataform_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/dataform/resource_dataform_repository_test.go.erb b/mmv1/third_party/terraform/services/dataform/resource_dataform_repository_test.go.erb index 396a5703a77a..82117a6973e4 100644 --- a/mmv1/third_party/terraform/services/dataform/resource_dataform_repository_test.go.erb +++ b/mmv1/third_party/terraform/services/dataform/resource_dataform_repository_test.go.erb @@ -5,7 +5,7 @@ package dataform_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/datafusion/resource_data_fusion_instance_test.go b/mmv1/third_party/terraform/services/datafusion/resource_data_fusion_instance_test.go index b4945c8daf5e..341404a1c0b5 100644 --- a/mmv1/third_party/terraform/services/datafusion/resource_data_fusion_instance_test.go +++ b/mmv1/third_party/terraform/services/datafusion/resource_data_fusion_instance_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/datalossprevention/resource_data_loss_prevention_deidentify_template_test.go b/mmv1/third_party/terraform/services/datalossprevention/resource_data_loss_prevention_deidentify_template_test.go index 3afdbc0368da..2ee83a011f49 100644 --- a/mmv1/third_party/terraform/services/datalossprevention/resource_data_loss_prevention_deidentify_template_test.go +++ b/mmv1/third_party/terraform/services/datalossprevention/resource_data_loss_prevention_deidentify_template_test.go @@ -3,7 +3,7 @@ package datalossprevention_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/datalossprevention/resource_data_loss_prevention_discovery_config_test.go b/mmv1/third_party/terraform/services/datalossprevention/resource_data_loss_prevention_discovery_config_test.go index 6bc6523552c6..9a6ac81d901d 100644 --- a/mmv1/third_party/terraform/services/datalossprevention/resource_data_loss_prevention_discovery_config_test.go +++ b/mmv1/third_party/terraform/services/datalossprevention/resource_data_loss_prevention_discovery_config_test.go @@ -3,7 +3,7 @@ package datalossprevention_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/datalossprevention/resource_data_loss_prevention_inspect_template_test.go b/mmv1/third_party/terraform/services/datalossprevention/resource_data_loss_prevention_inspect_template_test.go index b6ae310ed256..0c2457ed138f 100644 --- a/mmv1/third_party/terraform/services/datalossprevention/resource_data_loss_prevention_inspect_template_test.go +++ b/mmv1/third_party/terraform/services/datalossprevention/resource_data_loss_prevention_inspect_template_test.go @@ -3,7 +3,7 @@ package datalossprevention_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/datalossprevention/resource_data_loss_prevention_job_trigger_test.go b/mmv1/third_party/terraform/services/datalossprevention/resource_data_loss_prevention_job_trigger_test.go index b9133a1de2bd..48ab500eebb1 100644 --- a/mmv1/third_party/terraform/services/datalossprevention/resource_data_loss_prevention_job_trigger_test.go +++ b/mmv1/third_party/terraform/services/datalossprevention/resource_data_loss_prevention_job_trigger_test.go @@ -3,7 +3,7 @@ package datalossprevention_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/datalossprevention/resource_data_loss_prevention_stored_info_type_test.go b/mmv1/third_party/terraform/services/datalossprevention/resource_data_loss_prevention_stored_info_type_test.go index 299a7957d689..2c3a557943e7 100644 --- a/mmv1/third_party/terraform/services/datalossprevention/resource_data_loss_prevention_stored_info_type_test.go +++ b/mmv1/third_party/terraform/services/datalossprevention/resource_data_loss_prevention_stored_info_type_test.go @@ -3,7 +3,7 @@ package datalossprevention_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/datapipeline/resource_datapipeline_pipeline_test.go b/mmv1/third_party/terraform/services/datapipeline/resource_datapipeline_pipeline_test.go index bfd2eaa5851e..255e76c53f5e 100644 --- a/mmv1/third_party/terraform/services/datapipeline/resource_datapipeline_pipeline_test.go +++ b/mmv1/third_party/terraform/services/datapipeline/resource_datapipeline_pipeline_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/dataplex/resource_dataplex_aspect_type_test.go b/mmv1/third_party/terraform/services/dataplex/resource_dataplex_aspect_type_test.go index 0b9a6bec84a9..a3517645a0fb 100644 --- a/mmv1/third_party/terraform/services/dataplex/resource_dataplex_aspect_type_test.go +++ b/mmv1/third_party/terraform/services/dataplex/resource_dataplex_aspect_type_test.go @@ -3,7 +3,7 @@ package dataplex_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/dataplex/resource_dataplex_entry_group_test.go b/mmv1/third_party/terraform/services/dataplex/resource_dataplex_entry_group_test.go index a00042193c97..36f01d3a6dd7 100644 --- a/mmv1/third_party/terraform/services/dataplex/resource_dataplex_entry_group_test.go +++ b/mmv1/third_party/terraform/services/dataplex/resource_dataplex_entry_group_test.go @@ -3,7 +3,7 @@ package dataplex_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/dataplex/resource_dataplex_entry_type_test.go b/mmv1/third_party/terraform/services/dataplex/resource_dataplex_entry_type_test.go index fcb98a0781fd..0b32f22a976e 100644 --- a/mmv1/third_party/terraform/services/dataplex/resource_dataplex_entry_type_test.go +++ b/mmv1/third_party/terraform/services/dataplex/resource_dataplex_entry_type_test.go @@ -3,7 +3,7 @@ package dataplex_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/dataplex/resource_dataplex_task_test.go b/mmv1/third_party/terraform/services/dataplex/resource_dataplex_task_test.go index 496d916422ec..6b1a078e8d71 100644 --- a/mmv1/third_party/terraform/services/dataplex/resource_dataplex_task_test.go +++ b/mmv1/third_party/terraform/services/dataplex/resource_dataplex_task_test.go @@ -3,7 +3,7 @@ package dataplex_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/dataproc/go/resource_dataproc_cluster_test.go b/mmv1/third_party/terraform/services/dataproc/go/resource_dataproc_cluster_test.go index 0be63ab32fb5..c2adfcf57795 100644 --- a/mmv1/third_party/terraform/services/dataproc/go/resource_dataproc_cluster_test.go +++ b/mmv1/third_party/terraform/services/dataproc/go/resource_dataproc_cluster_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" @@ -28,7 +28,7 @@ func TestAccDataprocCluster_missingZoneGlobalRegion1(t *testing.T) { rnd := acctest.RandString(t, 10) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { @@ -44,7 +44,7 @@ func TestAccDataprocCluster_missingZoneGlobalRegion2(t *testing.T) { rnd := acctest.RandString(t, 10) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { @@ -557,7 +557,6 @@ func TestAccDataprocCluster_spotWithAuxiliaryNodeGroups(t *testing.T) { resource.TestCheckResourceAttr("google_dataproc_cluster.with_auxiliary_node_groups", "cluster_config.0.auxiliary_node_groups.0.node_group.0.node_group_config.0.accelerators.0.accelerator_count", "1"), resource.TestCheckResourceAttr("google_dataproc_cluster.with_auxiliary_node_groups", "cluster_config.0.auxiliary_node_groups.0.node_group_id", "node-group-id"), testAccCheckDataprocAuxiliaryNodeGroupAccelerator(&cluster, project), - ), }, }, @@ -705,7 +704,7 @@ func TestAccDataprocCluster_withServiceAcc(t *testing.T) { ExternalProviders: map[string]resource.ExternalProvider{ "time": {}, }, - CheckDestroy: testAccCheckDataprocClusterDestroy(t), + CheckDestroy: testAccCheckDataprocClusterDestroy(t), Steps: []resource.TestStep{ { Config: testAccDataprocCluster_withServiceAcc(sa, rnd, subnetworkName), @@ -825,13 +824,13 @@ func TestAccDataprocCluster_withLifecycleConfigAutoDeletion(t *testing.T) { CheckDestroy: testAccCheckDataprocClusterDestroy(t), Steps: []resource.TestStep{ { - Config: testAccDataprocCluster_withLifecycleConfigAutoDeletionTime(rnd, now.Add(time.Hour * 10).Format(fmtString), subnetworkName), + Config: testAccDataprocCluster_withLifecycleConfigAutoDeletionTime(rnd, now.Add(time.Hour*10).Format(fmtString), subnetworkName), Check: resource.ComposeTestCheckFunc( testAccCheckDataprocClusterExists(t, "google_dataproc_cluster.with_lifecycle_config", &cluster), ), }, { - Config: testAccDataprocCluster_withLifecycleConfigAutoDeletionTime(rnd, now.Add(time.Hour * 20).Format(fmtString), subnetworkName), + Config: testAccDataprocCluster_withLifecycleConfigAutoDeletionTime(rnd, now.Add(time.Hour*20).Format(fmtString), subnetworkName), Check: resource.ComposeTestCheckFunc( testAccCheckDataprocClusterExists(t, "google_dataproc_cluster.with_lifecycle_config", &cluster), ), @@ -1044,7 +1043,7 @@ func TestAccDataprocCluster_withMetastoreConfig(t *testing.T) { updateServiceId := "tf-test-metastore-srv-update-" + acctest.RandString(t, 10) msName_basic := fmt.Sprintf("projects/%s/locations/us-central1/services/%s", pid, basicServiceId) msName_update := fmt.Sprintf("projects/%s/locations/us-central1/services/%s", pid, updateServiceId) - + var cluster dataproc.Cluster clusterName := "tf-test-" + acctest.RandString(t, 10) acctest.VcrTest(t, resource.TestCase{ @@ -1056,8 +1055,7 @@ func TestAccDataprocCluster_withMetastoreConfig(t *testing.T) { Config: testAccDataprocCluster_withMetastoreConfig(clusterName, basicServiceId), Check: resource.ComposeTestCheckFunc( testAccCheckDataprocClusterExists(t, "google_dataproc_cluster.with_metastore_config", &cluster), - resource.TestCheckResourceAttr("google_dataproc_cluster.with_metastore_config", "cluster_config.0.metastore_config.0.dataproc_metastore_service",msName_basic), - + resource.TestCheckResourceAttr("google_dataproc_cluster.with_metastore_config", "cluster_config.0.metastore_config.0.dataproc_metastore_service", msName_basic), ), }, { @@ -1065,7 +1063,6 @@ func TestAccDataprocCluster_withMetastoreConfig(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckDataprocClusterExists(t, "google_dataproc_cluster.with_metastore_config", &cluster), resource.TestCheckResourceAttr("google_dataproc_cluster.with_metastore_config", "cluster_config.0.metastore_config.0.dataproc_metastore_service", msName_update), - ), }, }, @@ -2558,4 +2555,3 @@ resource "google_dataproc_metastore_service" "ms" { } `, clusterName, serviceId) } - diff --git a/mmv1/third_party/terraform/services/dataproc/go/resource_dataproc_job_test.go.tmpl b/mmv1/third_party/terraform/services/dataproc/go/resource_dataproc_job_test.go.tmpl index 1aba35f13a6d..afb392cf6ec2 100644 --- a/mmv1/third_party/terraform/services/dataproc/go/resource_dataproc_job_test.go.tmpl +++ b/mmv1/third_party/terraform/services/dataproc/go/resource_dataproc_job_test.go.tmpl @@ -12,8 +12,8 @@ import ( // "regexp" "github.com/hashicorp/errwrap" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" tpgdataproc "github.com/hashicorp/terraform-provider-google/google/services/dataproc" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/dataproc/go/resource_dataproc_workflow_template_test.go.tmpl b/mmv1/third_party/terraform/services/dataproc/go/resource_dataproc_workflow_template_test.go.tmpl index b27ed8ac03ed..b6ea0fa6e3b8 100644 --- a/mmv1/third_party/terraform/services/dataproc/go/resource_dataproc_workflow_template_test.go.tmpl +++ b/mmv1/third_party/terraform/services/dataproc/go/resource_dataproc_workflow_template_test.go.tmpl @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/dataproc/iam_dataproc_cluster_test.go b/mmv1/third_party/terraform/services/dataproc/iam_dataproc_cluster_test.go index cf15994b4001..91df938b4003 100644 --- a/mmv1/third_party/terraform/services/dataproc/iam_dataproc_cluster_test.go +++ b/mmv1/third_party/terraform/services/dataproc/iam_dataproc_cluster_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/dataproc/iam_dataproc_job_test.go b/mmv1/third_party/terraform/services/dataproc/iam_dataproc_job_test.go index 99fe3cb701b7..bd4ab1f4cd9f 100644 --- a/mmv1/third_party/terraform/services/dataproc/iam_dataproc_job_test.go +++ b/mmv1/third_party/terraform/services/dataproc/iam_dataproc_job_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_test.go.erb b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_test.go.erb index 90a37c3108a3..9719ddf48c12 100644 --- a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_test.go.erb +++ b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_test.go.erb @@ -11,8 +11,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_upgrade_test.go b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_upgrade_test.go index bc8b96ac1023..307a078facdf 100644 --- a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_upgrade_test.go +++ b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_upgrade_test.go @@ -3,7 +3,7 @@ package dataproc_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "google.golang.org/api/dataproc/v1" diff --git a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_job_test.go.erb b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_job_test.go.erb index 07d166d4e637..2862f4184c1a 100644 --- a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_job_test.go.erb +++ b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_job_test.go.erb @@ -13,8 +13,8 @@ import ( // "regexp" "github.com/hashicorp/errwrap" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" tpgdataproc "github.com/hashicorp/terraform-provider-google/google/services/dataproc" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_workflow_template_test.go.erb b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_workflow_template_test.go.erb index 21988d0cb673..32f6e259f73b 100644 --- a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_workflow_template_test.go.erb +++ b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_workflow_template_test.go.erb @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/dataprocmetastore/data_source_dataproc_metastore_service_test.go.erb b/mmv1/third_party/terraform/services/dataprocmetastore/data_source_dataproc_metastore_service_test.go.erb index bb8ef1bcabdc..aa198e2e7e65 100644 --- a/mmv1/third_party/terraform/services/dataprocmetastore/data_source_dataproc_metastore_service_test.go.erb +++ b/mmv1/third_party/terraform/services/dataprocmetastore/data_source_dataproc_metastore_service_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataprocMetastoreServiceDatasource_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/dataprocmetastore/go/data_source_dataproc_metastore_service_test.go b/mmv1/third_party/terraform/services/dataprocmetastore/go/data_source_dataproc_metastore_service_test.go index 997e5668961a..04109d7f2c73 100644 --- a/mmv1/third_party/terraform/services/dataprocmetastore/go/data_source_dataproc_metastore_service_test.go +++ b/mmv1/third_party/terraform/services/dataprocmetastore/go/data_source_dataproc_metastore_service_test.go @@ -2,10 +2,10 @@ package dataprocmetastore_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataprocMetastoreServiceDatasource_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/dataprocmetastore/go/resource_dataproc_metastore_service_test.go b/mmv1/third_party/terraform/services/dataprocmetastore/go/resource_dataproc_metastore_service_test.go index 2705fad537a9..4979c2114595 100644 --- a/mmv1/third_party/terraform/services/dataprocmetastore/go/resource_dataproc_metastore_service_test.go +++ b/mmv1/third_party/terraform/services/dataprocmetastore/go/resource_dataproc_metastore_service_test.go @@ -2,10 +2,10 @@ package dataprocmetastore_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataprocMetastoreService_updateAndImport(t *testing.T) { @@ -166,4 +166,4 @@ resource "google_storage_bucket" "bucket" { location = "us-central1" } `, context) -} \ No newline at end of file +} diff --git a/mmv1/third_party/terraform/services/dataprocmetastore/resource_dataproc_metastore_service_test.go.erb b/mmv1/third_party/terraform/services/dataprocmetastore/resource_dataproc_metastore_service_test.go.erb index 3d4460202d8c..6ce98ad236b7 100644 --- a/mmv1/third_party/terraform/services/dataprocmetastore/resource_dataproc_metastore_service_test.go.erb +++ b/mmv1/third_party/terraform/services/dataprocmetastore/resource_dataproc_metastore_service_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataprocMetastoreService_updateAndImport(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/datastream/data_source_google_datastream_static_ips_test.go b/mmv1/third_party/terraform/services/datastream/data_source_google_datastream_static_ips_test.go index a583f340d2f1..67e78532503d 100644 --- a/mmv1/third_party/terraform/services/datastream/data_source_google_datastream_static_ips_test.go +++ b/mmv1/third_party/terraform/services/datastream/data_source_google_datastream_static_ips_test.go @@ -4,7 +4,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/datastream/resource_datastream_connection_profile_test.go b/mmv1/third_party/terraform/services/datastream/resource_datastream_connection_profile_test.go index 20cca580af29..20d4c925ab1d 100644 --- a/mmv1/third_party/terraform/services/datastream/resource_datastream_connection_profile_test.go +++ b/mmv1/third_party/terraform/services/datastream/resource_datastream_connection_profile_test.go @@ -3,7 +3,7 @@ package datastream_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/datastream/resource_datastream_stream_test.go b/mmv1/third_party/terraform/services/datastream/resource_datastream_stream_test.go index 528079c9fca2..c90c0270ede2 100644 --- a/mmv1/third_party/terraform/services/datastream/resource_datastream_stream_test.go +++ b/mmv1/third_party/terraform/services/datastream/resource_datastream_stream_test.go @@ -3,7 +3,7 @@ package datastream_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/deploymentmanager/resource_deployment_manager_deployment_test.go b/mmv1/third_party/terraform/services/deploymentmanager/resource_deployment_manager_deployment_test.go index 46186eb77978..2b058916bc0c 100644 --- a/mmv1/third_party/terraform/services/deploymentmanager/resource_deployment_manager_deployment_test.go +++ b/mmv1/third_party/terraform/services/deploymentmanager/resource_deployment_manager_deployment_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_agent_test.go b/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_agent_test.go index b8ca477176d9..edc063c2e9ee 100644 --- a/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_agent_test.go +++ b/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_agent_test.go @@ -3,9 +3,9 @@ package dialogflow_test import ( "testing" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) func TestAccDialogflowAgent_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_entity_type_test.go b/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_entity_type_test.go index 859bcde89a29..373894d57561 100644 --- a/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_entity_type_test.go +++ b/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_entity_type_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDialogflowEntityType_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_fulfillment_test.go b/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_fulfillment_test.go index 63e3b009b224..3d96bd347040 100644 --- a/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_fulfillment_test.go +++ b/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_fulfillment_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDialogflowFulfillment_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_intent_test.go b/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_intent_test.go index 50f4fa033d8b..f9d1339ab953 100644 --- a/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_intent_test.go +++ b/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_intent_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDialogflowIntent_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_agent_test.go.erb b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_agent_test.go.erb index ca6a3cbedf58..f6cbb50c55c1 100644 --- a/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_agent_test.go.erb +++ b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_agent_test.go.erb @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDialogflowAgent_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_entity_type_test.go.erb b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_entity_type_test.go.erb index 3c8a77a9ea1b..11075e4ebd06 100644 --- a/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_entity_type_test.go.erb +++ b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_entity_type_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDialogflowEntityType_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_fulfillment_test.go.erb b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_fulfillment_test.go.erb index c1c896bdac54..7107116736da 100644 --- a/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_fulfillment_test.go.erb +++ b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_fulfillment_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDialogflowFulfillment_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_intent_test.go.erb b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_intent_test.go.erb index 48ffbf858d09..417285949bf6 100644 --- a/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_intent_test.go.erb +++ b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_intent_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDialogflowIntent_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/dialogflowcx/go/resource_dialogflowcx_agent_test.go b/mmv1/third_party/terraform/services/dialogflowcx/go/resource_dialogflowcx_agent_test.go index d3b757abfd6f..d6d7f1b16f17 100644 --- a/mmv1/third_party/terraform/services/dialogflowcx/go/resource_dialogflowcx_agent_test.go +++ b/mmv1/third_party/terraform/services/dialogflowcx/go/resource_dialogflowcx_agent_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDialogflowCXAgent_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflow_cx_security_settings_test.go b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflow_cx_security_settings_test.go index ed1fddcbf668..e8aa3661a17d 100644 --- a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflow_cx_security_settings_test.go +++ b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflow_cx_security_settings_test.go @@ -3,7 +3,7 @@ package dialogflowcx_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflow_cx_test_case_test.go b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflow_cx_test_case_test.go index 407bd10bf5b3..5f76f8bf2670 100644 --- a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflow_cx_test_case_test.go +++ b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflow_cx_test_case_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDialogflowCXTestCase_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_agent_test.go.erb b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_agent_test.go.erb index d93367bf0105..aa663adbe459 100644 --- a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_agent_test.go.erb +++ b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_agent_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDialogflowCXAgent_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_entity_type_test.go b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_entity_type_test.go index 282255ae543f..cd48f8ca6e92 100644 --- a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_entity_type_test.go +++ b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_entity_type_test.go @@ -3,7 +3,7 @@ package dialogflowcx_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_environment_test.go b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_environment_test.go index db53c55bf10b..d7b2f2fdf6af 100644 --- a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_environment_test.go +++ b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_environment_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDialogflowCXEnvironment_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_flow_test.go b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_flow_test.go index 3b75c3ae1d56..e4a7b516aa15 100644 --- a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_flow_test.go +++ b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_flow_test.go @@ -3,7 +3,7 @@ package dialogflowcx_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_intent_test.go b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_intent_test.go index 7d073bc64883..0ac876819db3 100644 --- a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_intent_test.go +++ b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_intent_test.go @@ -3,7 +3,7 @@ package dialogflowcx_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_page_test.go b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_page_test.go index ed35567a0aca..8de7e9b3af91 100644 --- a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_page_test.go +++ b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_page_test.go @@ -3,7 +3,7 @@ package dialogflowcx_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_version_test.go b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_version_test.go index b254e970544c..f16edf0b400c 100644 --- a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_version_test.go +++ b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_version_test.go @@ -3,7 +3,7 @@ package dialogflowcx_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_webhook_test.go b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_webhook_test.go index fbe187309990..e27412ab1921 100644 --- a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_webhook_test.go +++ b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_webhook_test.go @@ -3,7 +3,7 @@ package dialogflowcx_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/discoveryengine/resource_discovery_engine_chat_engine_test.go b/mmv1/third_party/terraform/services/discoveryengine/resource_discovery_engine_chat_engine_test.go index bed2b5218e08..06e48be432f8 100644 --- a/mmv1/third_party/terraform/services/discoveryengine/resource_discovery_engine_chat_engine_test.go +++ b/mmv1/third_party/terraform/services/discoveryengine/resource_discovery_engine_chat_engine_test.go @@ -1,7 +1,7 @@ package discoveryengine_test import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "testing" ) diff --git a/mmv1/third_party/terraform/services/discoveryengine/resource_discovery_engine_data_store_test.go b/mmv1/third_party/terraform/services/discoveryengine/resource_discovery_engine_data_store_test.go index fc324b9f601d..ada247b54239 100644 --- a/mmv1/third_party/terraform/services/discoveryengine/resource_discovery_engine_data_store_test.go +++ b/mmv1/third_party/terraform/services/discoveryengine/resource_discovery_engine_data_store_test.go @@ -1,7 +1,7 @@ package discoveryengine_test import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "testing" ) diff --git a/mmv1/third_party/terraform/services/discoveryengine/resource_discovery_engine_search_engine_test.go b/mmv1/third_party/terraform/services/discoveryengine/resource_discovery_engine_search_engine_test.go index 665032591394..896e924ee2d1 100644 --- a/mmv1/third_party/terraform/services/discoveryengine/resource_discovery_engine_search_engine_test.go +++ b/mmv1/third_party/terraform/services/discoveryengine/resource_discovery_engine_search_engine_test.go @@ -1,7 +1,7 @@ package discoveryengine_test import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "testing" ) diff --git a/mmv1/third_party/terraform/services/dns/data_source_dns_key_test.go.erb b/mmv1/third_party/terraform/services/dns/data_source_dns_key_test.go.erb index 0c4bff267adf..63b5190d352a 100644 --- a/mmv1/third_party/terraform/services/dns/data_source_dns_key_test.go.erb +++ b/mmv1/third_party/terraform/services/dns/data_source_dns_key_test.go.erb @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/dns/data_source_dns_managed_zone_test.go.erb b/mmv1/third_party/terraform/services/dns/data_source_dns_managed_zone_test.go.erb index 3acab8ff3e5e..ad72415ca0ae 100644 --- a/mmv1/third_party/terraform/services/dns/data_source_dns_managed_zone_test.go.erb +++ b/mmv1/third_party/terraform/services/dns/data_source_dns_managed_zone_test.go.erb @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/dns/data_source_dns_managed_zones_test.go b/mmv1/third_party/terraform/services/dns/data_source_dns_managed_zones_test.go index ceed527ebe25..a4d22002ad98 100644 --- a/mmv1/third_party/terraform/services/dns/data_source_dns_managed_zones_test.go +++ b/mmv1/third_party/terraform/services/dns/data_source_dns_managed_zones_test.go @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/dns/data_source_dns_record_set_test.go.erb b/mmv1/third_party/terraform/services/dns/data_source_dns_record_set_test.go.erb index d75db91ed70b..ec22987afca3 100644 --- a/mmv1/third_party/terraform/services/dns/data_source_dns_record_set_test.go.erb +++ b/mmv1/third_party/terraform/services/dns/data_source_dns_record_set_test.go.erb @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/dns/go/data_source_dns_key_test.go b/mmv1/third_party/terraform/services/dns/go/data_source_dns_key_test.go index d05066a2f7bb..eb6c37bad539 100644 --- a/mmv1/third_party/terraform/services/dns/go/data_source_dns_key_test.go +++ b/mmv1/third_party/terraform/services/dns/go/data_source_dns_key_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) @@ -33,7 +33,6 @@ func TestAccDataSourceDNSKeys_basic(t *testing.T) { }) } - func TestAccDataSourceDNSKeys_noDnsSec(t *testing.T) { t.Parallel() diff --git a/mmv1/third_party/terraform/services/dns/go/data_source_dns_managed_zone_test.go.tmpl b/mmv1/third_party/terraform/services/dns/go/data_source_dns_managed_zone_test.go.tmpl index f3b7ed151874..44e368ae5e83 100644 --- a/mmv1/third_party/terraform/services/dns/go/data_source_dns_managed_zone_test.go.tmpl +++ b/mmv1/third_party/terraform/services/dns/go/data_source_dns_managed_zone_test.go.tmpl @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/dns/go/data_source_dns_record_set_test.go b/mmv1/third_party/terraform/services/dns/go/data_source_dns_record_set_test.go index 1169033b5cd1..795e8dcd2f65 100644 --- a/mmv1/third_party/terraform/services/dns/go/data_source_dns_record_set_test.go +++ b/mmv1/third_party/terraform/services/dns/go/data_source_dns_record_set_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/dns/go/resource_dns_managed_zone_test.go.tmpl b/mmv1/third_party/terraform/services/dns/go/resource_dns_managed_zone_test.go.tmpl index d95ab34faaad..73f97903ba79 100644 --- a/mmv1/third_party/terraform/services/dns/go/resource_dns_managed_zone_test.go.tmpl +++ b/mmv1/third_party/terraform/services/dns/go/resource_dns_managed_zone_test.go.tmpl @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/dns/v1" ) diff --git a/mmv1/third_party/terraform/services/dns/go/resource_dns_policy_test.go b/mmv1/third_party/terraform/services/dns/go/resource_dns_policy_test.go index 69bde4cb51d9..5e4ea9ad6249 100644 --- a/mmv1/third_party/terraform/services/dns/go/resource_dns_policy_test.go +++ b/mmv1/third_party/terraform/services/dns/go/resource_dns_policy_test.go @@ -2,10 +2,10 @@ package dns_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDNSPolicy_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/dns/go/resource_dns_record_set_test.go.tmpl b/mmv1/third_party/terraform/services/dns/go/resource_dns_record_set_test.go.tmpl index d3621e9b8bb3..69fee4e86421 100644 --- a/mmv1/third_party/terraform/services/dns/go/resource_dns_record_set_test.go.tmpl +++ b/mmv1/third_party/terraform/services/dns/go/resource_dns_record_set_test.go.tmpl @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/dns/go/resource_dns_response_policy_rule_test.go.tmpl b/mmv1/third_party/terraform/services/dns/go/resource_dns_response_policy_rule_test.go.tmpl index b7d29eaebc6c..b4cdf5492903 100644 --- a/mmv1/third_party/terraform/services/dns/go/resource_dns_response_policy_rule_test.go.tmpl +++ b/mmv1/third_party/terraform/services/dns/go/resource_dns_response_policy_rule_test.go.tmpl @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/dns/go/resource_dns_response_policy_test.go.tmpl b/mmv1/third_party/terraform/services/dns/go/resource_dns_response_policy_test.go.tmpl index 26959c441a7f..bd8ebc00dbf0 100644 --- a/mmv1/third_party/terraform/services/dns/go/resource_dns_response_policy_test.go.tmpl +++ b/mmv1/third_party/terraform/services/dns/go/resource_dns_response_policy_test.go.tmpl @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/dns/resource_dns_managed_zone_test.go.erb b/mmv1/third_party/terraform/services/dns/resource_dns_managed_zone_test.go.erb index 9bf41938da95..8be7c7853a19 100644 --- a/mmv1/third_party/terraform/services/dns/resource_dns_managed_zone_test.go.erb +++ b/mmv1/third_party/terraform/services/dns/resource_dns_managed_zone_test.go.erb @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/dns/v1" ) diff --git a/mmv1/third_party/terraform/services/dns/resource_dns_policy_test.go.erb b/mmv1/third_party/terraform/services/dns/resource_dns_policy_test.go.erb index fe4f51451333..f371480e39e8 100644 --- a/mmv1/third_party/terraform/services/dns/resource_dns_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/dns/resource_dns_policy_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDNSPolicy_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/dns/resource_dns_record_set_test.go.erb b/mmv1/third_party/terraform/services/dns/resource_dns_record_set_test.go.erb index 51fd7c52cb64..6ee56d126b6a 100644 --- a/mmv1/third_party/terraform/services/dns/resource_dns_record_set_test.go.erb +++ b/mmv1/third_party/terraform/services/dns/resource_dns_record_set_test.go.erb @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/dns/resource_dns_response_policy_rule_test.go.erb b/mmv1/third_party/terraform/services/dns/resource_dns_response_policy_rule_test.go.erb index be2387214533..e0581777ae49 100644 --- a/mmv1/third_party/terraform/services/dns/resource_dns_response_policy_rule_test.go.erb +++ b/mmv1/third_party/terraform/services/dns/resource_dns_response_policy_rule_test.go.erb @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/dns/resource_dns_response_policy_test.go.erb b/mmv1/third_party/terraform/services/dns/resource_dns_response_policy_test.go.erb index 8d89b291831a..52b1e87443d4 100644 --- a/mmv1/third_party/terraform/services/dns/resource_dns_response_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/dns/resource_dns_response_policy_test.go.erb @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/documentaiwarehouse/resource_document_ai_warehouse_document_schema_test.go b/mmv1/third_party/terraform/services/documentaiwarehouse/resource_document_ai_warehouse_document_schema_test.go index 2087d6cbdfd3..d84978da525b 100644 --- a/mmv1/third_party/terraform/services/documentaiwarehouse/resource_document_ai_warehouse_document_schema_test.go +++ b/mmv1/third_party/terraform/services/documentaiwarehouse/resource_document_ai_warehouse_document_schema_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/essentialcontacts/resource_essential_contacts_contact_test.go b/mmv1/third_party/terraform/services/essentialcontacts/resource_essential_contacts_contact_test.go index 2b6682beedc5..f31311dabf9b 100644 --- a/mmv1/third_party/terraform/services/essentialcontacts/resource_essential_contacts_contact_test.go +++ b/mmv1/third_party/terraform/services/essentialcontacts/resource_essential_contacts_contact_test.go @@ -3,7 +3,7 @@ package essentialcontacts_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/eventarc/go/resource_eventarc_channel_test.go.tmpl b/mmv1/third_party/terraform/services/eventarc/go/resource_eventarc_channel_test.go.tmpl index 4c518290aebc..ed48d433386f 100644 --- a/mmv1/third_party/terraform/services/eventarc/go/resource_eventarc_channel_test.go.tmpl +++ b/mmv1/third_party/terraform/services/eventarc/go/resource_eventarc_channel_test.go.tmpl @@ -12,8 +12,8 @@ import ( dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" eventarc "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/eventarc{{ $.DCLVersion }}" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/eventarc/go/resource_eventarc_google_channel_config_test.go.tmpl b/mmv1/third_party/terraform/services/eventarc/go/resource_eventarc_google_channel_config_test.go.tmpl index dbe556619332..3ea0cbdd6502 100644 --- a/mmv1/third_party/terraform/services/eventarc/go/resource_eventarc_google_channel_config_test.go.tmpl +++ b/mmv1/third_party/terraform/services/eventarc/go/resource_eventarc_google_channel_config_test.go.tmpl @@ -12,8 +12,8 @@ import ( dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" eventarc "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/eventarc{{ $.DCLVersion }}" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) @@ -203,4 +203,4 @@ func testAccCheckEventarcGoogleChannelConfigDestroyProducer(t *testing.T) func(s } return nil } -} \ No newline at end of file +} diff --git a/mmv1/third_party/terraform/services/eventarc/go/resource_eventarc_trigger_test.go.tmpl b/mmv1/third_party/terraform/services/eventarc/go/resource_eventarc_trigger_test.go.tmpl index 7d358bd5739f..64cf3c30ba13 100644 --- a/mmv1/third_party/terraform/services/eventarc/go/resource_eventarc_trigger_test.go.tmpl +++ b/mmv1/third_party/terraform/services/eventarc/go/resource_eventarc_trigger_test.go.tmpl @@ -12,12 +12,11 @@ import ( dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" eventarc "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/eventarc{{ $.DCLVersion }}" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) - func TestAccEventarcTrigger_channel(t *testing.T) { t.Parallel() @@ -56,8 +55,8 @@ func TestAccEventarcTrigger_HttpDest(t *testing.T) { t.Parallel() region := envvar.GetTestRegionFromEnv() - - testNetworkName := acctest.BootstrapSharedTestNetwork(t, "attachment-network") + + testNetworkName := acctest.BootstrapSharedTestNetwork(t, "attachment-network") subnetName := acctest.BootstrapSubnet(t, "tf-test-subnet", testNetworkName) networkAttachmentName := acctest.BootstrapNetworkAttachment(t, "tf-test-attachment", subnetName) @@ -65,11 +64,11 @@ func TestAccEventarcTrigger_HttpDest(t *testing.T) { fullFormNetworkAttachmentName := fmt.Sprintf("projects/%s/regions/%s/networkAttachments/%s", envvar.GetTestProjectFromEnv(), envvar.GetTestRegionFromEnv(), networkAttachmentName) context := map[string]interface{}{ - "region": region, - "project_name": envvar.GetTestProjectFromEnv(), - "service_account": envvar.GetTestServiceAccountFromEnv(t), - "network_attachment": fullFormNetworkAttachmentName, - "random_suffix": acctest.RandString(t, 10), + "region": region, + "project_name": envvar.GetTestProjectFromEnv(), + "service_account": envvar.GetTestServiceAccountFromEnv(t), + "network_attachment": fullFormNetworkAttachmentName, + "random_suffix": acctest.RandString(t, 10), } acctest.VcrTest(t, resource.TestCase{ diff --git a/mmv1/third_party/terraform/services/eventarc/resource_eventarc_channel_test.go.erb b/mmv1/third_party/terraform/services/eventarc/resource_eventarc_channel_test.go.erb index 31505af90399..43452e15cc4b 100644 --- a/mmv1/third_party/terraform/services/eventarc/resource_eventarc_channel_test.go.erb +++ b/mmv1/third_party/terraform/services/eventarc/resource_eventarc_channel_test.go.erb @@ -13,8 +13,8 @@ import ( dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" eventarc "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/eventarc<%= dcl_version(version) -%>" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/eventarc/resource_eventarc_google_channel_config_test.go.erb b/mmv1/third_party/terraform/services/eventarc/resource_eventarc_google_channel_config_test.go.erb index 1ca3f617e3f0..76e20822236e 100644 --- a/mmv1/third_party/terraform/services/eventarc/resource_eventarc_google_channel_config_test.go.erb +++ b/mmv1/third_party/terraform/services/eventarc/resource_eventarc_google_channel_config_test.go.erb @@ -13,8 +13,8 @@ import ( dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" eventarc "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/eventarc<%= dcl_version(version) -%>" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/eventarc/resource_eventarc_trigger_test.go.erb b/mmv1/third_party/terraform/services/eventarc/resource_eventarc_trigger_test.go.erb index f775bc7795f8..3400a61bdf53 100644 --- a/mmv1/third_party/terraform/services/eventarc/resource_eventarc_trigger_test.go.erb +++ b/mmv1/third_party/terraform/services/eventarc/resource_eventarc_trigger_test.go.erb @@ -13,8 +13,8 @@ import ( dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" eventarc "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/eventarc<%= dcl_version(version) -%>" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/filestore/data_source_filestore_instance_test.go b/mmv1/third_party/terraform/services/filestore/data_source_filestore_instance_test.go index 659368d0660c..01d46734e230 100644 --- a/mmv1/third_party/terraform/services/filestore/data_source_filestore_instance_test.go +++ b/mmv1/third_party/terraform/services/filestore/data_source_filestore_instance_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/filestore/resource_filestore_backup_test.go b/mmv1/third_party/terraform/services/filestore/resource_filestore_backup_test.go index 768b61b89f8f..a792c7969ed5 100644 --- a/mmv1/third_party/terraform/services/filestore/resource_filestore_backup_test.go +++ b/mmv1/third_party/terraform/services/filestore/resource_filestore_backup_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/filestore/resource_filestore_instance_test.go b/mmv1/third_party/terraform/services/filestore/resource_filestore_instance_test.go index 6f52889d72ae..b10181b969a7 100644 --- a/mmv1/third_party/terraform/services/filestore/resource_filestore_instance_test.go +++ b/mmv1/third_party/terraform/services/filestore/resource_filestore_instance_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/filestore" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func testResourceFilestoreInstanceStateDataV0() map[string]interface{} { diff --git a/mmv1/third_party/terraform/services/filestore/resource_filestore_restore_test.go b/mmv1/third_party/terraform/services/filestore/resource_filestore_restore_test.go index 24cfacc79046..ecf34eb14015 100644 --- a/mmv1/third_party/terraform/services/filestore/resource_filestore_restore_test.go +++ b/mmv1/third_party/terraform/services/filestore/resource_filestore_restore_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_android_app_config_test.go.erb b/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_android_app_config_test.go.erb index bf0fb75f6a73..c9ff3ed6e36e 100644 --- a/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_android_app_config_test.go.erb +++ b/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_android_app_config_test.go.erb @@ -6,8 +6,8 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDataSourceGoogleFirebaseAndroidAppConfig(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_android_app_test.go.erb b/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_android_app_test.go.erb index c85ece343fa2..e9060e0f6b04 100644 --- a/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_android_app_test.go.erb +++ b/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_android_app_test.go.erb @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceGoogleFirebaseAndroidApp(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_apple_app_config_test.go.erb b/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_apple_app_config_test.go.erb index 4ee3f56d5f8e..17b8666a20ab 100644 --- a/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_apple_app_config_test.go.erb +++ b/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_apple_app_config_test.go.erb @@ -6,8 +6,8 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDataSourceGoogleFirebaseAppleAppConfig(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_apple_app_test.go.erb b/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_apple_app_test.go.erb index 983ab87dd532..7085474829b8 100644 --- a/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_apple_app_test.go.erb +++ b/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_apple_app_test.go.erb @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceGoogleFirebaseAppleApp(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_web_app_test.go.erb b/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_web_app_test.go.erb index 2314f6bd26c1..ed5a538dcde5 100644 --- a/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_web_app_test.go.erb +++ b/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_web_app_test.go.erb @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceGoogleFirebaseWebApp(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebase/go/data_source_google_firebase_android_app_config_test.go.tmpl b/mmv1/third_party/terraform/services/firebase/go/data_source_google_firebase_android_app_config_test.go.tmpl index 722c12cf6514..faac22d6d3b7 100644 --- a/mmv1/third_party/terraform/services/firebase/go/data_source_google_firebase_android_app_config_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebase/go/data_source_google_firebase_android_app_config_test.go.tmpl @@ -5,8 +5,8 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDataSourceGoogleFirebaseAndroidAppConfig(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebase/go/data_source_google_firebase_android_app_test.go.tmpl b/mmv1/third_party/terraform/services/firebase/go/data_source_google_firebase_android_app_test.go.tmpl index d39e384354d1..b1bcb48a93cf 100644 --- a/mmv1/third_party/terraform/services/firebase/go/data_source_google_firebase_android_app_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebase/go/data_source_google_firebase_android_app_test.go.tmpl @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceGoogleFirebaseAndroidApp(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebase/go/data_source_google_firebase_apple_app_config_test.go.tmpl b/mmv1/third_party/terraform/services/firebase/go/data_source_google_firebase_apple_app_config_test.go.tmpl index 69b52667f13b..c71113abac3e 100644 --- a/mmv1/third_party/terraform/services/firebase/go/data_source_google_firebase_apple_app_config_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebase/go/data_source_google_firebase_apple_app_config_test.go.tmpl @@ -5,8 +5,8 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDataSourceGoogleFirebaseAppleAppConfig(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebase/go/data_source_google_firebase_apple_app_test.go.tmpl b/mmv1/third_party/terraform/services/firebase/go/data_source_google_firebase_apple_app_test.go.tmpl index c7eef1095932..6f1c83fa7376 100644 --- a/mmv1/third_party/terraform/services/firebase/go/data_source_google_firebase_apple_app_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebase/go/data_source_google_firebase_apple_app_test.go.tmpl @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceGoogleFirebaseAppleApp(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebase/go/data_source_google_firebase_web_app_test.go.tmpl b/mmv1/third_party/terraform/services/firebase/go/data_source_google_firebase_web_app_test.go.tmpl index 19be22fac1df..3669bfbb199f 100644 --- a/mmv1/third_party/terraform/services/firebase/go/data_source_google_firebase_web_app_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebase/go/data_source_google_firebase_web_app_test.go.tmpl @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceGoogleFirebaseWebApp(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebase/go/resource_firebase_android_app_update_test.go.tmpl b/mmv1/third_party/terraform/services/firebase/go/resource_firebase_android_app_update_test.go.tmpl index 170445fc6f4f..34a17d2e91ea 100644 --- a/mmv1/third_party/terraform/services/firebase/go/resource_firebase_android_app_update_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebase/go/resource_firebase_android_app_update_test.go.tmpl @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccFirebaseAndroidApp_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebase/go/resource_firebase_apple_app_update_test.go.tmpl b/mmv1/third_party/terraform/services/firebase/go/resource_firebase_apple_app_update_test.go.tmpl index 0dc1f4d4afdc..23af2fd581f2 100644 --- a/mmv1/third_party/terraform/services/firebase/go/resource_firebase_apple_app_update_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebase/go/resource_firebase_apple_app_update_test.go.tmpl @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccFirebaseAppleApp_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebase/go/resource_firebase_project_test.go.tmpl b/mmv1/third_party/terraform/services/firebase/go/resource_firebase_project_test.go.tmpl index e73d9ff08d5b..a5f1b25fd928 100644 --- a/mmv1/third_party/terraform/services/firebase/go/resource_firebase_project_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebase/go/resource_firebase_project_test.go.tmpl @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccFirebaseProject_destroyAndReapply(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebase/go/resource_firebase_web_app_test.go.tmpl b/mmv1/third_party/terraform/services/firebase/go/resource_firebase_web_app_test.go.tmpl index ad9c9fd4bdc9..86b26599fa69 100644 --- a/mmv1/third_party/terraform/services/firebase/go/resource_firebase_web_app_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebase/go/resource_firebase_web_app_test.go.tmpl @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/firebase/resource_firebase_android_app_update_test.go.erb b/mmv1/third_party/terraform/services/firebase/resource_firebase_android_app_update_test.go.erb index a3b847ec2ef0..741b017eeadf 100644 --- a/mmv1/third_party/terraform/services/firebase/resource_firebase_android_app_update_test.go.erb +++ b/mmv1/third_party/terraform/services/firebase/resource_firebase_android_app_update_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccFirebaseAndroidApp_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebase/resource_firebase_apple_app_update_test.go.erb b/mmv1/third_party/terraform/services/firebase/resource_firebase_apple_app_update_test.go.erb index 2ebc444ea54c..6789659146d4 100644 --- a/mmv1/third_party/terraform/services/firebase/resource_firebase_apple_app_update_test.go.erb +++ b/mmv1/third_party/terraform/services/firebase/resource_firebase_apple_app_update_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccFirebaseAppleApp_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebase/resource_firebase_project_test.go.erb b/mmv1/third_party/terraform/services/firebase/resource_firebase_project_test.go.erb index e9fc113e59a2..9a53aff81f0b 100644 --- a/mmv1/third_party/terraform/services/firebase/resource_firebase_project_test.go.erb +++ b/mmv1/third_party/terraform/services/firebase/resource_firebase_project_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccFirebaseProject_destroyAndReapply(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebase/resource_firebase_web_app_test.go.erb b/mmv1/third_party/terraform/services/firebase/resource_firebase_web_app_test.go.erb index 3084052cdbfe..85f64ee8c37e 100644 --- a/mmv1/third_party/terraform/services/firebase/resource_firebase_web_app_test.go.erb +++ b/mmv1/third_party/terraform/services/firebase/resource_firebase_web_app_test.go.erb @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_app_attest_config_test.go.tmpl b/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_app_attest_config_test.go.tmpl index 75df876e7293..739ab683e6fd 100644 --- a/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_app_attest_config_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_app_attest_config_test.go.tmpl @@ -4,7 +4,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_debug_token_test.go.tmpl b/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_debug_token_test.go.tmpl index bd8a2fd50cf2..b2b09069c0eb 100644 --- a/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_debug_token_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_debug_token_test.go.tmpl @@ -4,7 +4,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_device_check_config_test.go.tmpl b/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_device_check_config_test.go.tmpl index 1282e6dc5623..d02eb00e9991 100644 --- a/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_device_check_config_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_device_check_config_test.go.tmpl @@ -4,7 +4,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_play_integrity_config_test.go.tmpl b/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_play_integrity_config_test.go.tmpl index 698c79f946a7..293b50190303 100644 --- a/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_play_integrity_config_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_play_integrity_config_test.go.tmpl @@ -4,7 +4,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_recaptcha_enterprise_config_test.go.tmpl b/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_recaptcha_enterprise_config_test.go.tmpl index 4b663c534a2a..3df8ffbbd685 100644 --- a/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_recaptcha_enterprise_config_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_recaptcha_enterprise_config_test.go.tmpl @@ -4,7 +4,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_recaptcha_v3_config_test.go.tmpl b/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_recaptcha_v3_config_test.go.tmpl index 045d890e5104..85a9f8d97cb9 100644 --- a/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_recaptcha_v3_config_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_recaptcha_v3_config_test.go.tmpl @@ -4,7 +4,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_service_config_test.go.tmpl b/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_service_config_test.go.tmpl index abb7f2a65109..764a76113cae 100644 --- a/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_service_config_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_service_config_test.go.tmpl @@ -6,7 +6,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_app_attest_config_test.go.erb b/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_app_attest_config_test.go.erb index 7efea05411fd..c5b9904ec9b4 100644 --- a/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_app_attest_config_test.go.erb +++ b/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_app_attest_config_test.go.erb @@ -5,7 +5,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_debug_token_test.go.erb b/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_debug_token_test.go.erb index be5bad79fcb4..19f89245fa06 100644 --- a/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_debug_token_test.go.erb +++ b/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_debug_token_test.go.erb @@ -5,7 +5,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_device_check_config_test.go.erb b/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_device_check_config_test.go.erb index 156a2cac1e59..d6d28e8232b4 100644 --- a/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_device_check_config_test.go.erb +++ b/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_device_check_config_test.go.erb @@ -5,7 +5,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_play_integrity_config_test.go.erb b/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_play_integrity_config_test.go.erb index 93bebec70a3c..abc15f02ce47 100644 --- a/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_play_integrity_config_test.go.erb +++ b/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_play_integrity_config_test.go.erb @@ -5,7 +5,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_test.go.erb b/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_test.go.erb index 9fb1a6f11d28..b4d3d9bedd67 100644 --- a/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_test.go.erb +++ b/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_test.go.erb @@ -5,7 +5,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_recaptcha_v3_config_test.go.erb b/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_recaptcha_v3_config_test.go.erb index 28829e711622..a1340c316ee7 100644 --- a/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_recaptcha_v3_config_test.go.erb +++ b/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_recaptcha_v3_config_test.go.erb @@ -5,7 +5,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_service_config_test.go.erb b/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_service_config_test.go.erb index a4896985463e..298c89c11f50 100644 --- a/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_service_config_test.go.erb +++ b/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_service_config_test.go.erb @@ -7,7 +7,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/firebasedatabase/go/resource_firebase_database_instance_test.go.tmpl b/mmv1/third_party/terraform/services/firebasedatabase/go/resource_firebase_database_instance_test.go.tmpl index 524aafe661ca..62c3c0fa1370 100644 --- a/mmv1/third_party/terraform/services/firebasedatabase/go/resource_firebase_database_instance_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebasedatabase/go/resource_firebase_database_instance_test.go.tmpl @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func testAccFirebaseDatabaseInstance_firebaseDatabaseInstanceInState(context map[string]interface{}, state string) string { diff --git a/mmv1/third_party/terraform/services/firebasedatabase/resource_firebase_database_instance_test.go.erb b/mmv1/third_party/terraform/services/firebasedatabase/resource_firebase_database_instance_test.go.erb index 15ce4c75d27a..e9b706bbd965 100644 --- a/mmv1/third_party/terraform/services/firebasedatabase/resource_firebase_database_instance_test.go.erb +++ b/mmv1/third_party/terraform/services/firebasedatabase/resource_firebase_database_instance_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func testAccFirebaseDatabaseInstance_firebaseDatabaseInstanceInState(context map[string]interface{}, state string) string { diff --git a/mmv1/third_party/terraform/services/firebaseextensions/go/resource_firebase_extensions_instance_test.go.tmpl b/mmv1/third_party/terraform/services/firebaseextensions/go/resource_firebase_extensions_instance_test.go.tmpl index 836db0b276d7..e884500dda4d 100644 --- a/mmv1/third_party/terraform/services/firebaseextensions/go/resource_firebase_extensions_instance_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebaseextensions/go/resource_firebase_extensions_instance_test.go.tmpl @@ -4,7 +4,7 @@ package firebaseextensions_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/firebaseextensions/resource_firebase_extensions_instance_test.go.erb b/mmv1/third_party/terraform/services/firebaseextensions/resource_firebase_extensions_instance_test.go.erb index b2144ad85528..6607a3bbe264 100644 --- a/mmv1/third_party/terraform/services/firebaseextensions/resource_firebase_extensions_instance_test.go.erb +++ b/mmv1/third_party/terraform/services/firebaseextensions/resource_firebase_extensions_instance_test.go.erb @@ -5,7 +5,7 @@ package firebaseextensions_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/firebasehosting/data_source_google_firebase_hosting_channel_test.go.erb b/mmv1/third_party/terraform/services/firebasehosting/data_source_google_firebase_hosting_channel_test.go.erb index dc9adf02ea9e..094a1cf1d3bf 100644 --- a/mmv1/third_party/terraform/services/firebasehosting/data_source_google_firebase_hosting_channel_test.go.erb +++ b/mmv1/third_party/terraform/services/firebasehosting/data_source_google_firebase_hosting_channel_test.go.erb @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceGoogleFirebaseHostingChannel(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebasehosting/go/data_source_google_firebase_hosting_channel_test.go.tmpl b/mmv1/third_party/terraform/services/firebasehosting/go/data_source_google_firebase_hosting_channel_test.go.tmpl index 0b7fa3cc6ebf..a986ca15bc8e 100644 --- a/mmv1/third_party/terraform/services/firebasehosting/go/data_source_google_firebase_hosting_channel_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebasehosting/go/data_source_google_firebase_hosting_channel_test.go.tmpl @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceGoogleFirebaseHostingChannel(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebasehosting/go/resource_firebase_hosting_channel_test.go.tmpl b/mmv1/third_party/terraform/services/firebasehosting/go/resource_firebase_hosting_channel_test.go.tmpl index 5be59c4fa773..f0d7719035cf 100644 --- a/mmv1/third_party/terraform/services/firebasehosting/go/resource_firebase_hosting_channel_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebasehosting/go/resource_firebase_hosting_channel_test.go.tmpl @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccFirebaseHostingChannel_firebasehostingChannelUpdate(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebasehosting/go/resource_firebase_hosting_custom_domain_test.go.tmpl b/mmv1/third_party/terraform/services/firebasehosting/go/resource_firebase_hosting_custom_domain_test.go.tmpl index e16581346c11..1d101ece7d89 100644 --- a/mmv1/third_party/terraform/services/firebasehosting/go/resource_firebase_hosting_custom_domain_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebasehosting/go/resource_firebase_hosting_custom_domain_test.go.tmpl @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccFirebaseHostingCustomDomain_firebasehostingCustomdomainUpdate(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebasehosting/go/resource_firebase_hosting_site_test.go.tmpl b/mmv1/third_party/terraform/services/firebasehosting/go/resource_firebase_hosting_site_test.go.tmpl index cc0e77f6f4ee..87c2d3316650 100644 --- a/mmv1/third_party/terraform/services/firebasehosting/go/resource_firebase_hosting_site_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebasehosting/go/resource_firebase_hosting_site_test.go.tmpl @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccFirebaseHostingSite_firebasehostingSiteUpdate(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebasehosting/resource_firebase_hosting_channel_test.go.erb b/mmv1/third_party/terraform/services/firebasehosting/resource_firebase_hosting_channel_test.go.erb index 93169502da64..9c51a32bcbe6 100644 --- a/mmv1/third_party/terraform/services/firebasehosting/resource_firebase_hosting_channel_test.go.erb +++ b/mmv1/third_party/terraform/services/firebasehosting/resource_firebase_hosting_channel_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccFirebaseHostingChannel_firebasehostingChannelUpdate(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebasehosting/resource_firebase_hosting_custom_domain_test.go.erb b/mmv1/third_party/terraform/services/firebasehosting/resource_firebase_hosting_custom_domain_test.go.erb index 7b42ace8511c..606ec78672cf 100644 --- a/mmv1/third_party/terraform/services/firebasehosting/resource_firebase_hosting_custom_domain_test.go.erb +++ b/mmv1/third_party/terraform/services/firebasehosting/resource_firebase_hosting_custom_domain_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccFirebaseHostingCustomDomain_firebasehostingCustomdomainUpdate(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firebasehosting/resource_firebase_hosting_site_test.go.erb b/mmv1/third_party/terraform/services/firebasehosting/resource_firebase_hosting_site_test.go.erb index 57548470be69..68cce2519aae 100644 --- a/mmv1/third_party/terraform/services/firebasehosting/resource_firebase_hosting_site_test.go.erb +++ b/mmv1/third_party/terraform/services/firebasehosting/resource_firebase_hosting_site_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccFirebaseHostingSite_firebasehostingSiteUpdate(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firestore/go/resource_firestore_database_update_test.go b/mmv1/third_party/terraform/services/firestore/go/resource_firestore_database_update_test.go index 3477c4a19a73..596a4ccb48ed 100644 --- a/mmv1/third_party/terraform/services/firestore/go/resource_firestore_database_update_test.go +++ b/mmv1/third_party/terraform/services/firestore/go/resource_firestore_database_update_test.go @@ -2,11 +2,11 @@ package firestore_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccFirestoreDatabase_updateConcurrencyMode(t *testing.T) { @@ -26,18 +26,18 @@ func TestAccFirestoreDatabase_updateConcurrencyMode(t *testing.T) { Config: testAccFirestoreDatabase_concurrencyMode(projectId, randomSuffix, "OPTIMISTIC"), }, { - ResourceName: "google_firestore_database.database", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_firestore_database.database", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"etag", "project"}, }, { Config: testAccFirestoreDatabase_concurrencyMode(projectId, randomSuffix, "PESSIMISTIC"), }, { - ResourceName: "google_firestore_database.database", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_firestore_database.database", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"etag", "project"}, }, }, @@ -61,18 +61,18 @@ func TestAccFirestoreDatabase_updatePitrEnablement(t *testing.T) { Config: testAccFirestoreDatabase_pitrEnablement(projectId, randomSuffix, "POINT_IN_TIME_RECOVERY_ENABLED"), }, { - ResourceName: "google_firestore_database.database", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_firestore_database.database", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"etag", "project"}, }, { Config: testAccFirestoreDatabase_pitrEnablement(projectId, randomSuffix, "POINT_IN_TIME_RECOVERY_DISABLED"), }, { - ResourceName: "google_firestore_database.database", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_firestore_database.database", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"etag", "project"}, }, }, @@ -96,18 +96,18 @@ func TestAccFirestoreDatabase_updateDeleteProtectionState(t *testing.T) { Config: testAccFirestoreDatabase_deleteProtectionState(projectId, randomSuffix, "DELETE_PROTECTION_ENABLED"), }, { - ResourceName: "google_firestore_database.database", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_firestore_database.database", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"etag", "project"}, }, { Config: testAccFirestoreDatabase_deleteProtectionState(projectId, randomSuffix, "DELETE_PROTECTION_DISABLED"), }, { - ResourceName: "google_firestore_database.database", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_firestore_database.database", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"etag", "project"}, }, }, diff --git a/mmv1/third_party/terraform/services/firestore/resource_firestore_database_update_test.go.erb b/mmv1/third_party/terraform/services/firestore/resource_firestore_database_update_test.go.erb index a4e6cbe2aed5..ae807949807e 100644 --- a/mmv1/third_party/terraform/services/firestore/resource_firestore_database_update_test.go.erb +++ b/mmv1/third_party/terraform/services/firestore/resource_firestore_database_update_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccFirestoreDatabase_updateConcurrencyMode(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/firestore/resource_firestore_document_test.go b/mmv1/third_party/terraform/services/firestore/resource_firestore_document_test.go index 6c9dd9e9f3db..4f3e61d95e63 100644 --- a/mmv1/third_party/terraform/services/firestore/resource_firestore_document_test.go +++ b/mmv1/third_party/terraform/services/firestore/resource_firestore_document_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/firestore/resource_firestore_field_test.go b/mmv1/third_party/terraform/services/firestore/resource_firestore_field_test.go index 8223330b544f..b17f503c84ad 100644 --- a/mmv1/third_party/terraform/services/firestore/resource_firestore_field_test.go +++ b/mmv1/third_party/terraform/services/firestore/resource_firestore_field_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/gkebackup/go/resource_gke_backup_backup_plan_test.go b/mmv1/third_party/terraform/services/gkebackup/go/resource_gke_backup_backup_plan_test.go index 4c2ef81cdaca..658e79ce5b0b 100644 --- a/mmv1/third_party/terraform/services/gkebackup/go/resource_gke_backup_backup_plan_test.go +++ b/mmv1/third_party/terraform/services/gkebackup/go/resource_gke_backup_backup_plan_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccGKEBackupBackupPlan_update(t *testing.T) { @@ -28,54 +28,54 @@ func TestAccGKEBackupBackupPlan_update(t *testing.T) { Config: testAccGKEBackupBackupPlan_basic(context), }, { - ResourceName: "google_gke_backup_backup_plan.backupplan", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_gke_backup_backup_plan.backupplan", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, - { + { Config: testAccGKEBackupBackupPlan_permissive(context), }, { - ResourceName: "google_gke_backup_backup_plan.backupplan", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_gke_backup_backup_plan.backupplan", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccGKEBackupBackupPlan_full(context), }, { - ResourceName: "google_gke_backup_backup_plan.backupplan", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_gke_backup_backup_plan.backupplan", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, - { + { Config: testAccGKEBackupBackupPlan_rpo_daily_window(context), }, { - ResourceName: "google_gke_backup_backup_plan.backupplan", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_gke_backup_backup_plan.backupplan", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccGKEBackupBackupPlan_rpo_weekly_window(context), }, { - ResourceName: "google_gke_backup_backup_plan.backupplan", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_gke_backup_backup_plan.backupplan", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, - { + { Config: testAccGKEBackupBackupPlan_full(context), }, { - ResourceName: "google_gke_backup_backup_plan.backupplan", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_gke_backup_backup_plan.backupplan", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, diff --git a/mmv1/third_party/terraform/services/gkebackup/go/resource_gke_backup_restore_plan_test.go b/mmv1/third_party/terraform/services/gkebackup/go/resource_gke_backup_restore_plan_test.go index cf8d9dfa0c81..04c53ad5f927 100644 --- a/mmv1/third_party/terraform/services/gkebackup/go/resource_gke_backup_restore_plan_test.go +++ b/mmv1/third_party/terraform/services/gkebackup/go/resource_gke_backup_restore_plan_test.go @@ -1,16 +1,13 @@ - - package gkebackup_test import ( "testing" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) - func TestAccGKEBackupRestorePlan_update(t *testing.T) { t.Parallel() @@ -35,7 +32,7 @@ func TestAccGKEBackupRestorePlan_update(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"labels", "location", "terraform_labels"}, }, - { + { Config: testAccGKEBackupRestorePlan_update(context), }, { @@ -204,4 +201,4 @@ resource "google_gke_backup_restore_plan" "restore_plan" { } } `, context) -} \ No newline at end of file +} diff --git a/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_plan_test.go.erb b/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_plan_test.go.erb index 883ce78ef09d..c9895035148a 100644 --- a/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_plan_test.go.erb +++ b/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_plan_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccGKEBackupBackupPlan_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_restore_plan_test.go.erb b/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_restore_plan_test.go.erb index 68e90ba7d81c..5f9c90bfd0cf 100644 --- a/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_restore_plan_test.go.erb +++ b/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_restore_plan_test.go.erb @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) diff --git a/mmv1/third_party/terraform/services/gkehub/go/resource_gke_hub_feature_membership_test.go.tmpl b/mmv1/third_party/terraform/services/gkehub/go/resource_gke_hub_feature_membership_test.go.tmpl index 6c6627495c56..f3308d0f4f89 100644 --- a/mmv1/third_party/terraform/services/gkehub/go/resource_gke_hub_feature_membership_test.go.tmpl +++ b/mmv1/third_party/terraform/services/gkehub/go/resource_gke_hub_feature_membership_test.go.tmpl @@ -8,8 +8,8 @@ import ( dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" gkehub "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/gkehub{{ $.DCLVersion }}" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/gkehub/resource_gke_hub_feature_membership_test.go.erb b/mmv1/third_party/terraform/services/gkehub/resource_gke_hub_feature_membership_test.go.erb index 269e2f079364..193bc78f4503 100644 --- a/mmv1/third_party/terraform/services/gkehub/resource_gke_hub_feature_membership_test.go.erb +++ b/mmv1/third_party/terraform/services/gkehub/resource_gke_hub_feature_membership_test.go.erb @@ -9,8 +9,8 @@ import ( dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" gkehub "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/gkehub<%= dcl_version(version) -%>" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/gkehub2/data_source_google_gke_hub_membership_binding_test.go b/mmv1/third_party/terraform/services/gkehub2/data_source_google_gke_hub_membership_binding_test.go index 094aad12c882..bab681b0d568 100644 --- a/mmv1/third_party/terraform/services/gkehub2/data_source_google_gke_hub_membership_binding_test.go +++ b/mmv1/third_party/terraform/services/gkehub2/data_source_google_gke_hub_membership_binding_test.go @@ -3,7 +3,7 @@ package gkehub2_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/gkehub2/go/iam_gke_hub_feature_test.go b/mmv1/third_party/terraform/services/gkehub2/go/iam_gke_hub_feature_test.go index 2c8c61f8b190..0d85b9b38d83 100644 --- a/mmv1/third_party/terraform/services/gkehub2/go/iam_gke_hub_feature_test.go +++ b/mmv1/third_party/terraform/services/gkehub2/go/iam_gke_hub_feature_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/gkehub2/go/resource_gke_hub_feature_test.go.tmpl b/mmv1/third_party/terraform/services/gkehub2/go/resource_gke_hub_feature_test.go.tmpl index d64642fc0f6a..32afc2869eb2 100644 --- a/mmv1/third_party/terraform/services/gkehub2/go/resource_gke_hub_feature_test.go.tmpl +++ b/mmv1/third_party/terraform/services/gkehub2/go/resource_gke_hub_feature_test.go.tmpl @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/gkehub2/go/resource_gke_hub_fleet_test.go.tmpl b/mmv1/third_party/terraform/services/gkehub2/go/resource_gke_hub_fleet_test.go.tmpl index f3b872f24615..4ccbfabfa3e5 100644 --- a/mmv1/third_party/terraform/services/gkehub2/go/resource_gke_hub_fleet_test.go.tmpl +++ b/mmv1/third_party/terraform/services/gkehub2/go/resource_gke_hub_fleet_test.go.tmpl @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/gkehub2/iam_gke_hub_feature_test.go.erb b/mmv1/third_party/terraform/services/gkehub2/iam_gke_hub_feature_test.go.erb index 3024aa234017..852db173bfa0 100644 --- a/mmv1/third_party/terraform/services/gkehub2/iam_gke_hub_feature_test.go.erb +++ b/mmv1/third_party/terraform/services/gkehub2/iam_gke_hub_feature_test.go.erb @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_feature_test.go.erb b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_feature_test.go.erb index e75d70ca3813..9088513481ae 100644 --- a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_feature_test.go.erb +++ b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_feature_test.go.erb @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_fleet_test.go.erb b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_fleet_test.go.erb index ca516876d0a7..e41d8f8ce17d 100755 --- a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_fleet_test.go.erb +++ b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_fleet_test.go.erb @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_membership_binding_test.go b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_membership_binding_test.go index 92cd069eb444..f412586333ce 100644 --- a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_membership_binding_test.go +++ b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_membership_binding_test.go @@ -3,7 +3,7 @@ package gkehub2_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_namespace_test.go b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_namespace_test.go index a80cb1393807..de68903b9c35 100644 --- a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_namespace_test.go +++ b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_namespace_test.go @@ -3,7 +3,7 @@ package gkehub2_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_test.go b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_test.go index 5756e6c2a8b3..8efb36aeb073 100644 --- a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_test.go +++ b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_test.go @@ -3,7 +3,7 @@ package gkehub2_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_scope_test.go b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_scope_test.go index be00b628a7c6..cbae79fb4950 100644 --- a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_scope_test.go +++ b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_scope_test.go @@ -3,7 +3,7 @@ package gkehub2_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/gkeonprem/go/resource_gkeonprem_bare_metal_cluster_test.go b/mmv1/third_party/terraform/services/gkeonprem/go/resource_gkeonprem_bare_metal_cluster_test.go index caa9138f058b..e5d8fdf33ee4 100644 --- a/mmv1/third_party/terraform/services/gkeonprem/go/resource_gkeonprem_bare_metal_cluster_test.go +++ b/mmv1/third_party/terraform/services/gkeonprem/go/resource_gkeonprem_bare_metal_cluster_test.go @@ -3,110 +3,110 @@ package gkeonprem_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) func TestAccGkeonpremBareMetalCluster_bareMetalClusterUpdateBasic(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckGkeonpremBareMetalClusterDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateMetalLbStart(context), - }, - { - ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-metallb", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"annotations"}, - }, - { - Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateMetalLb(context), - }, - { - ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-metallb", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"annotations"}, - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckGkeonpremBareMetalClusterDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateMetalLbStart(context), + }, + { + ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-metallb", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"annotations"}, + }, + { + Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateMetalLb(context), + }, + { + ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-metallb", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"annotations"}, + }, + }, + }) } func TestAccGkeonpremBareMetalCluster_bareMetalClusterUpdateManualLb(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckGkeonpremBareMetalClusterDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateManualLbStart(context), - }, - { - ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-manuallb", - ImportState: true, - ImportStateVerify: true, - }, - { - Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateManualLb(context), - }, - { - ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-manuallb", - ImportState: true, - ImportStateVerify: true, - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckGkeonpremBareMetalClusterDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateManualLbStart(context), + }, + { + ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-manuallb", + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateManualLb(context), + }, + { + ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-manuallb", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) } func TestAccGkeonpremBareMetalCluster_bareMetalClusterUpdateBgpLb(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckGkeonpremBareMetalClusterDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateBgpLbStart(context), - }, - { - ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-bgplb", - ImportState: true, - ImportStateVerify: true, - }, - { - Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateBgpLb(context), - }, - { - ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-bgplb", - ImportState: true, - ImportStateVerify: true, - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckGkeonpremBareMetalClusterDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateBgpLbStart(context), + }, + { + ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-bgplb", + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateBgpLb(context), + }, + { + ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-bgplb", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) } func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateMetalLbStart(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_bare_metal_cluster" "cluster-metallb" { name = "cluster-metallb%{random_suffix}" @@ -184,7 +184,7 @@ func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateMetalLbStart(context } func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateMetalLb(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_bare_metal_cluster" "cluster-metallb" { name = "cluster-metallb%{random_suffix}" @@ -260,7 +260,7 @@ func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateMetalLb(context map[ } func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateManualLbStart(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_bare_metal_cluster" "cluster-manuallb" { name = "cluster-manuallb%{random_suffix}" @@ -339,7 +339,7 @@ func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateManualLbStart(contex } func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateManualLb(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_bare_metal_cluster" "cluster-manuallb" { name = "cluster-manuallb%{random_suffix}" @@ -407,7 +407,7 @@ func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateManualLb(context map } func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateBgpLbStart(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_bare_metal_cluster" "cluster-bgplb" { name = "cluster-bgplb%{random_suffix}" @@ -491,7 +491,7 @@ func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateBgpLbStart(context m } func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateBgpLb(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_bare_metal_cluster" "cluster-bgplb" { name = "cluster-bgplb%{random_suffix}" diff --git a/mmv1/third_party/terraform/services/gkeonprem/go/resource_gkeonprem_bare_metal_node_pool_test.go b/mmv1/third_party/terraform/services/gkeonprem/go/resource_gkeonprem_bare_metal_node_pool_test.go index 67959eb8364f..e0e430b79f3a 100644 --- a/mmv1/third_party/terraform/services/gkeonprem/go/resource_gkeonprem_bare_metal_node_pool_test.go +++ b/mmv1/third_party/terraform/services/gkeonprem/go/resource_gkeonprem_bare_metal_node_pool_test.go @@ -3,46 +3,46 @@ package gkeonprem_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) func TestAccGkeonpremBareMetalNodePool_bareMetalNodePoolUpdate(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckGkeonpremBareMetalNodePoolDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccGkeonpremBareMetalNodePool_bareMetalNodePoolUpdateStart(context), - }, - { - ResourceName: "google_gkeonprem_bare_metal_node_pool.nodepool", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"annotations"}, - }, - { - Config: testAccGkeonpremBareMetalNodePool_bareMetalNodePoolUpdate(context), - }, - { - ResourceName: "google_gkeonprem_bare_metal_node_pool.nodepool", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"annotations"}, - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckGkeonpremBareMetalNodePoolDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccGkeonpremBareMetalNodePool_bareMetalNodePoolUpdateStart(context), + }, + { + ResourceName: "google_gkeonprem_bare_metal_node_pool.nodepool", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"annotations"}, + }, + { + Config: testAccGkeonpremBareMetalNodePool_bareMetalNodePoolUpdate(context), + }, + { + ResourceName: "google_gkeonprem_bare_metal_node_pool.nodepool", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"annotations"}, + }, + }, + }) } func testAccGkeonpremBareMetalNodePool_bareMetalNodePoolUpdateStart(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_bare_metal_cluster" "cluster" { name = "tf-test-cluster-%{random_suffix}" @@ -134,7 +134,7 @@ func testAccGkeonpremBareMetalNodePool_bareMetalNodePoolUpdateStart(context map[ } func testAccGkeonpremBareMetalNodePool_bareMetalNodePoolUpdate(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_bare_metal_cluster" "cluster" { name = "tf-test-cluster-%{random_suffix}" diff --git a/mmv1/third_party/terraform/services/gkeonprem/go/resource_gkeonprem_vmware_cluster_test.go b/mmv1/third_party/terraform/services/gkeonprem/go/resource_gkeonprem_vmware_cluster_test.go index 0f303ba04155..edd6751bda9f 100644 --- a/mmv1/third_party/terraform/services/gkeonprem/go/resource_gkeonprem_vmware_cluster_test.go +++ b/mmv1/third_party/terraform/services/gkeonprem/go/resource_gkeonprem_vmware_cluster_test.go @@ -3,112 +3,112 @@ package gkeonprem_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) func TestAccGkeonpremVmwareCluster_vmwareClusterUpdateBasic(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckGkeonpremVmwareClusterDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateMetalLbStart(context), - }, - { - ResourceName: "google_gkeonprem_vmware_cluster.cluster", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"annotations"}, - }, - { - Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateMetalLb(context), - }, - { - ResourceName: "google_gkeonprem_vmware_cluster.cluster", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"annotations"}, - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckGkeonpremVmwareClusterDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateMetalLbStart(context), + }, + { + ResourceName: "google_gkeonprem_vmware_cluster.cluster", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"annotations"}, + }, + { + Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateMetalLb(context), + }, + { + ResourceName: "google_gkeonprem_vmware_cluster.cluster", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"annotations"}, + }, + }, + }) } func TestAccGkeonpremVmwareCluster_vmwareClusterUpdateF5Lb(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckGkeonpremVmwareClusterDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateF5LbStart(context), - }, - { - ResourceName: "google_gkeonprem_vmware_cluster.cluster", - ImportState: true, - ImportStateVerify: true, - }, - { - Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateF5lb(context), - }, - { - ResourceName: "google_gkeonprem_vmware_cluster.cluster", - ImportState: true, - ImportStateVerify: true, - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckGkeonpremVmwareClusterDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateF5LbStart(context), + }, + { + ResourceName: "google_gkeonprem_vmware_cluster.cluster", + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateF5lb(context), + }, + { + ResourceName: "google_gkeonprem_vmware_cluster.cluster", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) } func TestAccGkeonpremVmwareCluster_vmwareClusterUpdateManualLb(t *testing.T) { - // VCR fails to handle batched project services - acctest.SkipIfVcr(t) - t.Parallel() + // VCR fails to handle batched project services + acctest.SkipIfVcr(t) + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckGkeonpremVmwareClusterDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateManualLbStart(context), - }, - { - ResourceName: "google_gkeonprem_vmware_cluster.cluster", - ImportState: true, - ImportStateVerify: true, - }, - { - Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateManualLb(context), - }, - { - ResourceName: "google_gkeonprem_vmware_cluster.cluster", - ImportState: true, - ImportStateVerify: true, - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckGkeonpremVmwareClusterDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateManualLbStart(context), + }, + { + ResourceName: "google_gkeonprem_vmware_cluster.cluster", + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateManualLb(context), + }, + { + ResourceName: "google_gkeonprem_vmware_cluster.cluster", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) } func testAccGkeonpremVmwareCluster_vmwareClusterUpdateMetalLbStart(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_vmware_cluster" "cluster" { name = "tf-test-cluster-%{random_suffix}" @@ -156,7 +156,7 @@ func testAccGkeonpremVmwareCluster_vmwareClusterUpdateMetalLbStart(context map[s } func testAccGkeonpremVmwareCluster_vmwareClusterUpdateMetalLb(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_vmware_cluster" "cluster" { name = "tf-test-cluster-%{random_suffix}" @@ -204,7 +204,7 @@ func testAccGkeonpremVmwareCluster_vmwareClusterUpdateMetalLb(context map[string } func testAccGkeonpremVmwareCluster_vmwareClusterUpdateF5LbStart(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_vmware_cluster" "cluster" { name = "tf-test-cluster-%{random_suffix}" @@ -251,7 +251,7 @@ func testAccGkeonpremVmwareCluster_vmwareClusterUpdateF5LbStart(context map[stri } func testAccGkeonpremVmwareCluster_vmwareClusterUpdateF5lb(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_vmware_cluster" "cluster" { name = "tf-test-cluster-%{random_suffix}" @@ -298,7 +298,7 @@ func testAccGkeonpremVmwareCluster_vmwareClusterUpdateF5lb(context map[string]in } func testAccGkeonpremVmwareCluster_vmwareClusterUpdateManualLbStart(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_vmware_cluster" "cluster" { name = "tf-test-cluster-%{random_suffix}" @@ -391,7 +391,7 @@ func testAccGkeonpremVmwareCluster_vmwareClusterUpdateManualLbStart(context map[ } func testAccGkeonpremVmwareCluster_vmwareClusterUpdateManualLb(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_vmware_cluster" "cluster" { name = "tf-test-cluster-%{random_suffix}" diff --git a/mmv1/third_party/terraform/services/gkeonprem/go/resource_gkeonprem_vmware_node_pool_test.go b/mmv1/third_party/terraform/services/gkeonprem/go/resource_gkeonprem_vmware_node_pool_test.go index 0be6f8fa29a0..b89cdaff1768 100644 --- a/mmv1/third_party/terraform/services/gkeonprem/go/resource_gkeonprem_vmware_node_pool_test.go +++ b/mmv1/third_party/terraform/services/gkeonprem/go/resource_gkeonprem_vmware_node_pool_test.go @@ -3,46 +3,46 @@ package gkeonprem_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) func TestAccGkeonpremVmwareNodePool_vmwareNodePoolUpdate(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckGkeonpremVmwareNodePoolDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdateStart(context), - }, - { - ResourceName: "google_gkeonprem_vmware_node_pool.nodepool", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"annotations"}, - }, - { - Config: testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdate(context), - }, - { - ResourceName: "google_gkeonprem_vmware_node_pool.nodepool", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"annotations"}, - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckGkeonpremVmwareNodePoolDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdateStart(context), + }, + { + ResourceName: "google_gkeonprem_vmware_node_pool.nodepool", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"annotations"}, + }, + { + Config: testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdate(context), + }, + { + ResourceName: "google_gkeonprem_vmware_node_pool.nodepool", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"annotations"}, + }, + }, + }) } func testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdateStart(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_vmware_cluster" "cluster" { name = "tf-test-cluster-%{random_suffix}" @@ -127,7 +127,7 @@ func testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdateStart(context map[string } func testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdate(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_vmware_cluster" "cluster" { name = "tf-test-cluster-%{random_suffix}" diff --git a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_test.go.erb b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_test.go.erb index 38cb0b9890cc..f3cbc890345f 100644 --- a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_test.go.erb +++ b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_test.go.erb @@ -4,7 +4,7 @@ package gkeonprem_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_test.go.erb b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_test.go.erb index f0135b115440..58b39be32eb9 100644 --- a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_test.go.erb +++ b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_test.go.erb @@ -4,7 +4,7 @@ package gkeonprem_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_cluster_test.go.erb b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_cluster_test.go.erb index 829bb3fd99a2..720712547442 100644 --- a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_cluster_test.go.erb +++ b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_cluster_test.go.erb @@ -4,7 +4,7 @@ package gkeonprem_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_node_pool_test.go.erb b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_node_pool_test.go.erb index 93770ac63504..f8e2d1228904 100644 --- a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_node_pool_test.go.erb +++ b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_node_pool_test.go.erb @@ -4,7 +4,7 @@ package gkeonprem_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/healthcare/go/resource_healthcare_fhir_store_test.go.tmpl b/mmv1/third_party/terraform/services/healthcare/go/resource_healthcare_fhir_store_test.go.tmpl index ec54cd6a1326..9e51446d98e2 100644 --- a/mmv1/third_party/terraform/services/healthcare/go/resource_healthcare_fhir_store_test.go.tmpl +++ b/mmv1/third_party/terraform/services/healthcare/go/resource_healthcare_fhir_store_test.go.tmpl @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccHealthcareFhirStoreIdParsing(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/healthcare/go/resource_healthcare_hl7_v2_store_test.go.tmpl b/mmv1/third_party/terraform/services/healthcare/go/resource_healthcare_hl7_v2_store_test.go.tmpl index d68e93b16a9b..961ad3f33ab9 100644 --- a/mmv1/third_party/terraform/services/healthcare/go/resource_healthcare_hl7_v2_store_test.go.tmpl +++ b/mmv1/third_party/terraform/services/healthcare/go/resource_healthcare_hl7_v2_store_test.go.tmpl @@ -5,8 +5,8 @@ import ( "path" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/healthcare" diff --git a/mmv1/third_party/terraform/services/healthcare/iam_healthcare_dataset_test.go b/mmv1/third_party/terraform/services/healthcare/iam_healthcare_dataset_test.go index 5e78074ad864..3bc56df70ee7 100644 --- a/mmv1/third_party/terraform/services/healthcare/iam_healthcare_dataset_test.go +++ b/mmv1/third_party/terraform/services/healthcare/iam_healthcare_dataset_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/healthcare" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) const DEFAULT_HEALTHCARE_TEST_LOCATION = "us-central1" diff --git a/mmv1/third_party/terraform/services/healthcare/iam_healthcare_dicom_store_test.go b/mmv1/third_party/terraform/services/healthcare/iam_healthcare_dicom_store_test.go index c246e98b92a7..ee4993ea4516 100644 --- a/mmv1/third_party/terraform/services/healthcare/iam_healthcare_dicom_store_test.go +++ b/mmv1/third_party/terraform/services/healthcare/iam_healthcare_dicom_store_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/healthcare" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccHealthcareDicomStoreIamBinding(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/healthcare/iam_healthcare_fhir_store_test.go b/mmv1/third_party/terraform/services/healthcare/iam_healthcare_fhir_store_test.go index df3e03c668e3..ac71b0c14a17 100644 --- a/mmv1/third_party/terraform/services/healthcare/iam_healthcare_fhir_store_test.go +++ b/mmv1/third_party/terraform/services/healthcare/iam_healthcare_fhir_store_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/healthcare" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccHealthcareFhirStoreIamBinding(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/healthcare/iam_healthcare_hl7_v2_store_test.go b/mmv1/third_party/terraform/services/healthcare/iam_healthcare_hl7_v2_store_test.go index 7d22ef116ad3..40d982b6794a 100644 --- a/mmv1/third_party/terraform/services/healthcare/iam_healthcare_hl7_v2_store_test.go +++ b/mmv1/third_party/terraform/services/healthcare/iam_healthcare_hl7_v2_store_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/healthcare" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccHealthcareHl7V2StoreIamBinding(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/healthcare/resource_healthcare_dataset_test.go b/mmv1/third_party/terraform/services/healthcare/resource_healthcare_dataset_test.go index 9b8fe3f1ed30..cdecf3f8fb42 100644 --- a/mmv1/third_party/terraform/services/healthcare/resource_healthcare_dataset_test.go +++ b/mmv1/third_party/terraform/services/healthcare/resource_healthcare_dataset_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/healthcare" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/healthcare/resource_healthcare_dicom_store_test.go b/mmv1/third_party/terraform/services/healthcare/resource_healthcare_dicom_store_test.go index b96e9fbfaa6c..8e1047190509 100644 --- a/mmv1/third_party/terraform/services/healthcare/resource_healthcare_dicom_store_test.go +++ b/mmv1/third_party/terraform/services/healthcare/resource_healthcare_dicom_store_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccHealthcareDicomStoreIdParsing(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/healthcare/resource_healthcare_fhir_store_test.go.erb b/mmv1/third_party/terraform/services/healthcare/resource_healthcare_fhir_store_test.go.erb index 0ac201a6c6be..33a792cfa3f5 100644 --- a/mmv1/third_party/terraform/services/healthcare/resource_healthcare_fhir_store_test.go.erb +++ b/mmv1/third_party/terraform/services/healthcare/resource_healthcare_fhir_store_test.go.erb @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccHealthcareFhirStoreIdParsing(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/healthcare/resource_healthcare_hl7_v2_store_test.go.erb b/mmv1/third_party/terraform/services/healthcare/resource_healthcare_hl7_v2_store_test.go.erb index 8e5dfd907339..6dc7d6008501 100644 --- a/mmv1/third_party/terraform/services/healthcare/resource_healthcare_hl7_v2_store_test.go.erb +++ b/mmv1/third_party/terraform/services/healthcare/resource_healthcare_hl7_v2_store_test.go.erb @@ -6,8 +6,8 @@ import ( "path" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/healthcare" diff --git a/mmv1/third_party/terraform/services/iam2/go/resource_iam_deny_policy_test.go b/mmv1/third_party/terraform/services/iam2/go/resource_iam_deny_policy_test.go index 2cc5c3a9c80b..3391dae786ce 100644 --- a/mmv1/third_party/terraform/services/iam2/go/resource_iam_deny_policy_test.go +++ b/mmv1/third_party/terraform/services/iam2/go/resource_iam_deny_policy_test.go @@ -6,7 +6,7 @@ import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccIAM2DenyPolicy_iamDenyPolicyUpdate(t *testing.T) { @@ -76,7 +76,7 @@ func TestAccIAM2DenyPolicy_iamDenyPolicyFolderParent(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "parent"}, }, - { + { Config: testAccIAM2DenyPolicy_iamDenyPolicyFolderUpdate(context), }, { diff --git a/mmv1/third_party/terraform/services/iam2/resource_iam_access_boundary_policy_test.go b/mmv1/third_party/terraform/services/iam2/resource_iam_access_boundary_policy_test.go index a85e126b0112..c6c302303e6b 100644 --- a/mmv1/third_party/terraform/services/iam2/resource_iam_access_boundary_policy_test.go +++ b/mmv1/third_party/terraform/services/iam2/resource_iam_access_boundary_policy_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/iam2/resource_iam_deny_policy_test.go.erb b/mmv1/third_party/terraform/services/iam2/resource_iam_deny_policy_test.go.erb index 8d18239df3af..db090a8cee0b 100644 --- a/mmv1/third_party/terraform/services/iam2/resource_iam_deny_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/iam2/resource_iam_deny_policy_test.go.erb @@ -7,7 +7,7 @@ import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccIAM2DenyPolicy_iamDenyPolicyUpdate(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_provider_test.go.erb b/mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_provider_test.go.erb index f1c463ab1872..54d9a93723a7 100644 --- a/mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_provider_test.go.erb +++ b/mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_provider_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIAMBetaWorkloadIdentityPoolProvider_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_test.go.erb b/mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_test.go.erb index 2c7d03866f4a..44654411b179 100644 --- a/mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_test.go.erb +++ b/mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIAMBetaWorkloadIdentityPool_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/iambeta/go/data_source_iam_workload_identity_pool_provider_test.go.tmpl b/mmv1/third_party/terraform/services/iambeta/go/data_source_iam_workload_identity_pool_provider_test.go.tmpl index 2b9b50978b1f..73feb4b59d88 100644 --- a/mmv1/third_party/terraform/services/iambeta/go/data_source_iam_workload_identity_pool_provider_test.go.tmpl +++ b/mmv1/third_party/terraform/services/iambeta/go/data_source_iam_workload_identity_pool_provider_test.go.tmpl @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIAMBetaWorkloadIdentityPoolProvider_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/iambeta/go/data_source_iam_workload_identity_pool_test.go.tmpl b/mmv1/third_party/terraform/services/iambeta/go/data_source_iam_workload_identity_pool_test.go.tmpl index b34f354a625a..c1b0ea0c0ebb 100644 --- a/mmv1/third_party/terraform/services/iambeta/go/data_source_iam_workload_identity_pool_test.go.tmpl +++ b/mmv1/third_party/terraform/services/iambeta/go/data_source_iam_workload_identity_pool_test.go.tmpl @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIAMBetaWorkloadIdentityPool_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/iambeta/go/resource_iam_workload_identity_pool_provider_test.go.tmpl b/mmv1/third_party/terraform/services/iambeta/go/resource_iam_workload_identity_pool_provider_test.go.tmpl index 062850fb5b6e..3bf1357f820e 100644 --- a/mmv1/third_party/terraform/services/iambeta/go/resource_iam_workload_identity_pool_provider_test.go.tmpl +++ b/mmv1/third_party/terraform/services/iambeta/go/resource_iam_workload_identity_pool_provider_test.go.tmpl @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccIAMBetaWorkloadIdentityPoolProvider_aws(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/iambeta/go/resource_iam_workload_identity_pool_test.go.tmpl b/mmv1/third_party/terraform/services/iambeta/go/resource_iam_workload_identity_pool_test.go.tmpl index 1b6c10392ed9..e4643e7babc8 100644 --- a/mmv1/third_party/terraform/services/iambeta/go/resource_iam_workload_identity_pool_test.go.tmpl +++ b/mmv1/third_party/terraform/services/iambeta/go/resource_iam_workload_identity_pool_test.go.tmpl @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccIAMBetaWorkloadIdentityPool_full(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_provider_test.go.erb b/mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_provider_test.go.erb index 1826aab4d91d..9ec1c89adae1 100644 --- a/mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_provider_test.go.erb +++ b/mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_provider_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccIAMBetaWorkloadIdentityPoolProvider_aws(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_test.go.erb b/mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_test.go.erb index ea7158e15671..798976fa1d27 100644 --- a/mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_test.go.erb +++ b/mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccIAMBetaWorkloadIdentityPool_full(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/iamworkforcepool/go/resource_iam_workforce_pool_provider_test.go.tmpl b/mmv1/third_party/terraform/services/iamworkforcepool/go/resource_iam_workforce_pool_provider_test.go.tmpl index 08021a037f93..46c36f852671 100644 --- a/mmv1/third_party/terraform/services/iamworkforcepool/go/resource_iam_workforce_pool_provider_test.go.tmpl +++ b/mmv1/third_party/terraform/services/iamworkforcepool/go/resource_iam_workforce_pool_provider_test.go.tmpl @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/terraform" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/iamworkforcepool/go/resource_iam_workforce_pool_test.go b/mmv1/third_party/terraform/services/iamworkforcepool/go/resource_iam_workforce_pool_test.go index 62cf132b5941..91c6c5211e3d 100644 --- a/mmv1/third_party/terraform/services/iamworkforcepool/go/resource_iam_workforce_pool_test.go +++ b/mmv1/third_party/terraform/services/iamworkforcepool/go/resource_iam_workforce_pool_test.go @@ -1,10 +1,10 @@ package iamworkforcepool_test import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "testing" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "testing" ) func TestAccIAMWorkforcePoolWorkforcePool_full(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_provider_test.go.erb b/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_provider_test.go.erb index 8e79991b6cbb..d903cebeef7d 100644 --- a/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_provider_test.go.erb +++ b/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_provider_test.go.erb @@ -5,9 +5,9 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/terraform" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_test.go.erb b/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_test.go.erb index e256666c2a1c..f22333d69a5e 100644 --- a/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_test.go.erb +++ b/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_test.go.erb @@ -2,7 +2,7 @@ package iamworkforcepool_test import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/iap/data_source_iap_client_test.go b/mmv1/third_party/terraform/services/iap/data_source_iap_client_test.go index 9b5ff698a957..d1d8d2019c64 100644 --- a/mmv1/third_party/terraform/services/iap/data_source_iap_client_test.go +++ b/mmv1/third_party/terraform/services/iap/data_source_iap_client_test.go @@ -3,7 +3,7 @@ package iap_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/iap/resource_iap_brand_test.go b/mmv1/third_party/terraform/services/iap/resource_iap_brand_test.go index ee6764070c4d..cada2c783e32 100644 --- a/mmv1/third_party/terraform/services/iap/resource_iap_brand_test.go +++ b/mmv1/third_party/terraform/services/iap/resource_iap_brand_test.go @@ -3,7 +3,7 @@ package iap_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/iap/resource_iap_tunnel_dest_group_test.go b/mmv1/third_party/terraform/services/iap/resource_iap_tunnel_dest_group_test.go index c04063a75b71..33cc4c2974cc 100644 --- a/mmv1/third_party/terraform/services/iap/resource_iap_tunnel_dest_group_test.go +++ b/mmv1/third_party/terraform/services/iap/resource_iap_tunnel_dest_group_test.go @@ -3,7 +3,7 @@ package iap_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_config_test.go b/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_config_test.go index 0a1ab24b2986..f17719ca72ef 100644 --- a/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_config_test.go +++ b/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_config_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_default_supported_idp_config_test.go b/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_default_supported_idp_config_test.go index dde9dad8e620..d6ed2ec75cfd 100644 --- a/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_default_supported_idp_config_test.go +++ b/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_default_supported_idp_config_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_inbound_saml_config_test.go b/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_inbound_saml_config_test.go index d5d9c5f1b5ad..289d7e618f1c 100644 --- a/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_inbound_saml_config_test.go +++ b/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_inbound_saml_config_test.go @@ -3,7 +3,7 @@ package identityplatform_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_oauth_idp_config_test.go b/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_oauth_idp_config_test.go index d17d74af8724..5f5acccc273e 100644 --- a/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_oauth_idp_config_test.go +++ b/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_oauth_idp_config_test.go @@ -3,7 +3,7 @@ package identityplatform_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config_test.go b/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config_test.go index 214567e2fa52..bf00aea5e8f4 100644 --- a/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config_test.go +++ b/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config_test.go @@ -3,7 +3,7 @@ package identityplatform_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config_test.go b/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config_test.go index fc236ce8d698..df0f1ba763c1 100644 --- a/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config_test.go +++ b/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config_test.go @@ -3,7 +3,7 @@ package identityplatform_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config_test.go b/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config_test.go index ad2a00db1944..d47ec29578bf 100644 --- a/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config_test.go +++ b/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config_test.go @@ -3,7 +3,7 @@ package identityplatform_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_tenant_test.go b/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_tenant_test.go index fc1b462f7412..57d784dbb1ed 100644 --- a/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_tenant_test.go +++ b/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_tenant_test.go @@ -3,7 +3,7 @@ package identityplatform_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/integrationconnectors/resource_integration_connectors_connection_test.go b/mmv1/third_party/terraform/services/integrationconnectors/resource_integration_connectors_connection_test.go index 2551008583a2..15d96cf7c946 100644 --- a/mmv1/third_party/terraform/services/integrationconnectors/resource_integration_connectors_connection_test.go +++ b/mmv1/third_party/terraform/services/integrationconnectors/resource_integration_connectors_connection_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/integrationconnectors/resource_integration_connectors_endpoint_attachment_test.go b/mmv1/third_party/terraform/services/integrationconnectors/resource_integration_connectors_endpoint_attachment_test.go index 8f3b0d79a210..aedde000553c 100644 --- a/mmv1/third_party/terraform/services/integrationconnectors/resource_integration_connectors_endpoint_attachment_test.go +++ b/mmv1/third_party/terraform/services/integrationconnectors/resource_integration_connectors_endpoint_attachment_test.go @@ -3,7 +3,7 @@ package integrationconnectors_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/integrationconnectors/resource_integration_connectors_managed_zone_test.go b/mmv1/third_party/terraform/services/integrationconnectors/resource_integration_connectors_managed_zone_test.go index 439680016eb4..dbdeb07868e8 100644 --- a/mmv1/third_party/terraform/services/integrationconnectors/resource_integration_connectors_managed_zone_test.go +++ b/mmv1/third_party/terraform/services/integrationconnectors/resource_integration_connectors_managed_zone_test.go @@ -3,7 +3,7 @@ package integrationconnectors_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/integrations/resource_integrations_auth_config_test.go b/mmv1/third_party/terraform/services/integrations/resource_integrations_auth_config_test.go index f0eff0c1a50e..387935e5751e 100644 --- a/mmv1/third_party/terraform/services/integrations/resource_integrations_auth_config_test.go +++ b/mmv1/third_party/terraform/services/integrations/resource_integrations_auth_config_test.go @@ -3,7 +3,7 @@ package integrations_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/kms/data_source_google_kms_crypto_key_test.go b/mmv1/third_party/terraform/services/kms/data_source_google_kms_crypto_key_test.go index eb6d8334d97a..024c63d51842 100644 --- a/mmv1/third_party/terraform/services/kms/data_source_google_kms_crypto_key_test.go +++ b/mmv1/third_party/terraform/services/kms/data_source_google_kms_crypto_key_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/kms/data_source_google_kms_crypto_key_version_test.go b/mmv1/third_party/terraform/services/kms/data_source_google_kms_crypto_key_version_test.go index fbb464c6f0d3..8af020cffbed 100644 --- a/mmv1/third_party/terraform/services/kms/data_source_google_kms_crypto_key_version_test.go +++ b/mmv1/third_party/terraform/services/kms/data_source_google_kms_crypto_key_version_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/kms/data_source_google_kms_crypto_keys_test.go b/mmv1/third_party/terraform/services/kms/data_source_google_kms_crypto_keys_test.go index bb0fcf78ab9d..1aa5025bbd41 100644 --- a/mmv1/third_party/terraform/services/kms/data_source_google_kms_crypto_keys_test.go +++ b/mmv1/third_party/terraform/services/kms/data_source_google_kms_crypto_keys_test.go @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/kms/data_source_google_kms_key_ring_test.go b/mmv1/third_party/terraform/services/kms/data_source_google_kms_key_ring_test.go index 92e0565ee144..0abfb6b83b85 100644 --- a/mmv1/third_party/terraform/services/kms/data_source_google_kms_key_ring_test.go +++ b/mmv1/third_party/terraform/services/kms/data_source_google_kms_key_ring_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/kms/data_source_google_kms_key_rings_test.go b/mmv1/third_party/terraform/services/kms/data_source_google_kms_key_rings_test.go index 779cd0cc076a..c7cf30b87646 100644 --- a/mmv1/third_party/terraform/services/kms/data_source_google_kms_key_rings_test.go +++ b/mmv1/third_party/terraform/services/kms/data_source_google_kms_key_rings_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/kms/data_source_google_kms_secret_asymmetric_test.go.erb b/mmv1/third_party/terraform/services/kms/data_source_google_kms_secret_asymmetric_test.go.erb index e1e449cc86cf..fec62d1eb443 100644 --- a/mmv1/third_party/terraform/services/kms/data_source_google_kms_secret_asymmetric_test.go.erb +++ b/mmv1/third_party/terraform/services/kms/data_source_google_kms_secret_asymmetric_test.go.erb @@ -15,8 +15,8 @@ import ( "log" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/kms/data_source_google_kms_secret_ciphertext_test.go b/mmv1/third_party/terraform/services/kms/data_source_google_kms_secret_ciphertext_test.go index e23b3d197332..1688ccd8a682 100644 --- a/mmv1/third_party/terraform/services/kms/data_source_google_kms_secret_ciphertext_test.go +++ b/mmv1/third_party/terraform/services/kms/data_source_google_kms_secret_ciphertext_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/kms/data_source_google_kms_secret_test.go b/mmv1/third_party/terraform/services/kms/data_source_google_kms_secret_test.go index 1122d55f9ebd..e039d1ac752e 100644 --- a/mmv1/third_party/terraform/services/kms/data_source_google_kms_secret_test.go +++ b/mmv1/third_party/terraform/services/kms/data_source_google_kms_secret_test.go @@ -6,8 +6,8 @@ import ( "log" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/kms" diff --git a/mmv1/third_party/terraform/services/kms/go/data_source_google_kms_secret_asymmetric_test.go.tmpl b/mmv1/third_party/terraform/services/kms/go/data_source_google_kms_secret_asymmetric_test.go.tmpl index e27f012190d4..a9141acc64c2 100644 --- a/mmv1/third_party/terraform/services/kms/go/data_source_google_kms_secret_asymmetric_test.go.tmpl +++ b/mmv1/third_party/terraform/services/kms/go/data_source_google_kms_secret_asymmetric_test.go.tmpl @@ -14,8 +14,8 @@ import ( "log" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/kms/go/iam_kms_crypto_key_test.go.tmpl b/mmv1/third_party/terraform/services/kms/go/iam_kms_crypto_key_test.go.tmpl index 29708dc3ba80..b31446773c88 100644 --- a/mmv1/third_party/terraform/services/kms/go/iam_kms_crypto_key_test.go.tmpl +++ b/mmv1/third_party/terraform/services/kms/go/iam_kms_crypto_key_test.go.tmpl @@ -6,8 +6,8 @@ import ( "sort" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/kms/go/iam_kms_key_ring_test.go.tmpl b/mmv1/third_party/terraform/services/kms/go/iam_kms_key_ring_test.go.tmpl index 24ea402262c5..ce234d262722 100644 --- a/mmv1/third_party/terraform/services/kms/go/iam_kms_key_ring_test.go.tmpl +++ b/mmv1/third_party/terraform/services/kms/go/iam_kms_key_ring_test.go.tmpl @@ -6,8 +6,8 @@ import ( "sort" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/kms/iam_kms_crypto_key_test.go.erb b/mmv1/third_party/terraform/services/kms/iam_kms_crypto_key_test.go.erb index 5033f0a2f084..3129c52301c7 100644 --- a/mmv1/third_party/terraform/services/kms/iam_kms_crypto_key_test.go.erb +++ b/mmv1/third_party/terraform/services/kms/iam_kms_crypto_key_test.go.erb @@ -7,8 +7,8 @@ import ( "sort" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/kms/iam_kms_key_ring_test.go.erb b/mmv1/third_party/terraform/services/kms/iam_kms_key_ring_test.go.erb index 90697935d859..00b836b67488 100644 --- a/mmv1/third_party/terraform/services/kms/iam_kms_key_ring_test.go.erb +++ b/mmv1/third_party/terraform/services/kms/iam_kms_key_ring_test.go.erb @@ -7,8 +7,8 @@ import ( "sort" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/kms/resource_kms_crypto_key_test.go b/mmv1/third_party/terraform/services/kms/resource_kms_crypto_key_test.go index e369c69ff61e..1d2488d15140 100644 --- a/mmv1/third_party/terraform/services/kms/resource_kms_crypto_key_test.go +++ b/mmv1/third_party/terraform/services/kms/resource_kms_crypto_key_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/services/kms" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestCryptoKeyIdParsing(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/kms/resource_kms_ekm_connection_test.go b/mmv1/third_party/terraform/services/kms/resource_kms_ekm_connection_test.go index 6c310be69d78..d5da41607ecb 100644 --- a/mmv1/third_party/terraform/services/kms/resource_kms_ekm_connection_test.go +++ b/mmv1/third_party/terraform/services/kms/resource_kms_ekm_connection_test.go @@ -3,7 +3,7 @@ package kms_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/kms/resource_kms_key_ring_import_job_test.go b/mmv1/third_party/terraform/services/kms/resource_kms_key_ring_import_job_test.go index 3a094947d9c7..47d7ffaaadac 100644 --- a/mmv1/third_party/terraform/services/kms/resource_kms_key_ring_import_job_test.go +++ b/mmv1/third_party/terraform/services/kms/resource_kms_key_ring_import_job_test.go @@ -3,7 +3,7 @@ package kms_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/kms/resource_kms_key_ring_test.go b/mmv1/third_party/terraform/services/kms/resource_kms_key_ring_test.go index 992eed1613b4..053b10d7e6dc 100644 --- a/mmv1/third_party/terraform/services/kms/resource_kms_key_ring_test.go +++ b/mmv1/third_party/terraform/services/kms/resource_kms_key_ring_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/kms/resource_kms_secret_ciphertext_test.go b/mmv1/third_party/terraform/services/kms/resource_kms_secret_ciphertext_test.go index e7f347255e9c..75795e7100bf 100644 --- a/mmv1/third_party/terraform/services/kms/resource_kms_secret_ciphertext_test.go +++ b/mmv1/third_party/terraform/services/kms/resource_kms_secret_ciphertext_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/cloudkms/v1" ) diff --git a/mmv1/third_party/terraform/services/logging/data_source_google_logging_folder_settings_test.go b/mmv1/third_party/terraform/services/logging/data_source_google_logging_folder_settings_test.go index fb2595b2eb9f..d56c11e3ceaa 100644 --- a/mmv1/third_party/terraform/services/logging/data_source_google_logging_folder_settings_test.go +++ b/mmv1/third_party/terraform/services/logging/data_source_google_logging_folder_settings_test.go @@ -3,7 +3,7 @@ package logging_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/logging/data_source_google_logging_organization_settings_test.go b/mmv1/third_party/terraform/services/logging/data_source_google_logging_organization_settings_test.go index 23c003dcb501..052e17e8d572 100644 --- a/mmv1/third_party/terraform/services/logging/data_source_google_logging_organization_settings_test.go +++ b/mmv1/third_party/terraform/services/logging/data_source_google_logging_organization_settings_test.go @@ -3,7 +3,7 @@ package logging_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/logging/data_source_google_logging_project_cmek_settings_test.go b/mmv1/third_party/terraform/services/logging/data_source_google_logging_project_cmek_settings_test.go index 9fde4c161077..ddf6f770a40e 100644 --- a/mmv1/third_party/terraform/services/logging/data_source_google_logging_project_cmek_settings_test.go +++ b/mmv1/third_party/terraform/services/logging/data_source_google_logging_project_cmek_settings_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/logging/data_source_google_logging_project_settings_test.go b/mmv1/third_party/terraform/services/logging/data_source_google_logging_project_settings_test.go index 22f088030a28..c962da0de36b 100644 --- a/mmv1/third_party/terraform/services/logging/data_source_google_logging_project_settings_test.go +++ b/mmv1/third_party/terraform/services/logging/data_source_google_logging_project_settings_test.go @@ -3,7 +3,7 @@ package logging_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/logging/data_source_google_logging_sink_test.go b/mmv1/third_party/terraform/services/logging/data_source_google_logging_sink_test.go index 2cefb0789866..9e128983263b 100644 --- a/mmv1/third_party/terraform/services/logging/data_source_google_logging_sink_test.go +++ b/mmv1/third_party/terraform/services/logging/data_source_google_logging_sink_test.go @@ -3,7 +3,7 @@ package logging_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/logging" diff --git a/mmv1/third_party/terraform/services/logging/resource_logging_billing_account_exclusion_test.go b/mmv1/third_party/terraform/services/logging/resource_logging_billing_account_exclusion_test.go index 041f4cf67a80..cb37f87b9c35 100644 --- a/mmv1/third_party/terraform/services/logging/resource_logging_billing_account_exclusion_test.go +++ b/mmv1/third_party/terraform/services/logging/resource_logging_billing_account_exclusion_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/logging/resource_logging_billing_account_sink_test.go b/mmv1/third_party/terraform/services/logging/resource_logging_billing_account_sink_test.go index 900abd89300e..fe91f0368c63 100644 --- a/mmv1/third_party/terraform/services/logging/resource_logging_billing_account_sink_test.go +++ b/mmv1/third_party/terraform/services/logging/resource_logging_billing_account_sink_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/logging/resource_logging_bucket_config_test.go b/mmv1/third_party/terraform/services/logging/resource_logging_bucket_config_test.go index aa5b229e8db6..753e8333ff4c 100644 --- a/mmv1/third_party/terraform/services/logging/resource_logging_bucket_config_test.go +++ b/mmv1/third_party/terraform/services/logging/resource_logging_bucket_config_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/logging/resource_logging_folder_exclusion_test.go b/mmv1/third_party/terraform/services/logging/resource_logging_folder_exclusion_test.go index 52d770106ba4..34af9a5cfaf4 100644 --- a/mmv1/third_party/terraform/services/logging/resource_logging_folder_exclusion_test.go +++ b/mmv1/third_party/terraform/services/logging/resource_logging_folder_exclusion_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/logging" diff --git a/mmv1/third_party/terraform/services/logging/resource_logging_folder_settings_test.go b/mmv1/third_party/terraform/services/logging/resource_logging_folder_settings_test.go index e88dc0d529a5..39128f267562 100644 --- a/mmv1/third_party/terraform/services/logging/resource_logging_folder_settings_test.go +++ b/mmv1/third_party/terraform/services/logging/resource_logging_folder_settings_test.go @@ -3,7 +3,7 @@ package logging_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/logging/resource_logging_folder_sink_test.go b/mmv1/third_party/terraform/services/logging/resource_logging_folder_sink_test.go index f57366e98063..72e20a264f0d 100644 --- a/mmv1/third_party/terraform/services/logging/resource_logging_folder_sink_test.go +++ b/mmv1/third_party/terraform/services/logging/resource_logging_folder_sink_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/logging/v2" ) diff --git a/mmv1/third_party/terraform/services/logging/resource_logging_log_view_test.go b/mmv1/third_party/terraform/services/logging/resource_logging_log_view_test.go index a319ecd32d45..c64c12a0fd44 100644 --- a/mmv1/third_party/terraform/services/logging/resource_logging_log_view_test.go +++ b/mmv1/third_party/terraform/services/logging/resource_logging_log_view_test.go @@ -3,7 +3,7 @@ package logging_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/logging/resource_logging_metric_test.go b/mmv1/third_party/terraform/services/logging/resource_logging_metric_test.go index a2281220c622..c58c9bf8511f 100644 --- a/mmv1/third_party/terraform/services/logging/resource_logging_metric_test.go +++ b/mmv1/third_party/terraform/services/logging/resource_logging_metric_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/logging/resource_logging_organization_exclusion_test.go b/mmv1/third_party/terraform/services/logging/resource_logging_organization_exclusion_test.go index 0c3855a1e09c..508cb9477a12 100644 --- a/mmv1/third_party/terraform/services/logging/resource_logging_organization_exclusion_test.go +++ b/mmv1/third_party/terraform/services/logging/resource_logging_organization_exclusion_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/logging/resource_logging_organization_settings_test.go b/mmv1/third_party/terraform/services/logging/resource_logging_organization_settings_test.go index ce2896c4e181..307b4c3d9f1e 100644 --- a/mmv1/third_party/terraform/services/logging/resource_logging_organization_settings_test.go +++ b/mmv1/third_party/terraform/services/logging/resource_logging_organization_settings_test.go @@ -3,7 +3,7 @@ package logging_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/logging/resource_logging_organization_sink_test.go b/mmv1/third_party/terraform/services/logging/resource_logging_organization_sink_test.go index b392fa4dee53..1a49c8fb686b 100644 --- a/mmv1/third_party/terraform/services/logging/resource_logging_organization_sink_test.go +++ b/mmv1/third_party/terraform/services/logging/resource_logging_organization_sink_test.go @@ -6,8 +6,8 @@ import ( "strconv" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/logging/resource_logging_project_exclusion_test.go b/mmv1/third_party/terraform/services/logging/resource_logging_project_exclusion_test.go index 34304a8ffa87..1d62623569f1 100644 --- a/mmv1/third_party/terraform/services/logging/resource_logging_project_exclusion_test.go +++ b/mmv1/third_party/terraform/services/logging/resource_logging_project_exclusion_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/logging/resource_logging_project_sink_test.go b/mmv1/third_party/terraform/services/logging/resource_logging_project_sink_test.go index 81404e26ecf6..b6482366c698 100644 --- a/mmv1/third_party/terraform/services/logging/resource_logging_project_sink_test.go +++ b/mmv1/third_party/terraform/services/logging/resource_logging_project_sink_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/looker/resource_looker_instance_test.go b/mmv1/third_party/terraform/services/looker/resource_looker_instance_test.go index 07748a64255d..93cc7260b8e6 100644 --- a/mmv1/third_party/terraform/services/looker/resource_looker_instance_test.go +++ b/mmv1/third_party/terraform/services/looker/resource_looker_instance_test.go @@ -3,7 +3,7 @@ package looker_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/managedkafka/go/resource_managed_kafka_cluster_test.go.tmpl b/mmv1/third_party/terraform/services/managedkafka/go/resource_managed_kafka_cluster_test.go.tmpl index 3b4edebc8d56..ffc95546c2c4 100644 --- a/mmv1/third_party/terraform/services/managedkafka/go/resource_managed_kafka_cluster_test.go.tmpl +++ b/mmv1/third_party/terraform/services/managedkafka/go/resource_managed_kafka_cluster_test.go.tmpl @@ -4,7 +4,7 @@ package managedkafka_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/managedkafka/go/resource_managed_kafka_topic_test.go.tmpl b/mmv1/third_party/terraform/services/managedkafka/go/resource_managed_kafka_topic_test.go.tmpl index b739ada2c4d6..49cb6c23f4fc 100644 --- a/mmv1/third_party/terraform/services/managedkafka/go/resource_managed_kafka_topic_test.go.tmpl +++ b/mmv1/third_party/terraform/services/managedkafka/go/resource_managed_kafka_topic_test.go.tmpl @@ -4,7 +4,7 @@ package managedkafka_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/managedkafka/resource_managed_kafka_cluster_test.go.erb b/mmv1/third_party/terraform/services/managedkafka/resource_managed_kafka_cluster_test.go.erb index abc2cc96b6bb..707ebeec97ce 100644 --- a/mmv1/third_party/terraform/services/managedkafka/resource_managed_kafka_cluster_test.go.erb +++ b/mmv1/third_party/terraform/services/managedkafka/resource_managed_kafka_cluster_test.go.erb @@ -5,7 +5,7 @@ package managedkafka_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/managedkafka/resource_managed_kafka_topic_test.go.erb b/mmv1/third_party/terraform/services/managedkafka/resource_managed_kafka_topic_test.go.erb index 015e5e177c45..09674397873f 100644 --- a/mmv1/third_party/terraform/services/managedkafka/resource_managed_kafka_topic_test.go.erb +++ b/mmv1/third_party/terraform/services/managedkafka/resource_managed_kafka_topic_test.go.erb @@ -5,7 +5,7 @@ package managedkafka_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/memcache/resource_memcache_instance_test.go b/mmv1/third_party/terraform/services/memcache/resource_memcache_instance_test.go index c28c75a7a191..5abceeea37b9 100644 --- a/mmv1/third_party/terraform/services/memcache/resource_memcache_instance_test.go +++ b/mmv1/third_party/terraform/services/memcache/resource_memcache_instance_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/migrationcenter/resource_migration_center_group_test.go b/mmv1/third_party/terraform/services/migrationcenter/resource_migration_center_group_test.go index eefd1b0d02c9..585b8f7cb471 100644 --- a/mmv1/third_party/terraform/services/migrationcenter/resource_migration_center_group_test.go +++ b/mmv1/third_party/terraform/services/migrationcenter/resource_migration_center_group_test.go @@ -3,7 +3,7 @@ package migrationcenter_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/migrationcenter/resource_migration_center_preference_set_test.go b/mmv1/third_party/terraform/services/migrationcenter/resource_migration_center_preference_set_test.go index 209fdbe641ed..96d80b6620fd 100644 --- a/mmv1/third_party/terraform/services/migrationcenter/resource_migration_center_preference_set_test.go +++ b/mmv1/third_party/terraform/services/migrationcenter/resource_migration_center_preference_set_test.go @@ -3,7 +3,7 @@ package migrationcenter_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/monitoring/data_source_google_monitoring_uptime_check_ips_test.go b/mmv1/third_party/terraform/services/monitoring/data_source_google_monitoring_uptime_check_ips_test.go index 480212671dcf..c9e9f6016d11 100644 --- a/mmv1/third_party/terraform/services/monitoring/data_source_google_monitoring_uptime_check_ips_test.go +++ b/mmv1/third_party/terraform/services/monitoring/data_source_google_monitoring_uptime_check_ips_test.go @@ -4,7 +4,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/monitoring/data_source_monitoring_notification_channel_test.go b/mmv1/third_party/terraform/services/monitoring/data_source_monitoring_notification_channel_test.go index 8d79ca5fbfd7..f8a52ffd9782 100644 --- a/mmv1/third_party/terraform/services/monitoring/data_source_monitoring_notification_channel_test.go +++ b/mmv1/third_party/terraform/services/monitoring/data_source_monitoring_notification_channel_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceGoogleMonitoringNotificationChannel_byDisplayName(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/monitoring/data_source_monitoring_service_test.go b/mmv1/third_party/terraform/services/monitoring/data_source_monitoring_service_test.go index 7eab715d5e52..383778307d2b 100644 --- a/mmv1/third_party/terraform/services/monitoring/data_source_monitoring_service_test.go +++ b/mmv1/third_party/terraform/services/monitoring/data_source_monitoring_service_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/monitoring/resource_monitoring_alert_policy_test.go b/mmv1/third_party/terraform/services/monitoring/resource_monitoring_alert_policy_test.go index 2cf6d3c5194c..a37a982acb05 100644 --- a/mmv1/third_party/terraform/services/monitoring/resource_monitoring_alert_policy_test.go +++ b/mmv1/third_party/terraform/services/monitoring/resource_monitoring_alert_policy_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/monitoring/resource_monitoring_dashboard_test.go b/mmv1/third_party/terraform/services/monitoring/resource_monitoring_dashboard_test.go index 0729ce06c1ed..aaefae43bc7e 100644 --- a/mmv1/third_party/terraform/services/monitoring/resource_monitoring_dashboard_test.go +++ b/mmv1/third_party/terraform/services/monitoring/resource_monitoring_dashboard_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/monitoring/resource_monitoring_group_test.go b/mmv1/third_party/terraform/services/monitoring/resource_monitoring_group_test.go index 2e9391e299a6..777c3d708d3b 100644 --- a/mmv1/third_party/terraform/services/monitoring/resource_monitoring_group_test.go +++ b/mmv1/third_party/terraform/services/monitoring/resource_monitoring_group_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/monitoring/resource_monitoring_metric_descriptor_test.go b/mmv1/third_party/terraform/services/monitoring/resource_monitoring_metric_descriptor_test.go index 53ad4f17478e..530ceab09f12 100644 --- a/mmv1/third_party/terraform/services/monitoring/resource_monitoring_metric_descriptor_test.go +++ b/mmv1/third_party/terraform/services/monitoring/resource_monitoring_metric_descriptor_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/monitoring/resource_monitoring_monitored_project_test.go b/mmv1/third_party/terraform/services/monitoring/resource_monitoring_monitored_project_test.go index 9d6f0e9de1c9..1b216489bf18 100644 --- a/mmv1/third_party/terraform/services/monitoring/resource_monitoring_monitored_project_test.go +++ b/mmv1/third_party/terraform/services/monitoring/resource_monitoring_monitored_project_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/monitoring" diff --git a/mmv1/third_party/terraform/services/monitoring/resource_monitoring_notification_channel_test.go b/mmv1/third_party/terraform/services/monitoring/resource_monitoring_notification_channel_test.go index 0520cf546a9d..a1732f47b31c 100644 --- a/mmv1/third_party/terraform/services/monitoring/resource_monitoring_notification_channel_test.go +++ b/mmv1/third_party/terraform/services/monitoring/resource_monitoring_notification_channel_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/monitoring/resource_monitoring_service_test.go b/mmv1/third_party/terraform/services/monitoring/resource_monitoring_service_test.go index 00aac03c2e2c..a3a3eb1e36ca 100644 --- a/mmv1/third_party/terraform/services/monitoring/resource_monitoring_service_test.go +++ b/mmv1/third_party/terraform/services/monitoring/resource_monitoring_service_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/monitoring/resource_monitoring_slo_test.go b/mmv1/third_party/terraform/services/monitoring/resource_monitoring_slo_test.go index d81a4e82f6ef..689c2610ab0c 100644 --- a/mmv1/third_party/terraform/services/monitoring/resource_monitoring_slo_test.go +++ b/mmv1/third_party/terraform/services/monitoring/resource_monitoring_slo_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/monitoring/resource_monitoring_uptime_check_config_test.go b/mmv1/third_party/terraform/services/monitoring/resource_monitoring_uptime_check_config_test.go index 213d6d1a87d1..695c659648b3 100644 --- a/mmv1/third_party/terraform/services/monitoring/resource_monitoring_uptime_check_config_test.go +++ b/mmv1/third_party/terraform/services/monitoring/resource_monitoring_uptime_check_config_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/netapp/resource_netapp_active_directory_test.go b/mmv1/third_party/terraform/services/netapp/resource_netapp_active_directory_test.go index 3bc163628ad5..cebdcdd2ec9e 100644 --- a/mmv1/third_party/terraform/services/netapp/resource_netapp_active_directory_test.go +++ b/mmv1/third_party/terraform/services/netapp/resource_netapp_active_directory_test.go @@ -3,7 +3,7 @@ package netapp_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/netapp/resource_netapp_backup_policy_test.go b/mmv1/third_party/terraform/services/netapp/resource_netapp_backup_policy_test.go index 7c12533b21e7..181b39bb949f 100644 --- a/mmv1/third_party/terraform/services/netapp/resource_netapp_backup_policy_test.go +++ b/mmv1/third_party/terraform/services/netapp/resource_netapp_backup_policy_test.go @@ -3,7 +3,7 @@ package netapp_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/netapp/resource_netapp_backup_test.go b/mmv1/third_party/terraform/services/netapp/resource_netapp_backup_test.go index d12267b66a17..26da78976abf 100644 --- a/mmv1/third_party/terraform/services/netapp/resource_netapp_backup_test.go +++ b/mmv1/third_party/terraform/services/netapp/resource_netapp_backup_test.go @@ -6,7 +6,7 @@ package netapp_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/netapp/resource_netapp_backup_vault_test.go b/mmv1/third_party/terraform/services/netapp/resource_netapp_backup_vault_test.go index 68b610c33fa5..4851123c786e 100644 --- a/mmv1/third_party/terraform/services/netapp/resource_netapp_backup_vault_test.go +++ b/mmv1/third_party/terraform/services/netapp/resource_netapp_backup_vault_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/netapp/resource_netapp_kmsconfig_test.go b/mmv1/third_party/terraform/services/netapp/resource_netapp_kmsconfig_test.go index 5bd73fde3264..51fcefac8cd7 100644 --- a/mmv1/third_party/terraform/services/netapp/resource_netapp_kmsconfig_test.go +++ b/mmv1/third_party/terraform/services/netapp/resource_netapp_kmsconfig_test.go @@ -6,7 +6,7 @@ package netapp_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/netapp/resource_netapp_storage_pool_test.go.erb b/mmv1/third_party/terraform/services/netapp/resource_netapp_storage_pool_test.go.erb index 4a6a5b18218e..a165145b1910 100644 --- a/mmv1/third_party/terraform/services/netapp/resource_netapp_storage_pool_test.go.erb +++ b/mmv1/third_party/terraform/services/netapp/resource_netapp_storage_pool_test.go.erb @@ -5,10 +5,10 @@ import ( "testing" <% unless version == 'ga' -%> "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/terraform" <% end -%> - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/netapp/resource_netapp_volume_replication_test.go b/mmv1/third_party/terraform/services/netapp/resource_netapp_volume_replication_test.go index e663c41e7274..bd612eba155d 100644 --- a/mmv1/third_party/terraform/services/netapp/resource_netapp_volume_replication_test.go +++ b/mmv1/third_party/terraform/services/netapp/resource_netapp_volume_replication_test.go @@ -6,7 +6,7 @@ package netapp_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/netapp/resource_netapp_volume_snapshot_test.go b/mmv1/third_party/terraform/services/netapp/resource_netapp_volume_snapshot_test.go index 7198d08202ea..f1ae861a60c7 100644 --- a/mmv1/third_party/terraform/services/netapp/resource_netapp_volume_snapshot_test.go +++ b/mmv1/third_party/terraform/services/netapp/resource_netapp_volume_snapshot_test.go @@ -6,7 +6,7 @@ package netapp_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/netapp/resource_netapp_volume_test.go b/mmv1/third_party/terraform/services/netapp/resource_netapp_volume_test.go index 8b4d0b06ec07..84c3070c51b7 100644 --- a/mmv1/third_party/terraform/services/netapp/resource_netapp_volume_test.go +++ b/mmv1/third_party/terraform/services/netapp/resource_netapp_volume_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/services/netapp" "github.com/hashicorp/terraform-provider-google/google/acctest" diff --git a/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_hub_test.go b/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_hub_test.go index 82acb1ea2cc8..1f7566d2ac81 100644 --- a/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_hub_test.go +++ b/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_hub_test.go @@ -6,7 +6,7 @@ package networkconnectivity_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_internal_range_test.go b/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_internal_range_test.go index ebd007ae9343..24e7b5fc6def 100644 --- a/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_internal_range_test.go +++ b/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_internal_range_test.go @@ -1,7 +1,7 @@ package networkconnectivity_test import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "testing" ) diff --git a/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_service_connection_policies_test.go b/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_service_connection_policies_test.go index 0894eeab35d5..2ce8136a7fdd 100644 --- a/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_service_connection_policies_test.go +++ b/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_service_connection_policies_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/networkmanagement/resource_network_management_connectivity_test_resource_test.go b/mmv1/third_party/terraform/services/networkmanagement/resource_network_management_connectivity_test_resource_test.go index ffe1d00f92c0..03589df2e11d 100644 --- a/mmv1/third_party/terraform/services/networkmanagement/resource_network_management_connectivity_test_resource_test.go +++ b/mmv1/third_party/terraform/services/networkmanagement/resource_network_management_connectivity_test_resource_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_authorization_policy_test.go.tmpl b/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_authorization_policy_test.go.tmpl index 808c5ba38b57..3baa661bdd4f 100644 --- a/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_authorization_policy_test.go.tmpl +++ b/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_authorization_policy_test.go.tmpl @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_client_tls_policy_test.go.tmpl b/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_client_tls_policy_test.go.tmpl index 0cda14504a41..e32616174019 100644 --- a/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_client_tls_policy_test.go.tmpl +++ b/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_client_tls_policy_test.go.tmpl @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_firewall_endpoint_association_test.go.tmpl b/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_firewall_endpoint_association_test.go.tmpl index 0cc684a4ce64..7e4f7a699941 100644 --- a/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_firewall_endpoint_association_test.go.tmpl +++ b/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_firewall_endpoint_association_test.go.tmpl @@ -6,8 +6,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_firewall_endpoint_test.go.tmpl b/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_firewall_endpoint_test.go.tmpl index e50b644a141a..936dc71dd20e 100644 --- a/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_firewall_endpoint_test.go.tmpl +++ b/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_firewall_endpoint_test.go.tmpl @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_security_profile_group_test.go b/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_security_profile_group_test.go index f7eddcee9826..cdeeb227b870 100644 --- a/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_security_profile_group_test.go +++ b/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_security_profile_group_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_security_profile_test.go b/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_security_profile_test.go index 70afec07b0e6..4cfd9fb4fe4d 100644 --- a/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_security_profile_test.go +++ b/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_security_profile_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_server_tls_policy_test.go.tmpl b/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_server_tls_policy_test.go.tmpl index 838d84ccd3b9..37eb9d94c01b 100644 --- a/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_server_tls_policy_test.go.tmpl +++ b/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_server_tls_policy_test.go.tmpl @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_tls_inspection_policy_test.go.tmpl b/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_tls_inspection_policy_test.go.tmpl index c6224fa2d480..68f5629089b9 100644 --- a/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_tls_inspection_policy_test.go.tmpl +++ b/mmv1/third_party/terraform/services/networksecurity/go/resource_network_security_tls_inspection_policy_test.go.tmpl @@ -4,7 +4,7 @@ package networksecurity_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_address_group_test.go b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_address_group_test.go index 15d35521d161..71df8852854b 100644 --- a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_address_group_test.go +++ b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_address_group_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_authorization_policy_test.go.erb b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_authorization_policy_test.go.erb index 2d1c4af67055..3e907b67a9ac 100644 --- a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_authorization_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_authorization_policy_test.go.erb @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_client_tls_policy_test.go.erb b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_client_tls_policy_test.go.erb index d91d8e030965..3d2c080bc1c2 100644 --- a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_client_tls_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_client_tls_policy_test.go.erb @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_firewall_endpoint_association_test.go.erb b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_firewall_endpoint_association_test.go.erb index 2f839f11a532..1d8d4a5d4913 100644 --- a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_firewall_endpoint_association_test.go.erb +++ b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_firewall_endpoint_association_test.go.erb @@ -7,8 +7,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_firewall_endpoint_test.go.erb b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_firewall_endpoint_test.go.erb index 6d66a1e10261..31e0a38c6adc 100644 --- a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_firewall_endpoint_test.go.erb +++ b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_firewall_endpoint_test.go.erb @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_gateway_security_policy_rule_test.go b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_gateway_security_policy_rule_test.go index 44b7bf54a0cd..7fec9459f1e6 100644 --- a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_gateway_security_policy_rule_test.go +++ b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_gateway_security_policy_rule_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkSecurityGatewaySecurityPolicyRule_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_gateway_security_policy_test.go b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_gateway_security_policy_test.go index ab4ca43b6647..2582428544f1 100644 --- a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_gateway_security_policy_test.go +++ b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_gateway_security_policy_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkSecurityGatewaySecurityPolicy_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_group_test.go.erb b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_group_test.go.erb index f1b9957e9087..2c14c1686940 100644 --- a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_group_test.go.erb +++ b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_group_test.go.erb @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_test.go.erb b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_test.go.erb index 01cf9b3726aa..869ac218c03d 100644 --- a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_test.go.erb +++ b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_test.go.erb @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_server_tls_policy_test.go.erb b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_server_tls_policy_test.go.erb index f1000f4665de..ee4b8e8b18a1 100644 --- a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_server_tls_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_server_tls_policy_test.go.erb @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_tls_inspection_policy_test.go.erb b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_tls_inspection_policy_test.go.erb index 996e26d2beba..946458582802 100644 --- a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_tls_inspection_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_tls_inspection_policy_test.go.erb @@ -5,7 +5,7 @@ package networksecurity_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_url_lists_test.go b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_url_lists_test.go index 94d36944c911..f383b77b01e7 100644 --- a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_url_lists_test.go +++ b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_url_lists_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkSecurityUrlLists_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_endpoint_policy_test.go.tmpl b/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_endpoint_policy_test.go.tmpl index d3aa003ac92b..1113312304aa 100644 --- a/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_endpoint_policy_test.go.tmpl +++ b/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_endpoint_policy_test.go.tmpl @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesEndpointPolicy_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_grpc_route_test.go.tmpl b/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_grpc_route_test.go.tmpl index f37749eb11e8..7176c2eea67e 100644 --- a/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_grpc_route_test.go.tmpl +++ b/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_grpc_route_test.go.tmpl @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_http_route_test.go.tmpl b/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_http_route_test.go.tmpl index 678d10758e8f..a4f80d3747d1 100644 --- a/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_http_route_test.go.tmpl +++ b/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_http_route_test.go.tmpl @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesHttpRoute_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_mesh_test.go.tmpl b/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_mesh_test.go.tmpl index 8db8475759c6..98a0b1aa1ecf 100644 --- a/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_mesh_test.go.tmpl +++ b/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_mesh_test.go.tmpl @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesMesh_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_service_binding_test.go.tmpl b/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_service_binding_test.go.tmpl index b9ad131be383..b59fcffb7046 100644 --- a/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_service_binding_test.go.tmpl +++ b/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_service_binding_test.go.tmpl @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesServiceBinding_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_service_lb_policies_test.go.tmpl b/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_service_lb_policies_test.go.tmpl index e592e521843f..bc0b35a6bcc0 100644 --- a/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_service_lb_policies_test.go.tmpl +++ b/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_service_lb_policies_test.go.tmpl @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesLBPolicies_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_tcp_route_test.go.tmpl b/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_tcp_route_test.go.tmpl index 672cec100e97..916f326ac9d0 100644 --- a/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_tcp_route_test.go.tmpl +++ b/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_tcp_route_test.go.tmpl @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesTcpRoute_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_tls_route_test.go.tmpl b/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_tls_route_test.go.tmpl index 11896ecb4b40..24e26cf2db24 100644 --- a/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_tls_route_test.go.tmpl +++ b/mmv1/third_party/terraform/services/networkservices/go/resource_network_services_tls_route_test.go.tmpl @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesTlsRoute_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_edge_cache_keyset_test.go b/mmv1/third_party/terraform/services/networkservices/resource_network_services_edge_cache_keyset_test.go index 56b1cd8bfcd3..d0748ce3f869 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_edge_cache_keyset_test.go +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_edge_cache_keyset_test.go @@ -3,7 +3,7 @@ package networkservices_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_edge_cache_origin_test.go b/mmv1/third_party/terraform/services/networkservices/resource_network_services_edge_cache_origin_test.go index 6ad86ecb883f..524969b82a63 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_edge_cache_origin_test.go +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_edge_cache_origin_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_edge_cache_service_test.go b/mmv1/third_party/terraform/services/networkservices/resource_network_services_edge_cache_service_test.go index 651411aba0ff..350520a1c357 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_edge_cache_service_test.go +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_edge_cache_service_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_endpoint_policy_test.go.erb b/mmv1/third_party/terraform/services/networkservices/resource_network_services_endpoint_policy_test.go.erb index 3369b28dc114..442195a5ab50 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_endpoint_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_endpoint_policy_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesEndpointPolicy_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_gateway_test.go b/mmv1/third_party/terraform/services/networkservices/resource_network_services_gateway_test.go index a796e0b6d95b..b889daba865e 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_gateway_test.go +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_gateway_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesGateway_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_grpc_route_test.go.erb b/mmv1/third_party/terraform/services/networkservices/resource_network_services_grpc_route_test.go.erb index e2a10dd024e7..2f5cd135ac2c 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_grpc_route_test.go.erb +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_grpc_route_test.go.erb @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_http_route_test.go.erb b/mmv1/third_party/terraform/services/networkservices/resource_network_services_http_route_test.go.erb index 2f0c54530c64..721add08875c 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_http_route_test.go.erb +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_http_route_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesHttpRoute_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_lb_route_extension_test.go b/mmv1/third_party/terraform/services/networkservices/resource_network_services_lb_route_extension_test.go index 5d9ad8a5dee0..93ccc3a9017b 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_lb_route_extension_test.go +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_lb_route_extension_test.go @@ -3,7 +3,7 @@ package networkservices_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_lb_traffic_extension_test.go b/mmv1/third_party/terraform/services/networkservices/resource_network_services_lb_traffic_extension_test.go index e4706174725f..7315c4e1516b 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_lb_traffic_extension_test.go +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_lb_traffic_extension_test.go @@ -3,7 +3,7 @@ package networkservices_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_mesh_test.go.erb b/mmv1/third_party/terraform/services/networkservices/resource_network_services_mesh_test.go.erb index 87451e4ee1a0..f87751e085e5 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_mesh_test.go.erb +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_mesh_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesMesh_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_service_binding_test.go.erb b/mmv1/third_party/terraform/services/networkservices/resource_network_services_service_binding_test.go.erb index 9cbf703e8ed7..997f1ba5bc61 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_service_binding_test.go.erb +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_service_binding_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesServiceBinding_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_service_lb_policies_test.go.erb b/mmv1/third_party/terraform/services/networkservices/resource_network_services_service_lb_policies_test.go.erb index 939d627f99ed..4e8a6a32d7e7 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_service_lb_policies_test.go.erb +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_service_lb_policies_test.go.erb @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesLBPolicies_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_tcp_route_test.go.erb b/mmv1/third_party/terraform/services/networkservices/resource_network_services_tcp_route_test.go.erb index 27f545faed8a..49f195379a8c 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_tcp_route_test.go.erb +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_tcp_route_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesTcpRoute_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_tls_route_test.go.erb b/mmv1/third_party/terraform/services/networkservices/resource_network_services_tls_route_test.go.erb index e9d5f9b69c5e..506cd1d1c80c 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_tls_route_test.go.erb +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_tls_route_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesTlsRoute_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_environment_test.go.tmpl b/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_environment_test.go.tmpl index 984d4fd05686..cf60803086f3 100644 --- a/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_environment_test.go.tmpl +++ b/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_environment_test.go.tmpl @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_instance_container_test.go.tmpl b/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_instance_container_test.go.tmpl index 44f23aeb8e79..5c97e06403df 100644 --- a/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_instance_container_test.go.tmpl +++ b/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_instance_container_test.go.tmpl @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_instance_gpu_test.go.tmpl b/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_instance_gpu_test.go.tmpl index ba61e606fd29..74294cc7ed66 100644 --- a/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_instance_gpu_test.go.tmpl +++ b/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_instance_gpu_test.go.tmpl @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_instance_state_test.go.tmpl b/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_instance_state_test.go.tmpl index a935c50910e9..e50bf5b9d2c2 100644 --- a/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_instance_state_test.go.tmpl +++ b/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_instance_state_test.go.tmpl @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_instance_test.go b/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_instance_test.go index 376cd5cb3465..819738664e66 100644 --- a/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_instance_test.go +++ b/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_instance_test.go @@ -5,7 +5,7 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) @@ -15,7 +15,7 @@ func TestAccNotebooksInstance_create_vm_image(t *testing.T) { prefix := fmt.Sprintf("%d", acctest.RandInt(t)) name := fmt.Sprintf("tf-%s", prefix) - acctest.VcrTest(t, resource.TestCase{ + acctest.VcrTest(t, resource.TestCase{ ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { diff --git a/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_runtime_test.go b/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_runtime_test.go index b87ce5088e13..de8cff548f05 100644 --- a/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_runtime_test.go +++ b/mmv1/third_party/terraform/services/notebooks/go/resource_notebooks_runtime_test.go @@ -3,8 +3,8 @@ package notebooks_test import ( "testing" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) func TestAccNotebooksRuntime_update(t *testing.T) { @@ -48,7 +48,6 @@ func TestAccNotebooksRuntime_update(t *testing.T) { }) } - func testAccNotebooksRuntime_basic(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_notebooks_runtime" "runtime" { diff --git a/mmv1/third_party/terraform/services/notebooks/resource_notebooks_environment_test.go.erb b/mmv1/third_party/terraform/services/notebooks/resource_notebooks_environment_test.go.erb index 8796eca193ba..285f8f2b806e 100644 --- a/mmv1/third_party/terraform/services/notebooks/resource_notebooks_environment_test.go.erb +++ b/mmv1/third_party/terraform/services/notebooks/resource_notebooks_environment_test.go.erb @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_container_test.go.erb b/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_container_test.go.erb index 94949016b038..34b2cac0a9fa 100644 --- a/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_container_test.go.erb +++ b/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_container_test.go.erb @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_gpu_test.go.erb b/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_gpu_test.go.erb index ab5ee6ef1ec6..925e5c0f150b 100644 --- a/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_gpu_test.go.erb +++ b/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_gpu_test.go.erb @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_state_test.go.erb b/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_state_test.go.erb index 5b6ac727f583..c1dfba03808c 100644 --- a/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_state_test.go.erb +++ b/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_state_test.go.erb @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_test.go.erb b/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_test.go.erb index 6306f1a88f93..f9caad9f3ca3 100644 --- a/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_test.go.erb +++ b/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_test.go.erb @@ -6,7 +6,7 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/notebooks/resource_notebooks_runtime_test.go.erb b/mmv1/third_party/terraform/services/notebooks/resource_notebooks_runtime_test.go.erb index 74669dc44525..a8d5b0c48459 100644 --- a/mmv1/third_party/terraform/services/notebooks/resource_notebooks_runtime_test.go.erb +++ b/mmv1/third_party/terraform/services/notebooks/resource_notebooks_runtime_test.go.erb @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNotebooksRuntime_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/orgpolicy/go/resource_org_policy_custom_constraint_test.go b/mmv1/third_party/terraform/services/orgpolicy/go/resource_org_policy_custom_constraint_test.go index e355de3a0714..87c14932c638 100644 --- a/mmv1/third_party/terraform/services/orgpolicy/go/resource_org_policy_custom_constraint_test.go +++ b/mmv1/third_party/terraform/services/orgpolicy/go/resource_org_policy_custom_constraint_test.go @@ -1,11 +1,11 @@ package orgpolicy_test import ( - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccOrgPolicyCustomConstraint_update(t *testing.T) { @@ -74,4 +74,3 @@ resource "google_org_policy_custom_constraint" "constraint" { } `, context) } - diff --git a/mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_custom_constraint_test.go.erb b/mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_custom_constraint_test.go.erb index 346bc5f6e527..8a1d9e48113a 100644 --- a/mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_custom_constraint_test.go.erb +++ b/mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_custom_constraint_test.go.erb @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccOrgPolicyCustomConstraint_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_policy_test.go b/mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_policy_test.go index 078705bd22d9..adfa8d105ef5 100644 --- a/mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_policy_test.go +++ b/mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_policy_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/osconfig/go/resource_os_config_os_policy_assignment_test.go.tmpl b/mmv1/third_party/terraform/services/osconfig/go/resource_os_config_os_policy_assignment_test.go.tmpl index 3fdf2ab6dfd0..88af9004da34 100644 --- a/mmv1/third_party/terraform/services/osconfig/go/resource_os_config_os_policy_assignment_test.go.tmpl +++ b/mmv1/third_party/terraform/services/osconfig/go/resource_os_config_os_policy_assignment_test.go.tmpl @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/mmv1/third_party/terraform/services/osconfig/resource_os_config_os_policy_assignment_test.go.erb b/mmv1/third_party/terraform/services/osconfig/resource_os_config_os_policy_assignment_test.go.erb index e715fb0e5fd7..557f8dd6ed04 100644 --- a/mmv1/third_party/terraform/services/osconfig/resource_os_config_os_policy_assignment_test.go.erb +++ b/mmv1/third_party/terraform/services/osconfig/resource_os_config_os_policy_assignment_test.go.erb @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/mmv1/third_party/terraform/services/oslogin/resource_os_login_ssh_public_key_test.go b/mmv1/third_party/terraform/services/oslogin/resource_os_login_ssh_public_key_test.go index bdf92212f9f2..c57b782b47ba 100644 --- a/mmv1/third_party/terraform/services/oslogin/resource_os_login_ssh_public_key_test.go +++ b/mmv1/third_party/terraform/services/oslogin/resource_os_login_ssh_public_key_test.go @@ -3,7 +3,7 @@ package oslogin_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/parallelstore/go/resource_parallelstore_instance_test.go.tmpl b/mmv1/third_party/terraform/services/parallelstore/go/resource_parallelstore_instance_test.go.tmpl index 0a632c109ff0..0ffa5fc7ee63 100644 --- a/mmv1/third_party/terraform/services/parallelstore/go/resource_parallelstore_instance_test.go.tmpl +++ b/mmv1/third_party/terraform/services/parallelstore/go/resource_parallelstore_instance_test.go.tmpl @@ -4,7 +4,7 @@ package parallelstore_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/parallelstore/resource_parallelstore_instance_test.go.erb b/mmv1/third_party/terraform/services/parallelstore/resource_parallelstore_instance_test.go.erb index 60e955019d6d..e336f9d96545 100644 --- a/mmv1/third_party/terraform/services/parallelstore/resource_parallelstore_instance_test.go.erb +++ b/mmv1/third_party/terraform/services/parallelstore/resource_parallelstore_instance_test.go.erb @@ -5,7 +5,7 @@ package parallelstore_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/privateca/data_source_certificate_authority_test.go b/mmv1/third_party/terraform/services/privateca/data_source_certificate_authority_test.go index e50ba6119073..75bfaba6c452 100644 --- a/mmv1/third_party/terraform/services/privateca/data_source_certificate_authority_test.go +++ b/mmv1/third_party/terraform/services/privateca/data_source_certificate_authority_test.go @@ -3,7 +3,7 @@ package privateca_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/privateca/iam_privateca_ca_pool_test.go b/mmv1/third_party/terraform/services/privateca/iam_privateca_ca_pool_test.go index adeda1ba5b15..18216b950e7a 100644 --- a/mmv1/third_party/terraform/services/privateca/iam_privateca_ca_pool_test.go +++ b/mmv1/third_party/terraform/services/privateca/iam_privateca_ca_pool_test.go @@ -6,8 +6,8 @@ import ( "sort" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/privateca" diff --git a/mmv1/third_party/terraform/services/privateca/resource_privateca_ca_pool_test.go b/mmv1/third_party/terraform/services/privateca/resource_privateca_ca_pool_test.go index 8466df22a917..f56715fc04a3 100644 --- a/mmv1/third_party/terraform/services/privateca/resource_privateca_ca_pool_test.go +++ b/mmv1/third_party/terraform/services/privateca/resource_privateca_ca_pool_test.go @@ -3,7 +3,7 @@ package privateca_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/privateca/resource_privateca_certificate_authority_test.go b/mmv1/third_party/terraform/services/privateca/resource_privateca_certificate_authority_test.go index 626d629cba97..a43d6182c467 100644 --- a/mmv1/third_party/terraform/services/privateca/resource_privateca_certificate_authority_test.go +++ b/mmv1/third_party/terraform/services/privateca/resource_privateca_certificate_authority_test.go @@ -3,7 +3,7 @@ package privateca_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/privateca/resource_privateca_certificate_template_test.go b/mmv1/third_party/terraform/services/privateca/resource_privateca_certificate_template_test.go index 7f1420946e29..35dccbfb4d1c 100644 --- a/mmv1/third_party/terraform/services/privateca/resource_privateca_certificate_template_test.go +++ b/mmv1/third_party/terraform/services/privateca/resource_privateca_certificate_template_test.go @@ -3,7 +3,7 @@ package privateca_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/privateca/resource_privateca_certificate_test.go b/mmv1/third_party/terraform/services/privateca/resource_privateca_certificate_test.go index e6c0c5f76c36..3652a1e02441 100644 --- a/mmv1/third_party/terraform/services/privateca/resource_privateca_certificate_test.go +++ b/mmv1/third_party/terraform/services/privateca/resource_privateca_certificate_test.go @@ -3,7 +3,7 @@ package privateca_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/privilegedaccessmanager/go/resource_privileged_access_manager_entitlement_test.go b/mmv1/third_party/terraform/services/privilegedaccessmanager/go/resource_privileged_access_manager_entitlement_test.go index a3c4d4e07456..55fa1c1a6ff3 100644 --- a/mmv1/third_party/terraform/services/privilegedaccessmanager/go/resource_privileged_access_manager_entitlement_test.go +++ b/mmv1/third_party/terraform/services/privilegedaccessmanager/go/resource_privileged_access_manager_entitlement_test.go @@ -3,7 +3,7 @@ package privilegedaccessmanager_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_test.go.erb b/mmv1/third_party/terraform/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_test.go.erb index 92fdb61dfcc7..6f6c2e6881e4 100644 --- a/mmv1/third_party/terraform/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_test.go.erb +++ b/mmv1/third_party/terraform/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_test.go.erb @@ -4,7 +4,7 @@ package privilegedaccessmanager_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/pubsub/data_source_pubsub_subscription_test.go b/mmv1/third_party/terraform/services/pubsub/data_source_pubsub_subscription_test.go index ffe48a0bae3a..a2a55a334a05 100644 --- a/mmv1/third_party/terraform/services/pubsub/data_source_pubsub_subscription_test.go +++ b/mmv1/third_party/terraform/services/pubsub/data_source_pubsub_subscription_test.go @@ -3,7 +3,7 @@ package pubsub_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/pubsub/data_source_pubsub_topic_test.go b/mmv1/third_party/terraform/services/pubsub/data_source_pubsub_topic_test.go index e3b4614d1ca6..53a67d30f107 100644 --- a/mmv1/third_party/terraform/services/pubsub/data_source_pubsub_topic_test.go +++ b/mmv1/third_party/terraform/services/pubsub/data_source_pubsub_topic_test.go @@ -3,7 +3,7 @@ package pubsub_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/pubsub/iam_pubsub_subscription_test.go b/mmv1/third_party/terraform/services/pubsub/iam_pubsub_subscription_test.go index 33daa6c8fbe3..def57d0011a7 100644 --- a/mmv1/third_party/terraform/services/pubsub/iam_pubsub_subscription_test.go +++ b/mmv1/third_party/terraform/services/pubsub/iam_pubsub_subscription_test.go @@ -6,8 +6,8 @@ import ( "sort" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/pubsub/iam_pubsub_topic_test.go b/mmv1/third_party/terraform/services/pubsub/iam_pubsub_topic_test.go index 166aeb0b1bfb..ace43fceb1b7 100644 --- a/mmv1/third_party/terraform/services/pubsub/iam_pubsub_topic_test.go +++ b/mmv1/third_party/terraform/services/pubsub/iam_pubsub_topic_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/pubsub" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccPubsubTopicIamBinding(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/pubsub/resource_pubsub_schema_test.go b/mmv1/third_party/terraform/services/pubsub/resource_pubsub_schema_test.go index 68b193d71afd..202a373d4dff 100644 --- a/mmv1/third_party/terraform/services/pubsub/resource_pubsub_schema_test.go +++ b/mmv1/third_party/terraform/services/pubsub/resource_pubsub_schema_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/pubsub/resource_pubsub_subscription_test.go b/mmv1/third_party/terraform/services/pubsub/resource_pubsub_subscription_test.go index c142112b69e0..9b695d2e6974 100644 --- a/mmv1/third_party/terraform/services/pubsub/resource_pubsub_subscription_test.go +++ b/mmv1/third_party/terraform/services/pubsub/resource_pubsub_subscription_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/pubsub" diff --git a/mmv1/third_party/terraform/services/pubsub/resource_pubsub_topic_test.go b/mmv1/third_party/terraform/services/pubsub/resource_pubsub_topic_test.go index 7a944302ea21..b779cda9a5bb 100644 --- a/mmv1/third_party/terraform/services/pubsub/resource_pubsub_topic_test.go +++ b/mmv1/third_party/terraform/services/pubsub/resource_pubsub_topic_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/pubsublite/resource_pubsub_lite_subscription_test.go b/mmv1/third_party/terraform/services/pubsublite/resource_pubsub_lite_subscription_test.go index 4f2f2ab8e0ba..c88cf2abb178 100644 --- a/mmv1/third_party/terraform/services/pubsublite/resource_pubsub_lite_subscription_test.go +++ b/mmv1/third_party/terraform/services/pubsublite/resource_pubsub_lite_subscription_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/pubsublite/resource_pubsub_lite_topic_test.go b/mmv1/third_party/terraform/services/pubsublite/resource_pubsub_lite_topic_test.go index a2c17cce5109..f9df101add44 100644 --- a/mmv1/third_party/terraform/services/pubsublite/resource_pubsub_lite_topic_test.go +++ b/mmv1/third_party/terraform/services/pubsublite/resource_pubsub_lite_topic_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/redis/data_source_redis_instance_test.go b/mmv1/third_party/terraform/services/redis/data_source_redis_instance_test.go index 35942e513aec..e1486ada8327 100644 --- a/mmv1/third_party/terraform/services/redis/data_source_redis_instance_test.go +++ b/mmv1/third_party/terraform/services/redis/data_source_redis_instance_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/redis/go/resource_redis_cluster_test.go.tmpl b/mmv1/third_party/terraform/services/redis/go/resource_redis_cluster_test.go.tmpl index 968e13c777e6..97d45e0d2549 100644 --- a/mmv1/third_party/terraform/services/redis/go/resource_redis_cluster_test.go.tmpl +++ b/mmv1/third_party/terraform/services/redis/go/resource_redis_cluster_test.go.tmpl @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/redis/resource_redis_cluster_test.go.erb b/mmv1/third_party/terraform/services/redis/resource_redis_cluster_test.go.erb index d932cd0e4cf1..effc5eb88419 100644 --- a/mmv1/third_party/terraform/services/redis/resource_redis_cluster_test.go.erb +++ b/mmv1/third_party/terraform/services/redis/resource_redis_cluster_test.go.erb @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/redis/resource_redis_instance_test.go b/mmv1/third_party/terraform/services/redis/resource_redis_instance_test.go index 79daba4208f5..43f53e4ce0e2 100644 --- a/mmv1/third_party/terraform/services/redis/resource_redis_instance_test.go +++ b/mmv1/third_party/terraform/services/redis/resource_redis_instance_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_active_folder_test.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_active_folder_test.go index 2370504e28e1..91f7ad0dcc24 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_active_folder_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_active_folder_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_client_config_test.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_client_config_test.go index b4d417b1d5e0..cb618bbcab99 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_client_config_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_client_config_test.go @@ -3,7 +3,7 @@ package resourcemanager_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_client_openid_userinfo_test.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_client_openid_userinfo_test.go index 06ed58a24810..c7ae60ca57ef 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_client_openid_userinfo_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_client_openid_userinfo_test.go @@ -3,7 +3,7 @@ package resourcemanager_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_folder_organization_policy_test.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_folder_organization_policy_test.go index 880fd439c53c..81361f7ec30e 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_folder_organization_policy_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_folder_organization_policy_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_folder_test.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_folder_test.go index b85466ce9262..d4501b2eded6 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_folder_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_folder_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDataSourceGoogleFolder_byFullName(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_folders_test.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_folders_test.go index 5e28f9e7c3f8..ae106939dbca 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_folders_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_folders_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_iam_role_test.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_iam_role_test.go index 4ea9c6f2d642..ea4f3c57e8a1 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_iam_role_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_iam_role_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDataSourceIAMRole(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_iam_testable_permissions_test.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_iam_testable_permissions_test.go index 1183a2d64578..a1ce30e92538 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_iam_testable_permissions_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_iam_testable_permissions_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDataSourceGoogleIamTestablePermissions_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_netblock_ip_ranges_test.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_netblock_ip_ranges_test.go index 8c81f5cedc59..1ac308f49fa9 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_netblock_ip_ranges_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_netblock_ip_ranges_test.go @@ -4,7 +4,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_organization_test.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_organization_test.go index eca46d013088..0d8716415cab 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_organization_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_organization_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceGoogleOrganization_byFullName(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_project_organization_policy_test.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_project_organization_policy_test.go index 4af55e2558f1..302bff15cd54 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_project_organization_policy_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_project_organization_policy_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_project_service_test.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_project_service_test.go index 6d908965cf53..47736d5ba86d 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_project_service_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_project_service_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_project_test.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_project_test.go index 513be054caaa..5480bf7e8d70 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_project_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_project_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_projects_test.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_projects_test.go index 83bfaf85c20b..35a163ed4434 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_projects_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_projects_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_service_account_access_token_test.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_service_account_access_token_test.go index 5dedc15acd90..a32115ce5dee 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_service_account_access_token_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_service_account_access_token_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func testAccCheckServiceAccountAccessTokenValue(name, value string) resource.TestCheckFunc { diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_service_account_id_token_test.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_service_account_id_token_test.go index 6777cf3e66f4..6b5e3598b5b0 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_service_account_id_token_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_service_account_id_token_test.go @@ -8,8 +8,8 @@ import ( "google.golang.org/api/idtoken" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_service_account_jwt_test.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_service_account_jwt_test.go index c343f1c1532b..0f9acee03abd 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_service_account_jwt_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_service_account_jwt_test.go @@ -11,8 +11,8 @@ import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_service_account_key_test.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_service_account_key_test.go index 0da6ff4bf807..b5a03755159d 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_service_account_key_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_service_account_key_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDatasourceGoogleServiceAccountKey_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_service_account_test.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_service_account_test.go index 32b053b4d9a2..a3f35308929f 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_service_account_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_service_account_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_binding_test.go b/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_binding_test.go index add26f3ff681..4051777b2cff 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_binding_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_binding_test.go @@ -2,12 +2,12 @@ package resourcemanager_test import ( "fmt" - "regexp" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func projectIamBindingImportStep(resourceName, pid, role string) resource.TestStep { @@ -266,7 +266,7 @@ func TestAccProjectIamBinding_invalidMembers(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { - Config: testAccProjectAssociateBindingBasic(pid, org, role, "admin@hashicorptest.com"), + Config: testAccProjectAssociateBindingBasic(pid, org, role, "admin@hashicorptest.com"), ExpectError: regexp.MustCompile("invalid value for members\\.0 \\(IAM members must have one of the values outlined here: https://cloud.google.com/billing/docs/reference/rest/v1/Policy#Binding\\)"), }, { diff --git a/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_member_test.go b/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_member_test.go index 50c3d22d3d43..960d39388ddc 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_member_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_member_test.go @@ -2,12 +2,12 @@ package resourcemanager_test import ( "fmt" - "regexp" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func projectIamMemberImportStep(resourceName, pid, role, member string) resource.TestStep { @@ -182,7 +182,7 @@ func TestAccProjectIamMember_invalidMembers(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { - Config: testAccProjectAssociateMemberBasic(pid, org, role, "admin@hashicorptest.com"), + Config: testAccProjectAssociateMemberBasic(pid, org, role, "admin@hashicorptest.com"), ExpectError: regexp.MustCompile("invalid value for member \\(IAM members must have one of the values outlined here: https://cloud.google.com/billing/docs/reference/rest/v1/Policy#Binding\\)"), }, { diff --git a/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_policy_test.go b/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_policy_test.go index eec0c77bc01d..10645e211851 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_policy_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_policy_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" "github.com/hashicorp/terraform-provider-google/google/tpgiamresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/cloudresourcemanager/v1" ) @@ -55,7 +55,7 @@ func TestAccProjectIamPolicy_emptyMembers(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) pid := fmt.Sprintf("tf-test-%d", acctest.RandInt(t)) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { @@ -72,7 +72,7 @@ func TestAccProjectIamPolicy_expanded(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) pid := fmt.Sprintf("tf-test-%d", acctest.RandInt(t)) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { @@ -92,7 +92,7 @@ func TestAccProjectIamPolicy_basicAuditConfig(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) pid := fmt.Sprintf("tf-test-%d", acctest.RandInt(t)) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ // Create a new project @@ -122,7 +122,7 @@ func TestAccProjectIamPolicy_expandedAuditConfig(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) pid := fmt.Sprintf("tf-test-%d", acctest.RandInt(t)) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { @@ -141,7 +141,7 @@ func TestAccProjectIamPolicy_withCondition(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) pid := fmt.Sprintf("tf-test-%d", acctest.RandInt(t)) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ // Create a new project @@ -176,7 +176,7 @@ func TestAccProjectIamPolicy_invalidMembers(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { - Config: testAccProjectAssociatePolicyBasic(pid, org, "admin@hashicorptest.com"), + Config: testAccProjectAssociatePolicyBasic(pid, org, "admin@hashicorptest.com"), ExpectError: regexp.MustCompile("invalid value for bindings\\.1\\.members\\.0 \\(IAM members must have one of the values outlined here: https://cloud.google.com/billing/docs/reference/rest/v1/Policy#Binding\\)"), }, { diff --git a/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_service_account_iam_test.go.tmpl b/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_service_account_iam_test.go.tmpl index 16fb4e212156..7043721f5877 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_service_account_iam_test.go.tmpl +++ b/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_service_account_iam_test.go.tmpl @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgiamresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccServiceAccountIamBinding(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/resourcemanager/go/resource_project_service_identity_test.go.tmpl b/mmv1/third_party/terraform/services/resourcemanager/go/resource_project_service_identity_test.go.tmpl index 5b99a60ffd9f..0f77cbabb84b 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/go/resource_project_service_identity_test.go.tmpl +++ b/mmv1/third_party/terraform/services/resourcemanager/go/resource_project_service_identity_test.go.tmpl @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccProjectServiceIdentity_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_billing_subaccount_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_billing_subaccount_test.go index 7030a9bb271a..f9210ed3e21c 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_billing_subaccount_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_billing_subaccount_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccBillingSubaccount_renameOnDestroy(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_iam_audit_config_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_iam_audit_config_test.go index 9759ebd903be..1236dda5d310 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_iam_audit_config_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_iam_audit_config_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) // Test that an IAM audit config can be applied to a folder diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_iam_binding_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_iam_binding_test.go index 478e1d8aba92..0bf14757725a 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_iam_binding_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_iam_binding_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/cloudresourcemanager/v1" resourceManagerV3 "google.golang.org/api/cloudresourcemanager/v3" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_iam_member_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_iam_member_test.go index 6a32bb94c42c..a331a29b908d 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_iam_member_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_iam_member_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "google.golang.org/api/cloudresourcemanager/v1" diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_iam_policy_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_iam_policy_test.go index 62c7a1799180..813180660a46 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_iam_policy_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_iam_policy_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" resourceManagerV3 "google.golang.org/api/cloudresourcemanager/v3" diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_organization_policy_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_organization_policy_test.go index cb98fc3e6936..aea0240c779a 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_organization_policy_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_organization_policy_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/cloudresourcemanager/v1" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_test.go index 21363637780c..120229adcf16 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_organization_iam_audit_config_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_organization_iam_audit_config_test.go index 5c8a2c75c6e1..e92e205c67c5 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_organization_iam_audit_config_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_organization_iam_audit_config_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) var runOrgIamAuditConfigTestEnvVar = "TF_RUN_ORG_IAM_AUDIT_CONFIG" diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_organization_iam_custom_role_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_organization_iam_custom_role_test.go index 5416b0d8e571..371c0f498392 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_organization_iam_custom_role_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_organization_iam_custom_role_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccOrganizationIamCustomRole_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_organization_iam_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_organization_iam_test.go index f2d9a7c0e7f7..b188dafa516b 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_organization_iam_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_organization_iam_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgiamresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/cloudresourcemanager/v1" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_organization_policy_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_organization_policy_test.go index ed630fe27a30..b8768a00947d 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_organization_policy_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_organization_policy_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/cloudresourcemanager/v1" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_default_service_accounts_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_default_service_accounts_test.go index 5455d5dcbab4..e1136dfe96a2 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_default_service_accounts_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_default_service_accounts_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" cloudresourcemanager "google.golang.org/api/cloudresourcemanager/v1" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_audit_config_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_audit_config_test.go index eeae40e8c017..0dca2fdbfaff 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_audit_config_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_audit_config_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func projectIamAuditConfigImportStep(resourceName, pid, service string) resource.TestStep { diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_binding_test.go.erb b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_binding_test.go.erb index 889c83c2598a..6d1eba93d359 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_binding_test.go.erb +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_binding_test.go.erb @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func projectIamBindingImportStep(resourceName, pid, role string) resource.TestStep { diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_custom_role_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_custom_role_test.go index 9aadc9e84cea..6b12bdb6436f 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_custom_role_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_custom_role_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_remove_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_remove_test.go index a74df0ab0e7a..06086dacfbc0 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_remove_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_remove_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccProjectIamMemberRemove_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_test.go.erb b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_test.go.erb index dd3eb4491487..d2bcdd026033 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_test.go.erb +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_test.go.erb @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func projectIamMemberImportStep(resourceName, pid, role, member string) resource.TestStep { diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_policy_test.go.erb b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_policy_test.go.erb index fd3c664ce1f8..fe37c521628f 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_policy_test.go.erb @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" "github.com/hashicorp/terraform-provider-google/google/tpgiamresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/cloudresourcemanager/v1" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_organization_policy_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_organization_policy_test.go index 7ff1f4ad6ec8..f148531384ee 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_organization_policy_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_organization_policy_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/cloudresourcemanager/v1" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_service_test.go.erb b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_service_test.go.erb index c37838df3c50..e12885f90ce1 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_service_test.go.erb +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_service_test.go.erb @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) // Test that services can be enabled and disabled on a project diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_test.go index 12489e663f6e..4c72414f8b95 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_service_account_iam_test.go.erb b/mmv1/third_party/terraform/services/resourcemanager/resource_google_service_account_iam_test.go.erb index 35515f2010b8..40d443fc63d4 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_service_account_iam_test.go.erb +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_service_account_iam_test.go.erb @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgiamresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccServiceAccountIamBinding(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_service_account_key_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_service_account_key_test.go index 456aa004a060..0d2b50e25f12 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_service_account_key_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_service_account_key_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_service_account_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_service_account_test.go index 12fa5d1d6bb9..2cb2c7a0d5c3 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_service_account_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_service_account_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_project_service_identity_test.go.erb b/mmv1/third_party/terraform/services/resourcemanager/resource_project_service_identity_test.go.erb index 8fb16c27eb5e..416ad44ed05c 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_project_service_identity_test.go.erb +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_project_service_identity_test.go.erb @@ -8,7 +8,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccProjectServiceIdentity_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_resourcemanager_lien_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_resourcemanager_lien_test.go index 1fd6e6964a7b..850b43bf3824 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_resourcemanager_lien_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_resourcemanager_lien_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" resourceManager "google.golang.org/api/cloudresourcemanager/v1" ) diff --git a/mmv1/third_party/terraform/services/runtimeconfig/data_source_runtimeconfig_config_test.go.erb b/mmv1/third_party/terraform/services/runtimeconfig/data_source_runtimeconfig_config_test.go.erb index c5e0218ec9db..b57e2b2df91f 100644 --- a/mmv1/third_party/terraform/services/runtimeconfig/data_source_runtimeconfig_config_test.go.erb +++ b/mmv1/third_party/terraform/services/runtimeconfig/data_source_runtimeconfig_config_test.go.erb @@ -7,7 +7,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/runtimeconfig/data_source_runtimeconfig_variable_test.go.erb b/mmv1/third_party/terraform/services/runtimeconfig/data_source_runtimeconfig_variable_test.go.erb index 0b875d883af2..dc672de6597d 100644 --- a/mmv1/third_party/terraform/services/runtimeconfig/data_source_runtimeconfig_variable_test.go.erb +++ b/mmv1/third_party/terraform/services/runtimeconfig/data_source_runtimeconfig_variable_test.go.erb @@ -7,7 +7,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/runtimeconfig/go/data_source_runtimeconfig_config_test.go.tmpl b/mmv1/third_party/terraform/services/runtimeconfig/go/data_source_runtimeconfig_config_test.go.tmpl index 6f6d76568e12..d0805bb801f3 100644 --- a/mmv1/third_party/terraform/services/runtimeconfig/go/data_source_runtimeconfig_config_test.go.tmpl +++ b/mmv1/third_party/terraform/services/runtimeconfig/go/data_source_runtimeconfig_config_test.go.tmpl @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/runtimeconfig/go/data_source_runtimeconfig_variable_test.go.tmpl b/mmv1/third_party/terraform/services/runtimeconfig/go/data_source_runtimeconfig_variable_test.go.tmpl index a61f996d87a0..43fad694550d 100644 --- a/mmv1/third_party/terraform/services/runtimeconfig/go/data_source_runtimeconfig_variable_test.go.tmpl +++ b/mmv1/third_party/terraform/services/runtimeconfig/go/data_source_runtimeconfig_variable_test.go.tmpl @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/runtimeconfig/go/resource_runtimeconfig_config_test.go.tmpl b/mmv1/third_party/terraform/services/runtimeconfig/go/resource_runtimeconfig_config_test.go.tmpl index 24d55ab4bbda..a1d33ce58f18 100644 --- a/mmv1/third_party/terraform/services/runtimeconfig/go/resource_runtimeconfig_config_test.go.tmpl +++ b/mmv1/third_party/terraform/services/runtimeconfig/go/resource_runtimeconfig_config_test.go.tmpl @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" runtimeconfig "google.golang.org/api/runtimeconfig/v1beta1" ) diff --git a/mmv1/third_party/terraform/services/runtimeconfig/go/resource_runtimeconfig_variable_test.go.tmpl b/mmv1/third_party/terraform/services/runtimeconfig/go/resource_runtimeconfig_variable_test.go.tmpl index 191290c86cb6..1e090466154d 100644 --- a/mmv1/third_party/terraform/services/runtimeconfig/go/resource_runtimeconfig_variable_test.go.tmpl +++ b/mmv1/third_party/terraform/services/runtimeconfig/go/resource_runtimeconfig_variable_test.go.tmpl @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" runtimeconfig "google.golang.org/api/runtimeconfig/v1beta1" ) diff --git a/mmv1/third_party/terraform/services/runtimeconfig/resource_runtimeconfig_config_test.go.erb b/mmv1/third_party/terraform/services/runtimeconfig/resource_runtimeconfig_config_test.go.erb index 7d7c99749754..f3d5fec59290 100644 --- a/mmv1/third_party/terraform/services/runtimeconfig/resource_runtimeconfig_config_test.go.erb +++ b/mmv1/third_party/terraform/services/runtimeconfig/resource_runtimeconfig_config_test.go.erb @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" runtimeconfig "google.golang.org/api/runtimeconfig/v1beta1" ) diff --git a/mmv1/third_party/terraform/services/runtimeconfig/resource_runtimeconfig_variable_test.go.erb b/mmv1/third_party/terraform/services/runtimeconfig/resource_runtimeconfig_variable_test.go.erb index 273ba0fc3ded..8dab38f409c6 100644 --- a/mmv1/third_party/terraform/services/runtimeconfig/resource_runtimeconfig_variable_test.go.erb +++ b/mmv1/third_party/terraform/services/runtimeconfig/resource_runtimeconfig_variable_test.go.erb @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" runtimeconfig "google.golang.org/api/runtimeconfig/v1beta1" ) diff --git a/mmv1/third_party/terraform/services/secretmanager/data_source_secret_manager_secret_test.go b/mmv1/third_party/terraform/services/secretmanager/data_source_secret_manager_secret_test.go index d175df4012a8..26e580daecd9 100644 --- a/mmv1/third_party/terraform/services/secretmanager/data_source_secret_manager_secret_test.go +++ b/mmv1/third_party/terraform/services/secretmanager/data_source_secret_manager_secret_test.go @@ -3,7 +3,7 @@ package secretmanager_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/secretmanager/data_source_secret_manager_secret_version_access_test.go b/mmv1/third_party/terraform/services/secretmanager/data_source_secret_manager_secret_version_access_test.go index 5cce384fb01f..23497bcc2046 100644 --- a/mmv1/third_party/terraform/services/secretmanager/data_source_secret_manager_secret_version_access_test.go +++ b/mmv1/third_party/terraform/services/secretmanager/data_source_secret_manager_secret_version_access_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDatasourceSecretManagerSecretVersionAccess_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/secretmanager/data_source_secret_manager_secret_version_test.go b/mmv1/third_party/terraform/services/secretmanager/data_source_secret_manager_secret_version_test.go index 835e0b2e37a0..33c7753b56d8 100644 --- a/mmv1/third_party/terraform/services/secretmanager/data_source_secret_manager_secret_version_test.go +++ b/mmv1/third_party/terraform/services/secretmanager/data_source_secret_manager_secret_version_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDatasourceSecretManagerSecretVersion_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/secretmanager/data_source_secret_manager_secrets_test.go b/mmv1/third_party/terraform/services/secretmanager/data_source_secret_manager_secrets_test.go index cb57c7688334..792e9bb41875 100644 --- a/mmv1/third_party/terraform/services/secretmanager/data_source_secret_manager_secrets_test.go +++ b/mmv1/third_party/terraform/services/secretmanager/data_source_secret_manager_secrets_test.go @@ -6,8 +6,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/secretmanager/go/iam_secret_manager_secret_test.go b/mmv1/third_party/terraform/services/secretmanager/go/iam_secret_manager_secret_test.go index ee567f13d1d0..0eb78e092355 100644 --- a/mmv1/third_party/terraform/services/secretmanager/go/iam_secret_manager_secret_test.go +++ b/mmv1/third_party/terraform/services/secretmanager/go/iam_secret_manager_secret_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" @@ -15,7 +15,7 @@ func TestAccSecretManagerSecretIam_iamMemberConditionUpdate(t *testing.T) { context := map[string]interface{}{ "random_suffix": acctest.RandString(t, 10), - "role": "roles/secretmanager.secretAccessor", + "role": "roles/secretmanager.secretAccessor", } acctest.VcrTest(t, resource.TestCase{ diff --git a/mmv1/third_party/terraform/services/secretmanager/go/resource_secret_manager_secret_test.go b/mmv1/third_party/terraform/services/secretmanager/go/resource_secret_manager_secret_test.go index c0ce2fcda347..81ce574fe53a 100644 --- a/mmv1/third_party/terraform/services/secretmanager/go/resource_secret_manager_secret_test.go +++ b/mmv1/third_party/terraform/services/secretmanager/go/resource_secret_manager_secret_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccSecretManagerSecret_import(t *testing.T) { @@ -25,9 +25,9 @@ func TestAccSecretManagerSecret_import(t *testing.T) { Config: testAccSecretManagerSecret_basic(context), }, { - ResourceName: "google_secret_manager_secret.secret-basic", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret.secret-basic", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, }, @@ -54,9 +54,9 @@ func TestAccSecretManagerSecret_cmek(t *testing.T) { Config: testAccSecretMangerSecret_cmek(context1), }, { - ResourceName: "google_secret_manager_secret.secret-basic", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret.secret-basic", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, }, @@ -79,27 +79,27 @@ func TestAccSecretManagerSecret_annotationsUpdate(t *testing.T) { Config: testAccSecretManagerSecret_annotationsBasic(context), }, { - ResourceName: "google_secret_manager_secret.secret-with-annotations", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret.secret-with-annotations", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels", "annotations"}, }, { Config: testAccSecretManagerSecret_annotationsUpdate(context), }, { - ResourceName: "google_secret_manager_secret.secret-with-annotations", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret.secret-with-annotations", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels", "annotations"}, }, { Config: testAccSecretManagerSecret_annotationsBasic(context), }, { - ResourceName: "google_secret_manager_secret.secret-with-annotations", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret.secret-with-annotations", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels", "annotations"}, }, }, @@ -122,36 +122,36 @@ func TestAccSecretManagerSecret_versionAliasesUpdate(t *testing.T) { Config: testAccSecretManagerSecret_basicWithSecretVersions(context), }, { - ResourceName: "google_secret_manager_secret.secret-basic", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret.secret-basic", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, { Config: testAccSecretManagerSecret_versionAliasesBasic(context), }, { - ResourceName: "google_secret_manager_secret.secret-basic", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret.secret-basic", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, { Config: testAccSecretManagerSecret_versionAliasesUpdate(context), }, { - ResourceName: "google_secret_manager_secret.secret-basic", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret.secret-basic", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, { Config: testAccSecretManagerSecret_basicWithSecretVersions(context), }, { - ResourceName: "google_secret_manager_secret.secret-basic", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret.secret-basic", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, }, diff --git a/mmv1/third_party/terraform/services/secretmanager/go/resource_secret_manager_secret_version_test.go b/mmv1/third_party/terraform/services/secretmanager/go/resource_secret_manager_secret_version_test.go index 3a89b8473a2e..5e265916762a 100644 --- a/mmv1/third_party/terraform/services/secretmanager/go/resource_secret_manager_secret_version_test.go +++ b/mmv1/third_party/terraform/services/secretmanager/go/resource_secret_manager_secret_version_test.go @@ -3,8 +3,8 @@ package secretmanager_test import ( "testing" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) func TestAccSecretManagerSecretVersion_update(t *testing.T) { @@ -31,9 +31,9 @@ func TestAccSecretManagerSecretVersion_update(t *testing.T) { Config: testAccSecretManagerSecretVersion_disable(context), }, { - ResourceName: "google_secret_manager_secret_version.secret-version-basic", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret_version.secret-version-basic", + ImportState: true, + ImportStateVerify: true, // at this point the secret data is disabled and so reading the data on import will // give an empty string ImportStateVerifyIgnore: []string{"secret_data"}, diff --git a/mmv1/third_party/terraform/services/secretmanager/iam_secret_manager_secret_test.go.erb b/mmv1/third_party/terraform/services/secretmanager/iam_secret_manager_secret_test.go.erb index 8be70a31ae36..d79a544f85ec 100644 --- a/mmv1/third_party/terraform/services/secretmanager/iam_secret_manager_secret_test.go.erb +++ b/mmv1/third_party/terraform/services/secretmanager/iam_secret_manager_secret_test.go.erb @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_test.go.erb b/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_test.go.erb index f30edf4b6887..31deae02ffb6 100644 --- a/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_test.go.erb +++ b/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_test.go.erb @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccSecretManagerSecret_import(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_version_test.go.erb b/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_version_test.go.erb index 375e6b73b12f..ca8c8138f118 100644 --- a/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_version_test.go.erb +++ b/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_version_test.go.erb @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccSecretManagerSecretVersion_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/securitycenter/iam_scc_source_test.go b/mmv1/third_party/terraform/services/securitycenter/iam_scc_source_test.go index 2b008820d21a..f8c7a9112158 100644 --- a/mmv1/third_party/terraform/services/securitycenter/iam_scc_source_test.go +++ b/mmv1/third_party/terraform/services/securitycenter/iam_scc_source_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/securitycenter/resource_scc_event_threat_detection_custom_module_test.go b/mmv1/third_party/terraform/services/securitycenter/resource_scc_event_threat_detection_custom_module_test.go index 1328a65e9bfb..22a2d474d5f6 100644 --- a/mmv1/third_party/terraform/services/securitycenter/resource_scc_event_threat_detection_custom_module_test.go +++ b/mmv1/third_party/terraform/services/securitycenter/resource_scc_event_threat_detection_custom_module_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/securitycenter/resource_scc_folder_custom_module_test.go b/mmv1/third_party/terraform/services/securitycenter/resource_scc_folder_custom_module_test.go index fbd53854fb12..11fd9d647aa2 100644 --- a/mmv1/third_party/terraform/services/securitycenter/resource_scc_folder_custom_module_test.go +++ b/mmv1/third_party/terraform/services/securitycenter/resource_scc_folder_custom_module_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/securitycenter/resource_scc_notification_config_test.go b/mmv1/third_party/terraform/services/securitycenter/resource_scc_notification_config_test.go index 5db8f40b31f7..e172230d8ad0 100644 --- a/mmv1/third_party/terraform/services/securitycenter/resource_scc_notification_config_test.go +++ b/mmv1/third_party/terraform/services/securitycenter/resource_scc_notification_config_test.go @@ -3,7 +3,7 @@ package securitycenter_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/securitycenter/resource_scc_organization_custom_module_test.go b/mmv1/third_party/terraform/services/securitycenter/resource_scc_organization_custom_module_test.go index 8869eb7a5b96..6d99ff43dba4 100644 --- a/mmv1/third_party/terraform/services/securitycenter/resource_scc_organization_custom_module_test.go +++ b/mmv1/third_party/terraform/services/securitycenter/resource_scc_organization_custom_module_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/securitycenter/resource_scc_project_custom_module_test.go b/mmv1/third_party/terraform/services/securitycenter/resource_scc_project_custom_module_test.go index 84df80c79b06..a3145075af86 100644 --- a/mmv1/third_party/terraform/services/securitycenter/resource_scc_project_custom_module_test.go +++ b/mmv1/third_party/terraform/services/securitycenter/resource_scc_project_custom_module_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/securitycenter/resource_scc_project_notification_config_test.go b/mmv1/third_party/terraform/services/securitycenter/resource_scc_project_notification_config_test.go index c3416289682f..77e5328d7475 100644 --- a/mmv1/third_party/terraform/services/securitycenter/resource_scc_project_notification_config_test.go +++ b/mmv1/third_party/terraform/services/securitycenter/resource_scc_project_notification_config_test.go @@ -3,7 +3,7 @@ package securitycenter_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/securitycenter/resource_scc_source_test.go b/mmv1/third_party/terraform/services/securitycenter/resource_scc_source_test.go index db23fba07d78..86a02374a8c0 100644 --- a/mmv1/third_party/terraform/services/securitycenter/resource_scc_source_test.go +++ b/mmv1/third_party/terraform/services/securitycenter/resource_scc_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go index 16c1d57ca527..d7798136e117 100644 --- a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go +++ b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go index 1f6354341093..f89bb92782f8 100644 --- a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go +++ b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_project_security_health_analytics_custom_module_test.go b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_project_security_health_analytics_custom_module_test.go index 4df57339138c..b438d13567a8 100644 --- a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_project_security_health_analytics_custom_module_test.go +++ b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_project_security_health_analytics_custom_module_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_security_health_analytics_custom_module_test.go b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_security_health_analytics_custom_module_test.go index 98400bf41509..caf332c1667d 100644 --- a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_security_health_analytics_custom_module_test.go +++ b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_security_health_analytics_custom_module_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/securitycenterv2/resource_scc_v2_organization_mute_config_test.go b/mmv1/third_party/terraform/services/securitycenterv2/resource_scc_v2_organization_mute_config_test.go index a9a0c76d9d7b..1b8416838ef0 100644 --- a/mmv1/third_party/terraform/services/securitycenterv2/resource_scc_v2_organization_mute_config_test.go +++ b/mmv1/third_party/terraform/services/securitycenterv2/resource_scc_v2_organization_mute_config_test.go @@ -3,7 +3,7 @@ package securitycenterv2_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/securitycenterv2/resource_scc_v2_organization_notification_config_test.go b/mmv1/third_party/terraform/services/securitycenterv2/resource_scc_v2_organization_notification_config_test.go index aa0211acb79b..eebf15dc9ef3 100644 --- a/mmv1/third_party/terraform/services/securitycenterv2/resource_scc_v2_organization_notification_config_test.go +++ b/mmv1/third_party/terraform/services/securitycenterv2/resource_scc_v2_organization_notification_config_test.go @@ -3,7 +3,7 @@ package securitycenterv2_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/securityposture/resource_securityposture_posture_deployment_test.go b/mmv1/third_party/terraform/services/securityposture/resource_securityposture_posture_deployment_test.go index ab9f02a259e8..3fc2e7ecc450 100644 --- a/mmv1/third_party/terraform/services/securityposture/resource_securityposture_posture_deployment_test.go +++ b/mmv1/third_party/terraform/services/securityposture/resource_securityposture_posture_deployment_test.go @@ -3,7 +3,7 @@ package securityposture_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/securityposture/resource_securityposture_posture_test.go b/mmv1/third_party/terraform/services/securityposture/resource_securityposture_posture_test.go index aae0b9049bd9..c522bae0731a 100644 --- a/mmv1/third_party/terraform/services/securityposture/resource_securityposture_posture_test.go +++ b/mmv1/third_party/terraform/services/securityposture/resource_securityposture_posture_test.go @@ -3,7 +3,7 @@ package securityposture_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/securityscanner/go/resource_security_scanner_scan_config_test.go.tmpl b/mmv1/third_party/terraform/services/securityscanner/go/resource_security_scanner_scan_config_test.go.tmpl index 2dcca59bf305..a3513d135de6 100644 --- a/mmv1/third_party/terraform/services/securityscanner/go/resource_security_scanner_scan_config_test.go.tmpl +++ b/mmv1/third_party/terraform/services/securityscanner/go/resource_security_scanner_scan_config_test.go.tmpl @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccSecurityScannerScanConfig_scanConfigUpdate(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/securityscanner/resource_security_scanner_scan_config_test.go.erb b/mmv1/third_party/terraform/services/securityscanner/resource_security_scanner_scan_config_test.go.erb index 0f7c9d2abaaf..65eab0574594 100644 --- a/mmv1/third_party/terraform/services/securityscanner/resource_security_scanner_scan_config_test.go.erb +++ b/mmv1/third_party/terraform/services/securityscanner/resource_security_scanner_scan_config_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccSecurityScannerScanConfig_scanConfigUpdate(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/servicedirectory/go/resource_service_directory_endpoint_test.go.tmpl b/mmv1/third_party/terraform/services/servicedirectory/go/resource_service_directory_endpoint_test.go.tmpl index 337184b0e14d..3dce6652c165 100644 --- a/mmv1/third_party/terraform/services/servicedirectory/go/resource_service_directory_endpoint_test.go.tmpl +++ b/mmv1/third_party/terraform/services/servicedirectory/go/resource_service_directory_endpoint_test.go.tmpl @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccServiceDirectoryEndpoint_serviceDirectoryEndpointUpdateExample(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/servicedirectory/go/resource_service_directory_namespace_test.go.tmpl b/mmv1/third_party/terraform/services/servicedirectory/go/resource_service_directory_namespace_test.go.tmpl index 4880ece2ac8f..4c36c4fe7f6b 100644 --- a/mmv1/third_party/terraform/services/servicedirectory/go/resource_service_directory_namespace_test.go.tmpl +++ b/mmv1/third_party/terraform/services/servicedirectory/go/resource_service_directory_namespace_test.go.tmpl @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccServiceDirectoryNamespace_serviceDirectoryNamespaceUpdateExample(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/servicedirectory/go/resource_service_directory_service_test.go.tmpl b/mmv1/third_party/terraform/services/servicedirectory/go/resource_service_directory_service_test.go.tmpl index 50889cc56357..abb7b9becb43 100644 --- a/mmv1/third_party/terraform/services/servicedirectory/go/resource_service_directory_service_test.go.tmpl +++ b/mmv1/third_party/terraform/services/servicedirectory/go/resource_service_directory_service_test.go.tmpl @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccServiceDirectoryService_serviceDirectoryServiceUpdateExample(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_endpoint_test.go.erb b/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_endpoint_test.go.erb index 869a899eac7b..becc0603c818 100644 --- a/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_endpoint_test.go.erb +++ b/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_endpoint_test.go.erb @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccServiceDirectoryEndpoint_serviceDirectoryEndpointUpdateExample(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_namespace_test.go.erb b/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_namespace_test.go.erb index 5bf8e8868df9..39f1ba9e1e0f 100644 --- a/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_namespace_test.go.erb +++ b/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_namespace_test.go.erb @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccServiceDirectoryNamespace_serviceDirectoryNamespaceUpdateExample(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_service_test.go.erb b/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_service_test.go.erb index cd382e5037b4..3625627ce7f6 100644 --- a/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_service_test.go.erb +++ b/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_service_test.go.erb @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccServiceDirectoryService_serviceDirectoryServiceUpdateExample(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/servicemanagement/resource_endpoints_service_test.go b/mmv1/third_party/terraform/services/servicemanagement/resource_endpoints_service_test.go index beb0190d5b2c..6129b99bc50f 100644 --- a/mmv1/third_party/terraform/services/servicemanagement/resource_endpoints_service_test.go +++ b/mmv1/third_party/terraform/services/servicemanagement/resource_endpoints_service_test.go @@ -9,8 +9,8 @@ import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/servicenetworking/data_source_google_service_networking_peered_dns_domain_test.go b/mmv1/third_party/terraform/services/servicenetworking/data_source_google_service_networking_peered_dns_domain_test.go index 20076a17d773..ef1849b31545 100644 --- a/mmv1/third_party/terraform/services/servicenetworking/data_source_google_service_networking_peered_dns_domain_test.go +++ b/mmv1/third_party/terraform/services/servicenetworking/data_source_google_service_networking_peered_dns_domain_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/servicenetworking/resource_google_service_networking_peered_dns_domain_test.go b/mmv1/third_party/terraform/services/servicenetworking/resource_google_service_networking_peered_dns_domain_test.go index fbde0bac86ec..d7ba99d3a270 100644 --- a/mmv1/third_party/terraform/services/servicenetworking/resource_google_service_networking_peered_dns_domain_test.go +++ b/mmv1/third_party/terraform/services/servicenetworking/resource_google_service_networking_peered_dns_domain_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/servicenetworking/resource_service_networking_connection_test.go b/mmv1/third_party/terraform/services/servicenetworking/resource_service_networking_connection_test.go index b50bc7bdcbc6..07ed127577c0 100644 --- a/mmv1/third_party/terraform/services/servicenetworking/resource_service_networking_connection_test.go +++ b/mmv1/third_party/terraform/services/servicenetworking/resource_service_networking_connection_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/servicenetworking/resource_service_networking_vpc_service_controls_test.go b/mmv1/third_party/terraform/services/servicenetworking/resource_service_networking_vpc_service_controls_test.go index 7e1cf81b65fe..0f12ea770fa5 100644 --- a/mmv1/third_party/terraform/services/servicenetworking/resource_service_networking_vpc_service_controls_test.go +++ b/mmv1/third_party/terraform/services/servicenetworking/resource_service_networking_vpc_service_controls_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/serviceusage/go/resource_service_usage_consumer_quota_override_test.go.tmpl b/mmv1/third_party/terraform/services/serviceusage/go/resource_service_usage_consumer_quota_override_test.go.tmpl index 3edd4118ea91..22a7d1e9f0bc 100644 --- a/mmv1/third_party/terraform/services/serviceusage/go/resource_service_usage_consumer_quota_override_test.go.tmpl +++ b/mmv1/third_party/terraform/services/serviceusage/go/resource_service_usage_consumer_quota_override_test.go.tmpl @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccServiceUsageConsumerQuotaOverride_consumerQuotaOverrideCustomIncorrectLimitFormat(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/serviceusage/resource_service_usage_consumer_quota_override_test.go.erb b/mmv1/third_party/terraform/services/serviceusage/resource_service_usage_consumer_quota_override_test.go.erb index e17f2cb11f2f..9ee901f4a6c2 100644 --- a/mmv1/third_party/terraform/services/serviceusage/resource_service_usage_consumer_quota_override_test.go.erb +++ b/mmv1/third_party/terraform/services/serviceusage/resource_service_usage_consumer_quota_override_test.go.erb @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccServiceUsageConsumerQuotaOverride_consumerQuotaOverrideCustomIncorrectLimitFormat(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/siteverification/data_source_google_site_verification_token_test.go b/mmv1/third_party/terraform/services/siteverification/data_source_google_site_verification_token_test.go index 96b5bdfb7721..17dd51040494 100644 --- a/mmv1/third_party/terraform/services/siteverification/data_source_google_site_verification_token_test.go +++ b/mmv1/third_party/terraform/services/siteverification/data_source_google_site_verification_token_test.go @@ -5,7 +5,7 @@ package siteverification_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/sourcerepo/data_source_sourcerepo_repository_test.go b/mmv1/third_party/terraform/services/sourcerepo/data_source_sourcerepo_repository_test.go index d88fc10a417d..7a33d2a19fd4 100644 --- a/mmv1/third_party/terraform/services/sourcerepo/data_source_sourcerepo_repository_test.go +++ b/mmv1/third_party/terraform/services/sourcerepo/data_source_sourcerepo_repository_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/sourcerepo/resource_sourcerepo_repository_test.go b/mmv1/third_party/terraform/services/sourcerepo/resource_sourcerepo_repository_test.go index 4cb1a3ae1d55..b269bde99181 100644 --- a/mmv1/third_party/terraform/services/sourcerepo/resource_sourcerepo_repository_test.go +++ b/mmv1/third_party/terraform/services/sourcerepo/resource_sourcerepo_repository_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/spanner/data_source_spanner_instance_test.go b/mmv1/third_party/terraform/services/spanner/data_source_spanner_instance_test.go index a9eb7fb5eea1..f6ae6c175bae 100644 --- a/mmv1/third_party/terraform/services/spanner/data_source_spanner_instance_test.go +++ b/mmv1/third_party/terraform/services/spanner/data_source_spanner_instance_test.go @@ -3,7 +3,7 @@ package spanner_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/spanner/go/resource_spanner_database_test.go.tmpl b/mmv1/third_party/terraform/services/spanner/go/resource_spanner_database_test.go.tmpl index 083688b518b1..ebbd3e9db26a 100644 --- a/mmv1/third_party/terraform/services/spanner/go/resource_spanner_database_test.go.tmpl +++ b/mmv1/third_party/terraform/services/spanner/go/resource_spanner_database_test.go.tmpl @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/spanner/iam_spanner_database_test.go b/mmv1/third_party/terraform/services/spanner/iam_spanner_database_test.go index edb993494eb7..8ce32e2edce6 100644 --- a/mmv1/third_party/terraform/services/spanner/iam_spanner_database_test.go +++ b/mmv1/third_party/terraform/services/spanner/iam_spanner_database_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/spanner" diff --git a/mmv1/third_party/terraform/services/spanner/iam_spanner_instance_test.go b/mmv1/third_party/terraform/services/spanner/iam_spanner_instance_test.go index e99736f46e21..ad9339172e77 100644 --- a/mmv1/third_party/terraform/services/spanner/iam_spanner_instance_test.go +++ b/mmv1/third_party/terraform/services/spanner/iam_spanner_instance_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/spanner" diff --git a/mmv1/third_party/terraform/services/spanner/resource_spanner_database_test.go.erb b/mmv1/third_party/terraform/services/spanner/resource_spanner_database_test.go.erb index 6043d461b8c2..a5031b5925b1 100644 --- a/mmv1/third_party/terraform/services/spanner/resource_spanner_database_test.go.erb +++ b/mmv1/third_party/terraform/services/spanner/resource_spanner_database_test.go.erb @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/spanner/resource_spanner_instance_config_test.go b/mmv1/third_party/terraform/services/spanner/resource_spanner_instance_config_test.go index b0a39ff656dd..b6253da09e31 100644 --- a/mmv1/third_party/terraform/services/spanner/resource_spanner_instance_config_test.go +++ b/mmv1/third_party/terraform/services/spanner/resource_spanner_instance_config_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) // Acceptance Tests diff --git a/mmv1/third_party/terraform/services/spanner/resource_spanner_instance_test.go b/mmv1/third_party/terraform/services/spanner/resource_spanner_instance_test.go index 1c7c9fe2ef9d..9a46191d0599 100644 --- a/mmv1/third_party/terraform/services/spanner/resource_spanner_instance_test.go +++ b/mmv1/third_party/terraform/services/spanner/resource_spanner_instance_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) // Acceptance Tests diff --git a/mmv1/third_party/terraform/services/sql/data_source_google_sql_ca_certs_test.go b/mmv1/third_party/terraform/services/sql/data_source_google_sql_ca_certs_test.go index 2297c908346c..1065ccdf4943 100644 --- a/mmv1/third_party/terraform/services/sql/data_source_google_sql_ca_certs_test.go +++ b/mmv1/third_party/terraform/services/sql/data_source_google_sql_ca_certs_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/sql/data_source_google_sql_tiers_test.go b/mmv1/third_party/terraform/services/sql/data_source_google_sql_tiers_test.go index ea09ca734790..7730faea4cdf 100644 --- a/mmv1/third_party/terraform/services/sql/data_source_google_sql_tiers_test.go +++ b/mmv1/third_party/terraform/services/sql/data_source_google_sql_tiers_test.go @@ -3,7 +3,7 @@ package sql_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/sql/data_source_sql_backup_run_test.go b/mmv1/third_party/terraform/services/sql/data_source_sql_backup_run_test.go index 07473c0018db..39958750dd82 100644 --- a/mmv1/third_party/terraform/services/sql/data_source_sql_backup_run_test.go +++ b/mmv1/third_party/terraform/services/sql/data_source_sql_backup_run_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceSqlBackupRun_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/sql/data_source_sql_database_instance_latest_recovery_time_test.go b/mmv1/third_party/terraform/services/sql/data_source_sql_database_instance_latest_recovery_time_test.go index 30554de9c6cf..9c08ecfb1b25 100644 --- a/mmv1/third_party/terraform/services/sql/data_source_sql_database_instance_latest_recovery_time_test.go +++ b/mmv1/third_party/terraform/services/sql/data_source_sql_database_instance_latest_recovery_time_test.go @@ -3,7 +3,7 @@ package sql_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/sql/data_source_sql_database_instance_test.go b/mmv1/third_party/terraform/services/sql/data_source_sql_database_instance_test.go index 1f73b5c4fb86..eff9e26a2e9e 100644 --- a/mmv1/third_party/terraform/services/sql/data_source_sql_database_instance_test.go +++ b/mmv1/third_party/terraform/services/sql/data_source_sql_database_instance_test.go @@ -3,7 +3,7 @@ package sql_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/sql/data_source_sql_database_instances_test.go b/mmv1/third_party/terraform/services/sql/data_source_sql_database_instances_test.go index a5a73e3d11b0..4224dc317810 100644 --- a/mmv1/third_party/terraform/services/sql/data_source_sql_database_instances_test.go +++ b/mmv1/third_party/terraform/services/sql/data_source_sql_database_instances_test.go @@ -6,8 +6,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/sql/data_source_sql_database_test.go b/mmv1/third_party/terraform/services/sql/data_source_sql_database_test.go index 4a288203e384..69f814c137e0 100644 --- a/mmv1/third_party/terraform/services/sql/data_source_sql_database_test.go +++ b/mmv1/third_party/terraform/services/sql/data_source_sql_database_test.go @@ -3,7 +3,7 @@ package sql_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/sql/data_source_sql_databases_test.go b/mmv1/third_party/terraform/services/sql/data_source_sql_databases_test.go index 91bd88b7a106..c08450c43e64 100644 --- a/mmv1/third_party/terraform/services/sql/data_source_sql_databases_test.go +++ b/mmv1/third_party/terraform/services/sql/data_source_sql_databases_test.go @@ -6,8 +6,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/sql/resource_sql_database_instance_test.go b/mmv1/third_party/terraform/services/sql/resource_sql_database_instance_test.go index b99215e4db4b..5ddb823fcd58 100644 --- a/mmv1/third_party/terraform/services/sql/resource_sql_database_instance_test.go +++ b/mmv1/third_party/terraform/services/sql/resource_sql_database_instance_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/sql" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" sqladmin "google.golang.org/api/sqladmin/v1beta4" ) diff --git a/mmv1/third_party/terraform/services/sql/resource_sql_database_test.go b/mmv1/third_party/terraform/services/sql/resource_sql_database_test.go index 7c2833ee5ea2..aabe707bc983 100644 --- a/mmv1/third_party/terraform/services/sql/resource_sql_database_test.go +++ b/mmv1/third_party/terraform/services/sql/resource_sql_database_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/sql/resource_sql_ssl_cert_test.go b/mmv1/third_party/terraform/services/sql/resource_sql_ssl_cert_test.go index dbee06dfb8fd..d7c4a19b3cfc 100644 --- a/mmv1/third_party/terraform/services/sql/resource_sql_ssl_cert_test.go +++ b/mmv1/third_party/terraform/services/sql/resource_sql_ssl_cert_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/sql/resource_sql_user_test.go b/mmv1/third_party/terraform/services/sql/resource_sql_user_test.go index 527179d03961..6ee5d029f253 100644 --- a/mmv1/third_party/terraform/services/sql/resource_sql_user_test.go +++ b/mmv1/third_party/terraform/services/sql/resource_sql_user_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/storage/data_source_google_storage_bucket_objects_test.go b/mmv1/third_party/terraform/services/storage/data_source_google_storage_bucket_objects_test.go index e4f3632317fe..add28b454e72 100644 --- a/mmv1/third_party/terraform/services/storage/data_source_google_storage_bucket_objects_test.go +++ b/mmv1/third_party/terraform/services/storage/data_source_google_storage_bucket_objects_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/storage/data_source_google_storage_bucket_test.go b/mmv1/third_party/terraform/services/storage/data_source_google_storage_bucket_test.go index 4628f6f002b9..99c0f818510f 100644 --- a/mmv1/third_party/terraform/services/storage/data_source_google_storage_bucket_test.go +++ b/mmv1/third_party/terraform/services/storage/data_source_google_storage_bucket_test.go @@ -3,7 +3,7 @@ package storage_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/storage/data_source_google_storage_buckets_test.go b/mmv1/third_party/terraform/services/storage/data_source_google_storage_buckets_test.go index 63cbf32b2d9f..bf999a4ad9f1 100644 --- a/mmv1/third_party/terraform/services/storage/data_source_google_storage_buckets_test.go +++ b/mmv1/third_party/terraform/services/storage/data_source_google_storage_buckets_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/storage/data_source_google_storage_project_service_account_test.go b/mmv1/third_party/terraform/services/storage/data_source_google_storage_project_service_account_test.go index 619f70afa7b1..bb5687294c06 100644 --- a/mmv1/third_party/terraform/services/storage/data_source_google_storage_project_service_account_test.go +++ b/mmv1/third_party/terraform/services/storage/data_source_google_storage_project_service_account_test.go @@ -3,7 +3,7 @@ package storage_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/storage/data_source_storage_bucket_object_content_test.go b/mmv1/third_party/terraform/services/storage/data_source_storage_bucket_object_content_test.go index 5b40c4ee1089..ec3f170655d8 100644 --- a/mmv1/third_party/terraform/services/storage/data_source_storage_bucket_object_content_test.go +++ b/mmv1/third_party/terraform/services/storage/data_source_storage_bucket_object_content_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/storage/data_source_storage_object_signed_url_test.go b/mmv1/third_party/terraform/services/storage/data_source_storage_object_signed_url_test.go index 950b32e98e6f..d81f00bb9f3e 100644 --- a/mmv1/third_party/terraform/services/storage/data_source_storage_object_signed_url_test.go +++ b/mmv1/third_party/terraform/services/storage/data_source_storage_object_signed_url_test.go @@ -8,8 +8,8 @@ import ( "net/http" "github.com/hashicorp/go-cleanhttp" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/storage/go/resource_storage_bucket_test.go b/mmv1/third_party/terraform/services/storage/go/resource_storage_bucket_test.go index caf628772936..5d29b58405d7 100644 --- a/mmv1/third_party/terraform/services/storage/go/resource_storage_bucket_test.go +++ b/mmv1/third_party/terraform/services/storage/go/resource_storage_bucket_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" @@ -133,7 +133,7 @@ func TestAccStorageBucket_AutoclassDiffSupress(t *testing.T) { ImportStateVerifyIgnore: []string{"force_destroy"}, }, { - Config: testAccStorageBucket_basicWithAutoclass(bucketName,false), + Config: testAccStorageBucket_basicWithAutoclass(bucketName, false), Check: resource.ComposeTestCheckFunc( testAccCheckStorageBucketExists( t, "google_storage_bucket.bucket", bucketName, &bucket), @@ -146,7 +146,7 @@ func TestAccStorageBucket_AutoclassDiffSupress(t *testing.T) { ImportStateVerifyIgnore: []string{"force_destroy"}, }, { - Config: testAccStorageBucket_basicWithAutoclass(bucketName,true), + Config: testAccStorageBucket_basicWithAutoclass(bucketName, true), Check: resource.ComposeTestCheckFunc( testAccCheckStorageBucketExists( t, "google_storage_bucket.bucket", bucketName, &bucket), @@ -346,7 +346,7 @@ func TestAccStorageBucket_dualLocation_rpo(t *testing.T) { ImportStateVerifyIgnore: []string{"force_destroy"}, }, { - Config: testAccStorageBucket_dualLocation_rpo(bucketName,"ASYNC_TURBO"), + Config: testAccStorageBucket_dualLocation_rpo(bucketName, "ASYNC_TURBO"), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr( "google_storage_bucket.bucket", "rpo", "ASYNC_TURBO"), @@ -359,7 +359,7 @@ func TestAccStorageBucket_dualLocation_rpo(t *testing.T) { ImportStateVerifyIgnore: []string{"force_destroy"}, }, { - Config: testAccStorageBucket_dualLocation_rpo(bucketName,"DEFAULT"), + Config: testAccStorageBucket_dualLocation_rpo(bucketName, "DEFAULT"), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr( "google_storage_bucket.bucket", "rpo", "DEFAULT"), @@ -399,7 +399,7 @@ func TestAccStorageBucket_multiLocation_rpo(t *testing.T) { ImportStateVerifyIgnore: []string{"force_destroy"}, }, { - Config: testAccStorageBucket_multiLocation_rpo(bucketName,"DEFAULT"), + Config: testAccStorageBucket_multiLocation_rpo(bucketName, "DEFAULT"), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr( "google_storage_bucket.bucket", "rpo", "DEFAULT"), @@ -653,7 +653,7 @@ func TestAccStorageBucket_lifecycleRulesVirtualFields(t *testing.T) { ResourceName: "google_storage_bucket.bucket", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"force_destroy","lifecycle_rule.1.condition.0.no_age","lifecycle_rule.1.condition.0.send_days_since_noncurrent_time_if_zero","lifecycle_rule.2.condition.0.send_days_since_noncurrent_time_if_zero","lifecycle_rule.1.condition.0.send_days_since_custom_time_if_zero","lifecycle_rule.2.condition.0.send_days_since_custom_time_if_zero","lifecycle_rule.1.condition.0.send_num_newer_versions_if_zero","lifecycle_rule.2.condition.0.send_num_newer_versions_if_zero"}, + ImportStateVerifyIgnore: []string{"force_destroy", "lifecycle_rule.1.condition.0.no_age", "lifecycle_rule.1.condition.0.send_days_since_noncurrent_time_if_zero", "lifecycle_rule.2.condition.0.send_days_since_noncurrent_time_if_zero", "lifecycle_rule.1.condition.0.send_days_since_custom_time_if_zero", "lifecycle_rule.2.condition.0.send_days_since_custom_time_if_zero", "lifecycle_rule.1.condition.0.send_num_newer_versions_if_zero", "lifecycle_rule.2.condition.0.send_num_newer_versions_if_zero"}, }, { Config: testAccStorageBucket_customAttributes_withLifecycleVirtualFieldsUpdate2(bucketName), @@ -667,7 +667,7 @@ func TestAccStorageBucket_lifecycleRulesVirtualFields(t *testing.T) { ResourceName: "google_storage_bucket.bucket", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"force_destroy","lifecycle_rule.1.condition.0.no_age","lifecycle_rule.0.condition.0.send_days_since_noncurrent_time_if_zero","lifecycle_rule.0.condition.0.send_days_since_custom_time_if_zero","lifecycle_rule.0.condition.0.send_num_newer_versions_if_zero"}, + ImportStateVerifyIgnore: []string{"force_destroy", "lifecycle_rule.1.condition.0.no_age", "lifecycle_rule.0.condition.0.send_days_since_noncurrent_time_if_zero", "lifecycle_rule.0.condition.0.send_days_since_custom_time_if_zero", "lifecycle_rule.0.condition.0.send_num_newer_versions_if_zero"}, }, { Config: testAccStorageBucket_customAttributes_withLifecycle1(bucketName), @@ -1510,7 +1510,7 @@ func TestAccStorageBucket_SoftDeletePolicy(t *testing.T) { ImportStateVerifyIgnore: []string{"force_destroy"}, }, { - Config: testAccStorageBucket_SoftDeletePolicy(bucketName,7776000), + Config: testAccStorageBucket_SoftDeletePolicy(bucketName, 7776000), Check: resource.ComposeTestCheckFunc( testAccCheckStorageBucketExists( t, "google_storage_bucket.bucket", bucketName, &bucket), @@ -1525,7 +1525,7 @@ func TestAccStorageBucket_SoftDeletePolicy(t *testing.T) { ImportStateVerifyIgnore: []string{"force_destroy"}, }, { - Config: testAccStorageBucket_SoftDeletePolicy(bucketName,0), + Config: testAccStorageBucket_SoftDeletePolicy(bucketName, 0), Check: resource.ComposeTestCheckFunc( testAccCheckStorageBucketExists( t, "google_storage_bucket.bucket", bucketName, &bucket), @@ -1801,7 +1801,7 @@ resource "google_storage_bucket" "bucket" { `, bucketName) } -func testAccStorageBucket_dualLocation_rpo(bucketName string,rpo string) string { +func testAccStorageBucket_dualLocation_rpo(bucketName string, rpo string) string { return fmt.Sprintf(` resource "google_storage_bucket" "bucket" { name = "%s" @@ -1812,10 +1812,10 @@ resource "google_storage_bucket" "bucket" { } rpo = "%s" } -`, bucketName,rpo) +`, bucketName, rpo) } -func testAccStorageBucket_multiLocation_rpo(bucketName string,rpo string) string { +func testAccStorageBucket_multiLocation_rpo(bucketName string, rpo string) string { return fmt.Sprintf(` resource "google_storage_bucket" "bucket" { name = "%s" @@ -1823,7 +1823,7 @@ resource "google_storage_bucket" "bucket" { force_destroy = true rpo = "%s" } -`, bucketName,rpo) +`, bucketName, rpo) } func testAccStorageBucket_customAttributes(bucketName string) string { @@ -2543,7 +2543,7 @@ resource "google_storage_bucket" "bucket" { } func testAccStorageBucket_SoftDeletePolicy(bucketName string, duration int) string { - return fmt.Sprintf(` + return fmt.Sprintf(` resource "google_storage_bucket" "bucket" { name = "%s" location = "US" diff --git a/mmv1/third_party/terraform/services/storage/iam_storage_managed_folder_test.go b/mmv1/third_party/terraform/services/storage/iam_storage_managed_folder_test.go index d965ef054a2b..befb1adf2177 100644 --- a/mmv1/third_party/terraform/services/storage/iam_storage_managed_folder_test.go +++ b/mmv1/third_party/terraform/services/storage/iam_storage_managed_folder_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/storage/resource_storage_bucket_access_control_test.go b/mmv1/third_party/terraform/services/storage/resource_storage_bucket_access_control_test.go index 2085d690b5eb..31c52b69c807 100644 --- a/mmv1/third_party/terraform/services/storage/resource_storage_bucket_access_control_test.go +++ b/mmv1/third_party/terraform/services/storage/resource_storage_bucket_access_control_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/storage/resource_storage_bucket_acl_test.go b/mmv1/third_party/terraform/services/storage/resource_storage_bucket_acl_test.go index f77fe398d539..a2a862e89204 100644 --- a/mmv1/third_party/terraform/services/storage/resource_storage_bucket_acl_test.go +++ b/mmv1/third_party/terraform/services/storage/resource_storage_bucket_acl_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/storage" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) var ( diff --git a/mmv1/third_party/terraform/services/storage/resource_storage_bucket_iam_test.go b/mmv1/third_party/terraform/services/storage/resource_storage_bucket_iam_test.go index 540b7ded2ca0..f9c4aebf636e 100644 --- a/mmv1/third_party/terraform/services/storage/resource_storage_bucket_iam_test.go +++ b/mmv1/third_party/terraform/services/storage/resource_storage_bucket_iam_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/storage/resource_storage_bucket_object_test.go b/mmv1/third_party/terraform/services/storage/resource_storage_bucket_object_test.go index 65eb43de233e..263e6c416f36 100644 --- a/mmv1/third_party/terraform/services/storage/resource_storage_bucket_object_test.go +++ b/mmv1/third_party/terraform/services/storage/resource_storage_bucket_object_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "os" diff --git a/mmv1/third_party/terraform/services/storage/resource_storage_bucket_test.go.erb b/mmv1/third_party/terraform/services/storage/resource_storage_bucket_test.go.erb index af3ef062a21c..5123c6588ef8 100644 --- a/mmv1/third_party/terraform/services/storage/resource_storage_bucket_test.go.erb +++ b/mmv1/third_party/terraform/services/storage/resource_storage_bucket_test.go.erb @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/storage/resource_storage_default_object_access_control_test.go b/mmv1/third_party/terraform/services/storage/resource_storage_default_object_access_control_test.go index 66120dea0e8b..e3487e2686fd 100644 --- a/mmv1/third_party/terraform/services/storage/resource_storage_default_object_access_control_test.go +++ b/mmv1/third_party/terraform/services/storage/resource_storage_default_object_access_control_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/storage/resource_storage_default_object_acl_test.go b/mmv1/third_party/terraform/services/storage/resource_storage_default_object_acl_test.go index a8ff548a5429..db63891ed34f 100644 --- a/mmv1/third_party/terraform/services/storage/resource_storage_default_object_acl_test.go +++ b/mmv1/third_party/terraform/services/storage/resource_storage_default_object_acl_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/storage" ) diff --git a/mmv1/third_party/terraform/services/storage/resource_storage_hmac_key_test.go b/mmv1/third_party/terraform/services/storage/resource_storage_hmac_key_test.go index 769cce82caf9..07652a858262 100644 --- a/mmv1/third_party/terraform/services/storage/resource_storage_hmac_key_test.go +++ b/mmv1/third_party/terraform/services/storage/resource_storage_hmac_key_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/storage/resource_storage_notification_test.go b/mmv1/third_party/terraform/services/storage/resource_storage_notification_test.go index 2d2a36888255..a3650a829875 100644 --- a/mmv1/third_party/terraform/services/storage/resource_storage_notification_test.go +++ b/mmv1/third_party/terraform/services/storage/resource_storage_notification_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" tpgstorage "github.com/hashicorp/terraform-provider-google/google/services/storage" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/storage/v1" ) diff --git a/mmv1/third_party/terraform/services/storage/resource_storage_object_access_control_test.go b/mmv1/third_party/terraform/services/storage/resource_storage_object_access_control_test.go index fcb5787826e9..953c81b41e83 100644 --- a/mmv1/third_party/terraform/services/storage/resource_storage_object_access_control_test.go +++ b/mmv1/third_party/terraform/services/storage/resource_storage_object_access_control_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccStorageObjectAccessControl_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/storage/resource_storage_object_acl_test.go b/mmv1/third_party/terraform/services/storage/resource_storage_object_acl_test.go index dc9202e226a4..e23f5903bb0b 100644 --- a/mmv1/third_party/terraform/services/storage/resource_storage_object_acl_test.go +++ b/mmv1/third_party/terraform/services/storage/resource_storage_object_acl_test.go @@ -16,9 +16,9 @@ import ( transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) var tfObjectAcl, errObjectAcl = ioutil.TempFile("", "tf-gce-test") diff --git a/mmv1/third_party/terraform/services/storageinsights/resource_storage_insights_report_config_test.go b/mmv1/third_party/terraform/services/storageinsights/resource_storage_insights_report_config_test.go index 16a2d727e84e..1fa0886f3669 100644 --- a/mmv1/third_party/terraform/services/storageinsights/resource_storage_insights_report_config_test.go +++ b/mmv1/third_party/terraform/services/storageinsights/resource_storage_insights_report_config_test.go @@ -5,7 +5,7 @@ package storageinsights_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/storagetransfer/data_source_google_storage_transfer_project_service_account_test.go b/mmv1/third_party/terraform/services/storagetransfer/data_source_google_storage_transfer_project_service_account_test.go index e49fe9f4acf3..f09131c19cba 100644 --- a/mmv1/third_party/terraform/services/storagetransfer/data_source_google_storage_transfer_project_service_account_test.go +++ b/mmv1/third_party/terraform/services/storagetransfer/data_source_google_storage_transfer_project_service_account_test.go @@ -3,7 +3,7 @@ package storagetransfer_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_agent_pool_test.go b/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_agent_pool_test.go index 3791e06b0d85..d3fe9f0ea67f 100644 --- a/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_agent_pool_test.go +++ b/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_agent_pool_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_job_test.go b/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_job_test.go index e434e04ac672..39c9dba9257f 100644 --- a/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_job_test.go +++ b/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_job_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/tags/data_source_tags_tag_key_test.go b/mmv1/third_party/terraform/services/tags/data_source_tags_tag_key_test.go index 68fc492475c0..38348a3581a9 100644 --- a/mmv1/third_party/terraform/services/tags/data_source_tags_tag_key_test.go +++ b/mmv1/third_party/terraform/services/tags/data_source_tags_tag_key_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/tags/data_source_tags_tag_keys_test.go b/mmv1/third_party/terraform/services/tags/data_source_tags_tag_keys_test.go index 88ee7ae1db78..e1f674537ced 100644 --- a/mmv1/third_party/terraform/services/tags/data_source_tags_tag_keys_test.go +++ b/mmv1/third_party/terraform/services/tags/data_source_tags_tag_keys_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/tags/data_source_tags_tag_value_test.go b/mmv1/third_party/terraform/services/tags/data_source_tags_tag_value_test.go index 14722c2ef8ed..4218f28bb2a4 100644 --- a/mmv1/third_party/terraform/services/tags/data_source_tags_tag_value_test.go +++ b/mmv1/third_party/terraform/services/tags/data_source_tags_tag_value_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/tags/data_source_tags_tag_values_test.go b/mmv1/third_party/terraform/services/tags/data_source_tags_tag_values_test.go index 4d24bc3b8af4..4f67edb071cc 100644 --- a/mmv1/third_party/terraform/services/tags/data_source_tags_tag_values_test.go +++ b/mmv1/third_party/terraform/services/tags/data_source_tags_tag_values_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/tags/resource_tags_test.go b/mmv1/third_party/terraform/services/tags/resource_tags_test.go index 55ea6bd43acc..ec62dd61d55d 100644 --- a/mmv1/third_party/terraform/services/tags/resource_tags_test.go +++ b/mmv1/third_party/terraform/services/tags/resource_tags_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/tpu/data_source_tpu_tensorflow_versions_test.go b/mmv1/third_party/terraform/services/tpu/data_source_tpu_tensorflow_versions_test.go index 15a4f15a0325..78661db237e8 100644 --- a/mmv1/third_party/terraform/services/tpu/data_source_tpu_tensorflow_versions_test.go +++ b/mmv1/third_party/terraform/services/tpu/data_source_tpu_tensorflow_versions_test.go @@ -6,8 +6,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/tpu/resource_tpu_node_test.go b/mmv1/third_party/terraform/services/tpu/resource_tpu_node_test.go index 8f15528f34d3..1b7d5caff451 100644 --- a/mmv1/third_party/terraform/services/tpu/resource_tpu_node_test.go +++ b/mmv1/third_party/terraform/services/tpu/resource_tpu_node_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccTPUNode_tpuNodeBUpdateTensorFlowVersion(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/tpuv2/data_source_tpu_v2_accelerator_types_test.go.erb b/mmv1/third_party/terraform/services/tpuv2/data_source_tpu_v2_accelerator_types_test.go.erb index 839b1eff795b..1cbbb2119aed 100644 --- a/mmv1/third_party/terraform/services/tpuv2/data_source_tpu_v2_accelerator_types_test.go.erb +++ b/mmv1/third_party/terraform/services/tpuv2/data_source_tpu_v2_accelerator_types_test.go.erb @@ -8,8 +8,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/tpuv2/data_source_tpu_v2_runtime_versions_test.go.erb b/mmv1/third_party/terraform/services/tpuv2/data_source_tpu_v2_runtime_versions_test.go.erb index 07f27570f68a..fe3295b1c12a 100644 --- a/mmv1/third_party/terraform/services/tpuv2/data_source_tpu_v2_runtime_versions_test.go.erb +++ b/mmv1/third_party/terraform/services/tpuv2/data_source_tpu_v2_runtime_versions_test.go.erb @@ -8,8 +8,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/tpuv2/go/data_source_tpu_v2_accelerator_types_test.go.tmpl b/mmv1/third_party/terraform/services/tpuv2/go/data_source_tpu_v2_accelerator_types_test.go.tmpl index 48a3b43f8e82..13152c86e115 100644 --- a/mmv1/third_party/terraform/services/tpuv2/go/data_source_tpu_v2_accelerator_types_test.go.tmpl +++ b/mmv1/third_party/terraform/services/tpuv2/go/data_source_tpu_v2_accelerator_types_test.go.tmpl @@ -7,8 +7,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/tpuv2/go/data_source_tpu_v2_runtime_versions_test.go.tmpl b/mmv1/third_party/terraform/services/tpuv2/go/data_source_tpu_v2_runtime_versions_test.go.tmpl index cf73db89e4c4..278a1257b60d 100644 --- a/mmv1/third_party/terraform/services/tpuv2/go/data_source_tpu_v2_runtime_versions_test.go.tmpl +++ b/mmv1/third_party/terraform/services/tpuv2/go/data_source_tpu_v2_runtime_versions_test.go.tmpl @@ -7,8 +7,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/tpuv2/go/resource_tpu_v2_vm_test.go.tmpl b/mmv1/third_party/terraform/services/tpuv2/go/resource_tpu_v2_vm_test.go.tmpl index db3405ed03c0..51f39e0400e0 100644 --- a/mmv1/third_party/terraform/services/tpuv2/go/resource_tpu_v2_vm_test.go.tmpl +++ b/mmv1/third_party/terraform/services/tpuv2/go/resource_tpu_v2_vm_test.go.tmpl @@ -5,7 +5,7 @@ import ( "testing" "strconv" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/tpuv2/resource_tpu_v2_vm_test.go.erb b/mmv1/third_party/terraform/services/tpuv2/resource_tpu_v2_vm_test.go.erb index dec66383d1ee..a889fdd1e2d7 100644 --- a/mmv1/third_party/terraform/services/tpuv2/resource_tpu_v2_vm_test.go.erb +++ b/mmv1/third_party/terraform/services/tpuv2/resource_tpu_v2_vm_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "strconv" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/vertexai/data_source_vertex_ai_index_test.go b/mmv1/third_party/terraform/services/vertexai/data_source_vertex_ai_index_test.go index 37f47d69229c..022dfafefdd7 100644 --- a/mmv1/third_party/terraform/services/vertexai/data_source_vertex_ai_index_test.go +++ b/mmv1/third_party/terraform/services/vertexai/data_source_vertex_ai_index_test.go @@ -3,7 +3,7 @@ package vertexai_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/vertexai/go/iam_vertex_endpoint_test.go.tmpl b/mmv1/third_party/terraform/services/vertexai/go/iam_vertex_endpoint_test.go.tmpl index f4c9dfb56400..5a75c52ccc61 100644 --- a/mmv1/third_party/terraform/services/vertexai/go/iam_vertex_endpoint_test.go.tmpl +++ b/mmv1/third_party/terraform/services/vertexai/go/iam_vertex_endpoint_test.go.tmpl @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/vertexai/go/resource_vertex_ai_metadata_store_test.go.tmpl b/mmv1/third_party/terraform/services/vertexai/go/resource_vertex_ai_metadata_store_test.go.tmpl index a1109bbbe47c..2f2170fe940f 100644 --- a/mmv1/third_party/terraform/services/vertexai/go/resource_vertex_ai_metadata_store_test.go.tmpl +++ b/mmv1/third_party/terraform/services/vertexai/go/resource_vertex_ai_metadata_store_test.go.tmpl @@ -7,8 +7,8 @@ import ( "testing" "strings" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/vertexai/iam_vertex_endpoint_test.go.erb b/mmv1/third_party/terraform/services/vertexai/iam_vertex_endpoint_test.go.erb index e1546f4c4dca..304dafde2fd2 100644 --- a/mmv1/third_party/terraform/services/vertexai/iam_vertex_endpoint_test.go.erb +++ b/mmv1/third_party/terraform/services/vertexai/iam_vertex_endpoint_test.go.erb @@ -7,7 +7,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_endpoint_test.go b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_endpoint_test.go index 39687e27ab9c..06a2d818d2da 100644 --- a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_endpoint_test.go +++ b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_endpoint_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_feature_group_feature_test.go b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_feature_group_feature_test.go index 6e394cac2632..156680aecd1e 100644 --- a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_feature_group_feature_test.go +++ b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_feature_group_feature_test.go @@ -3,7 +3,7 @@ package vertexai_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_feature_group_test.go b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_feature_group_test.go index 22db16aef282..5778910b6934 100644 --- a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_feature_group_test.go +++ b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_feature_group_test.go @@ -3,7 +3,7 @@ package vertexai_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_feature_online_store_featureview_test.go b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_feature_online_store_featureview_test.go index 4c3eb97c736f..7ccf26d05866 100644 --- a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_feature_online_store_featureview_test.go +++ b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_feature_online_store_featureview_test.go @@ -6,7 +6,7 @@ package vertexai_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_feature_online_store_test.go b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_feature_online_store_test.go index ca1f59ff0c3c..abce779d1663 100644 --- a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_feature_online_store_test.go +++ b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_feature_online_store_test.go @@ -3,7 +3,7 @@ package vertexai_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_index_endpoint_test.go b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_index_endpoint_test.go index aac5eb5eeb8d..358e5c66a0ef 100644 --- a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_index_endpoint_test.go +++ b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_index_endpoint_test.go @@ -3,7 +3,7 @@ package vertexai_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_index_test.go b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_index_test.go index df53fb43a899..08c4d02f2b60 100644 --- a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_index_test.go +++ b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_index_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_metadata_store_test.go.erb b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_metadata_store_test.go.erb index 5fb1713bb866..d9c45b9cf148 100644 --- a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_metadata_store_test.go.erb +++ b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_metadata_store_test.go.erb @@ -8,8 +8,8 @@ import ( "testing" "strings" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_tensorboard_test.go b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_tensorboard_test.go index a684ba95b623..8cfb7984e688 100644 --- a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_tensorboard_test.go +++ b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_tensorboard_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_peering_test.go b/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_peering_test.go index fc618a9289b4..fff3aafbfcc8 100644 --- a/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_peering_test.go +++ b/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_peering_test.go @@ -3,7 +3,7 @@ package vmwareengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_policy_test.go b/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_policy_test.go index e5c6e39552d6..df76f5d3527a 100644 --- a/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_policy_test.go +++ b/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_policy_test.go @@ -3,7 +3,7 @@ package vmwareengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_test.go b/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_test.go index 3578d14b3896..f59315fab11d 100644 --- a/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_test.go +++ b/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_test.go @@ -3,7 +3,7 @@ package vmwareengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_cluster_test.go b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_cluster_test.go index aee65141f609..ddedb3210f44 100644 --- a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_cluster_test.go +++ b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_cluster_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_external_access_rule_test.go b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_external_access_rule_test.go index f28b2970c404..d54e3eecdda4 100644 --- a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_external_access_rule_test.go +++ b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_external_access_rule_test.go @@ -3,7 +3,7 @@ package vmwareengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_external_address_test.go b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_external_address_test.go index 0a7681e81649..cbad915c046c 100644 --- a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_external_address_test.go +++ b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_external_address_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_peering_test.go b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_peering_test.go index 55faba0cf97e..eda97eae2c4f 100644 --- a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_peering_test.go +++ b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_peering_test.go @@ -3,7 +3,7 @@ package vmwareengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_policy_test.go b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_policy_test.go index 114428107e5f..c1fd041086d6 100644 --- a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_policy_test.go +++ b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_policy_test.go @@ -3,7 +3,7 @@ package vmwareengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" diff --git a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_test.go b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_test.go index 9a012d225cb2..2497e263486a 100644 --- a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_test.go +++ b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_private_cloud_test.go b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_private_cloud_test.go index 4423b9106d93..10f7d9f19626 100644 --- a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_private_cloud_test.go +++ b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_private_cloud_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/tpgresource" diff --git a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_subnet_test.go b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_subnet_test.go index dfe7c476e6cd..8719cd9384bd 100644 --- a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_subnet_test.go +++ b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_subnet_test.go @@ -3,7 +3,7 @@ package vmwareengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/vpcaccess/data_source_vpc_access_connector_test.go b/mmv1/third_party/terraform/services/vpcaccess/data_source_vpc_access_connector_test.go index b64da1c8fd1f..020d74b154cb 100644 --- a/mmv1/third_party/terraform/services/vpcaccess/data_source_vpc_access_connector_test.go +++ b/mmv1/third_party/terraform/services/vpcaccess/data_source_vpc_access_connector_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/vpcaccess/resource_vpc_access_connector_test.go b/mmv1/third_party/terraform/services/vpcaccess/resource_vpc_access_connector_test.go index c427072f786a..4a5f07e86340 100644 --- a/mmv1/third_party/terraform/services/vpcaccess/resource_vpc_access_connector_test.go +++ b/mmv1/third_party/terraform/services/vpcaccess/resource_vpc_access_connector_test.go @@ -3,7 +3,7 @@ package vpcaccess_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/workbench/go/resource_workbench_instance_shielded_config_test.go b/mmv1/third_party/terraform/services/workbench/go/resource_workbench_instance_shielded_config_test.go index c3e3eb7a30c9..a8448dd9d0e4 100644 --- a/mmv1/third_party/terraform/services/workbench/go/resource_workbench_instance_shielded_config_test.go +++ b/mmv1/third_party/terraform/services/workbench/go/resource_workbench_instance_shielded_config_test.go @@ -1,190 +1,190 @@ package workbench_test import ( - "testing" + "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/hashicorp/terraform-provider-google/google/acctest" + "github.com/hashicorp/terraform-provider-google/google/acctest" ) func TestAccWorkbenchInstance_shielded_config_update(t *testing.T) { - t.Parallel() - - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } - - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccWorkbenchInstance_shielded_config_false(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), - }, - { - ResourceName: "google_workbench_instance.instance", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, - }, - { - Config: testAccWorkbenchInstance_shielded_config_true(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), - }, - { - ResourceName: "google_workbench_instance.instance", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, - }, - }, - }) + t.Parallel() + + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } + + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccWorkbenchInstance_shielded_config_false(context), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), + }, + { + ResourceName: "google_workbench_instance.instance", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, + }, + { + Config: testAccWorkbenchInstance_shielded_config_true(context), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), + }, + { + ResourceName: "google_workbench_instance.instance", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, + }, + }, + }) } func TestAccWorkbenchInstance_shielded_config_remove(t *testing.T) { - t.Parallel() - - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } - - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccWorkbenchInstance_shielded_config_true(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), - }, - { - ResourceName: "google_workbench_instance.instance", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, - }, - { - Config: testAccWorkbenchInstance_shielded_config_none(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), - }, - { - ResourceName: "google_workbench_instance.instance", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, - }, - }, - }) + t.Parallel() + + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } + + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccWorkbenchInstance_shielded_config_true(context), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), + }, + { + ResourceName: "google_workbench_instance.instance", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, + }, + { + Config: testAccWorkbenchInstance_shielded_config_none(context), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), + }, + { + ResourceName: "google_workbench_instance.instance", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, + }, + }, + }) } func TestAccWorkbenchInstance_shielded_config_double_apply(t *testing.T) { - t.Parallel() - - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } - - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccWorkbenchInstance_shielded_config_none(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), - }, - { - ResourceName: "google_workbench_instance.instance", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, - }, - { - Config: testAccWorkbenchInstance_shielded_config_none(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), - }, - { - ResourceName: "google_workbench_instance.instance", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, - }, - { - Config: testAccWorkbenchInstance_shielded_config_false(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), - }, - { - ResourceName: "google_workbench_instance.instance", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, - }, - { - Config: testAccWorkbenchInstance_shielded_config_false(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), - }, - { - ResourceName: "google_workbench_instance.instance", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, - }, - { - Config: testAccWorkbenchInstance_shielded_config_true(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), - }, - { - ResourceName: "google_workbench_instance.instance", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, - }, - { - Config: testAccWorkbenchInstance_shielded_config_true(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), - }, - { - ResourceName: "google_workbench_instance.instance", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, - }, - }, - }) + t.Parallel() + + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } + + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccWorkbenchInstance_shielded_config_none(context), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), + }, + { + ResourceName: "google_workbench_instance.instance", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, + }, + { + Config: testAccWorkbenchInstance_shielded_config_none(context), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), + }, + { + ResourceName: "google_workbench_instance.instance", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, + }, + { + Config: testAccWorkbenchInstance_shielded_config_false(context), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), + }, + { + ResourceName: "google_workbench_instance.instance", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, + }, + { + Config: testAccWorkbenchInstance_shielded_config_false(context), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), + }, + { + ResourceName: "google_workbench_instance.instance", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, + }, + { + Config: testAccWorkbenchInstance_shielded_config_true(context), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), + }, + { + ResourceName: "google_workbench_instance.instance", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, + }, + { + Config: testAccWorkbenchInstance_shielded_config_true(context), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), + }, + { + ResourceName: "google_workbench_instance.instance", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, + }, + }, + }) } func testAccWorkbenchInstance_shielded_config_true(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_workbench_instance" "instance" { name = "tf-test-workbench-instance%{random_suffix}" location = "us-central1-a" @@ -201,7 +201,7 @@ resource "google_workbench_instance" "instance" { } func testAccWorkbenchInstance_shielded_config_false(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_workbench_instance" "instance" { name = "tf-test-workbench-instance%{random_suffix}" location = "us-central1-a" @@ -219,7 +219,7 @@ resource "google_workbench_instance" "instance" { } func testAccWorkbenchInstance_shielded_config_none(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_workbench_instance" "instance" { name = "tf-test-workbench-instance%{random_suffix}" location = "us-central1-a" diff --git a/mmv1/third_party/terraform/services/workbench/go/resource_workbench_instance_test.go b/mmv1/third_party/terraform/services/workbench/go/resource_workbench_instance_test.go index a931960089f2..1f1818902f73 100644 --- a/mmv1/third_party/terraform/services/workbench/go/resource_workbench_instance_test.go +++ b/mmv1/third_party/terraform/services/workbench/go/resource_workbench_instance_test.go @@ -3,7 +3,7 @@ package workbench_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) @@ -22,9 +22,9 @@ func TestAccWorkbenchInstance_update(t *testing.T) { { Config: testAccWorkbenchInstance_basic(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -32,12 +32,12 @@ func TestAccWorkbenchInstance_update(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, }, - { + { Config: testAccWorkbenchInstance_update(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -114,9 +114,9 @@ func TestAccWorkbenchInstance_updateGpu(t *testing.T) { { Config: testAccWorkbenchInstance_basicGpu(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -124,12 +124,12 @@ func TestAccWorkbenchInstance_updateGpu(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, }, - { + { Config: testAccWorkbenchInstance_updateGpu(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -202,9 +202,9 @@ func TestAccWorkbenchInstance_removeGpu(t *testing.T) { { Config: testAccWorkbenchInstance_Gpu(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -212,12 +212,12 @@ func TestAccWorkbenchInstance_removeGpu(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, }, - { + { Config: testAccWorkbenchInstance_updateGpu(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -275,9 +275,9 @@ func TestAccWorkbenchInstance_updateMetadata(t *testing.T) { { Config: testAccWorkbenchInstance_basic(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -285,12 +285,12 @@ func TestAccWorkbenchInstance_updateMetadata(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, }, - { + { Config: testAccWorkbenchInstance_updateMetadata(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -336,41 +336,41 @@ func TestAccWorkbenchInstance_updateState(t *testing.T) { { Config: testAccWorkbenchInstance_basic(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels","desired_state"}, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state"}, }, - { + { Config: testAccWorkbenchInstance_updateState(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "STOPPED"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "STOPPED"), + ), }, { ResourceName: "google_workbench_instance.instance", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels","desired_state"}, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state"}, }, - { + { Config: testAccWorkbenchInstance_basic(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels","desired_state"}, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state"}, }, }, }) @@ -402,9 +402,9 @@ func TestAccWorkbenchInstance_empty_accelerator(t *testing.T) { { Config: testAccWorkbenchInstance_basic(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -412,12 +412,12 @@ func TestAccWorkbenchInstance_empty_accelerator(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, }, - { + { Config: testAccWorkbenchInstance_empty_accelerator(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -428,9 +428,9 @@ func TestAccWorkbenchInstance_empty_accelerator(t *testing.T) { { Config: testAccWorkbenchInstance_empty_accelerator(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -470,28 +470,28 @@ func TestAccWorkbenchInstance_updateBootDisk(t *testing.T) { { Config: testAccWorkbenchInstance_basic(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels","desired_state"}, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state"}, }, - { + { Config: testAccWorkbenchInstance_updateBootDisk(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels","desired_state"}, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state"}, }, }, }) @@ -511,28 +511,28 @@ func TestAccWorkbenchInstance_updateDataDisk(t *testing.T) { { Config: testAccWorkbenchInstance_basic(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels","desired_state"}, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state"}, }, - { + { Config: testAccWorkbenchInstance_updateDataDisk(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels","desired_state"}, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state"}, }, }, }) @@ -552,28 +552,28 @@ func TestAccWorkbenchInstance_updateBothDisks(t *testing.T) { { Config: testAccWorkbenchInstance_basic(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { ResourceName: "google_workbench_instance.instance", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels","desired_state"}, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state"}, }, - { + { Config: testAccWorkbenchInstance_updateBothDisks(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { ResourceName: "google_workbench_instance.instance", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels","desired_state"}, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_shielded_config_test.go.erb b/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_shielded_config_test.go.erb index cdb78463e00f..ec3e89c2bce7 100644 --- a/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_shielded_config_test.go.erb +++ b/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_shielded_config_test.go.erb @@ -4,7 +4,7 @@ package workbench_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_test.go.erb b/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_test.go.erb index c7717e77fc71..edb21587b94f 100644 --- a/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_test.go.erb +++ b/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_test.go.erb @@ -4,7 +4,7 @@ package workbench_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/workflows/go/resource_workflows_workflow_test.go b/mmv1/third_party/terraform/services/workflows/go/resource_workflows_workflow_test.go index 521c81231a90..0cf4e7287eeb 100644 --- a/mmv1/third_party/terraform/services/workflows/go/resource_workflows_workflow_test.go +++ b/mmv1/third_party/terraform/services/workflows/go/resource_workflows_workflow_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/workflows" @@ -219,4 +219,3 @@ EOF } `, workflowName, kmsKeyName) } - diff --git a/mmv1/third_party/terraform/services/workflows/resource_workflows_workflow_test.go.erb b/mmv1/third_party/terraform/services/workflows/resource_workflows_workflow_test.go.erb index 452571fc2e55..28192c218582 100644 --- a/mmv1/third_party/terraform/services/workflows/resource_workflows_workflow_test.go.erb +++ b/mmv1/third_party/terraform/services/workflows/resource_workflows_workflow_test.go.erb @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/workflows" diff --git a/mmv1/third_party/terraform/services/workstations/go/resource_workstations_workstation_cluster_test.go.tmpl b/mmv1/third_party/terraform/services/workstations/go/resource_workstations_workstation_cluster_test.go.tmpl index 66ed1107491b..033529548a16 100644 --- a/mmv1/third_party/terraform/services/workstations/go/resource_workstations_workstation_cluster_test.go.tmpl +++ b/mmv1/third_party/terraform/services/workstations/go/resource_workstations_workstation_cluster_test.go.tmpl @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccWorkstationsWorkstationCluster_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/workstations/go/resource_workstations_workstation_config_test.go.tmpl b/mmv1/third_party/terraform/services/workstations/go/resource_workstations_workstation_config_test.go.tmpl index de3c3b343300..dbc2c620580f 100644 --- a/mmv1/third_party/terraform/services/workstations/go/resource_workstations_workstation_config_test.go.tmpl +++ b/mmv1/third_party/terraform/services/workstations/go/resource_workstations_workstation_config_test.go.tmpl @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccWorkstationsWorkstationConfig_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/workstations/go/resource_workstations_workstation_test.go.tmpl b/mmv1/third_party/terraform/services/workstations/go/resource_workstations_workstation_test.go.tmpl index d92dcc634aad..e369acdcd341 100644 --- a/mmv1/third_party/terraform/services/workstations/go/resource_workstations_workstation_test.go.tmpl +++ b/mmv1/third_party/terraform/services/workstations/go/resource_workstations_workstation_test.go.tmpl @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccWorkstationsWorkstation_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_cluster_test.go.erb b/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_cluster_test.go.erb index 57f5de6e6381..cdb3f4924963 100644 --- a/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_cluster_test.go.erb +++ b/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_cluster_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccWorkstationsWorkstationCluster_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_config_test.go.erb b/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_config_test.go.erb index 733e5fad9ccc..65112b1a4fe0 100644 --- a/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_config_test.go.erb +++ b/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_config_test.go.erb @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccWorkstationsWorkstationConfig_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_test.go.erb b/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_test.go.erb index f1de41975189..2962ef4a4c42 100644 --- a/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_test.go.erb +++ b/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_test.go.erb @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccWorkstationsWorkstation_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/sweeper/gcp_sweeper.go b/mmv1/third_party/terraform/sweeper/gcp_sweeper.go index 1d51d9d27ee6..f128c65620cb 100644 --- a/mmv1/third_party/terraform/sweeper/gcp_sweeper.go +++ b/mmv1/third_party/terraform/sweeper/gcp_sweeper.go @@ -7,7 +7,7 @@ import ( "runtime" "strings" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/envvar" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/mmv1/third_party/terraform/sweeper/gcp_sweeper_test.go.erb b/mmv1/third_party/terraform/sweeper/gcp_sweeper_test.go.erb index d33b3ca37f7d..d762f612263d 100644 --- a/mmv1/third_party/terraform/sweeper/gcp_sweeper_test.go.erb +++ b/mmv1/third_party/terraform/sweeper/gcp_sweeper_test.go.erb @@ -5,7 +5,7 @@ package sweeper_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" <% products.each do |product| -%> _ "github.com/hashicorp/terraform-provider-google/google/services/<%= product[:definitions].name.downcase -%>" diff --git a/mmv1/third_party/terraform/tpgresource/resource_test_utils.go b/mmv1/third_party/terraform/tpgresource/resource_test_utils.go index ecd889f0ba29..a80090613f2d 100644 --- a/mmv1/third_party/terraform/tpgresource/resource_test_utils.go +++ b/mmv1/third_party/terraform/tpgresource/resource_test_utils.go @@ -9,7 +9,7 @@ import ( "time" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) diff --git a/tools/test-reader/reader/testdata/service/config_variable_test.go b/tools/test-reader/reader/testdata/service/config_variable_test.go index 28425f80ac2b..ccbb2d4c2bf5 100644 --- a/tools/test-reader/reader/testdata/service/config_variable_test.go +++ b/tools/test-reader/reader/testdata/service/config_variable_test.go @@ -3,7 +3,7 @@ package service_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) var testConfigVariable = ` diff --git a/tools/test-reader/reader/testdata/service/covered_resource_test.go b/tools/test-reader/reader/testdata/service/covered_resource_test.go index c6fa52c9c9e4..89519368e5c4 100644 --- a/tools/test-reader/reader/testdata/service/covered_resource_test.go +++ b/tools/test-reader/reader/testdata/service/covered_resource_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/tools/test-reader/reader/testdata/service/cross_file_1_test.go b/tools/test-reader/reader/testdata/service/cross_file_1_test.go index b2844846f0e2..25dd0e31617c 100644 --- a/tools/test-reader/reader/testdata/service/cross_file_1_test.go +++ b/tools/test-reader/reader/testdata/service/cross_file_1_test.go @@ -3,7 +3,7 @@ package service_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccCrossFile(t *testing.T) { diff --git a/tools/test-reader/reader/testdata/service/cross_file_2_test.go b/tools/test-reader/reader/testdata/service/cross_file_2_test.go index 06b8bea8793c..61e320efa381 100644 --- a/tools/test-reader/reader/testdata/service/cross_file_2_test.go +++ b/tools/test-reader/reader/testdata/service/cross_file_2_test.go @@ -4,7 +4,7 @@ import ( "google/provider/new/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func testAccCrossFile2(t *testing.T) { diff --git a/tools/test-reader/reader/testdata/service/function_call_test.go b/tools/test-reader/reader/testdata/service/function_call_test.go index a430e8a796a9..8ccf7d249914 100644 --- a/tools/test-reader/reader/testdata/service/function_call_test.go +++ b/tools/test-reader/reader/testdata/service/function_call_test.go @@ -3,7 +3,7 @@ package service_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/tools/test-reader/reader/testdata/service/multiple_resource_test.go b/tools/test-reader/reader/testdata/service/multiple_resource_test.go index 2754e4331b9a..df7dc01859ee 100644 --- a/tools/test-reader/reader/testdata/service/multiple_resource_test.go +++ b/tools/test-reader/reader/testdata/service/multiple_resource_test.go @@ -3,7 +3,7 @@ package service_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/tools/test-reader/reader/testdata/service/serial_resource_test.go b/tools/test-reader/reader/testdata/service/serial_resource_test.go index 6704384e895a..33d7c49e761a 100644 --- a/tools/test-reader/reader/testdata/service/serial_resource_test.go +++ b/tools/test-reader/reader/testdata/service/serial_resource_test.go @@ -3,7 +3,7 @@ package service_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/tools/test-reader/reader/testdata/service/uncovered_resource_test.go b/tools/test-reader/reader/testdata/service/uncovered_resource_test.go index 6024634cab6b..5d9d28326ee2 100644 --- a/tools/test-reader/reader/testdata/service/uncovered_resource_test.go +++ b/tools/test-reader/reader/testdata/service/uncovered_resource_test.go @@ -3,7 +3,7 @@ package service_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/tpgtools/ignored_handwritten/state_setters.go b/tpgtools/ignored_handwritten/state_setters.go index 0cdea8de485c..1ca85ad32d4d 100644 --- a/tpgtools/ignored_handwritten/state_setters.go +++ b/tpgtools/ignored_handwritten/state_setters.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) @@ -47,7 +47,7 @@ func generateIfNotSet(d *schema.ResourceData, field, prefix string) (string, err if prefix == "" { prefix = "tf-generated-" } - v := resource.PrefixedUniqueId(prefix) + v := id.PrefixedUniqueId(prefix) if len(v) > 30 { v = v[:30] } diff --git a/tpgtools/templates/test_file.go.tmpl b/tpgtools/templates/test_file.go.tmpl index a7db82894dfd..023ea954c658 100644 --- a/tpgtools/templates/test_file.go.tmpl +++ b/tpgtools/templates/test_file.go.tmpl @@ -42,8 +42,8 @@ import ( {{ end -}} dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" {{$.Package}} "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/{{$.DCLPackage}}" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar"