Revert "add minItems for the required field scopes (#4634)" (#4686) (#3147)

modular-magician · web-flow · commit 2ae7a612ca21 · 2021-04-12T15:11:35.000-07:00
This reverts commit c3d4d7144ede8ab18e4382a2ac3fb4b076cefebc.

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/4686.txt b/.changelog/4686.txt
diff --git a/google-beta/resource_compute_instance.go b/google-beta/resource_compute_instance.go
@@ -591,7 +591,6 @@ func resourceComputeInstance() *schema.Resource {
 						"scopes": {
 							Type:        schema.TypeSet,
 							Required:    true,
-							MinItems:    1,
 							Description: `A list of service scopes.`,
 							Elem: &schema.Schema{
 								Type: schema.TypeString,
diff --git a/google-beta/resource_dataflow_flex_template_job_test.go b/google-beta/resource_dataflow_flex_template_job_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func TestAccDataflowFlexTemplateJob_basic(t *testing.T) {
diff --git a/google-beta/resource_dataproc_cluster_test.go b/google-beta/resource_dataproc_cluster_test.go
@@ -13,9 +13,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 
-	"google.golang.org/api/googleapi"
-
 	dataproc "google.golang.org/api/dataproc/v1beta2"
+	"google.golang.org/api/googleapi"
 )
 
 func TestDataprocExtractInitTimeout(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"`
`10`	`10`	`"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"`
`11`		`- compute "google.golang.org/api/compute/v1"`
	`11`	`+ "google.golang.org/api/compute/v1"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`func TestAccDataflowFlexTemplateJob_basic(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,8 @@ import (`
`13`	`13`	`"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"`
`14`	`14`	`"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"`
`15`	`15`
`16`		`- "google.golang.org/api/googleapi"`
`17`		`-`
`18`	`16`	`dataproc "google.golang.org/api/dataproc/v1beta2"`
	`17`	`+ "google.golang.org/api/googleapi"`
`19`	`18`	`)`
`20`	`19`
`21`	`20`	`func TestDataprocExtractInitTimeout(t *testing.T) {`