Fixing tests

Author: YpNo

mmv1/third_party/terraform/services/gkehub2/data_source_google_gke_hub_feature.go

@@ -11,7 +11,7 @@ import (
 func DataSourceGoogleGkeHubFeature() *schema.Resource {
 	dsSchema := tpgresource.DatasourceSchemaFromResourceSchema(ResourceGKEHub2Feature().Schema)
 	tpgresource.AddRequiredFieldsToSchema(dsSchema, "location")
-	tpgresource.AddRequiredFieldsToSchema(dsSchema, "project")
+	tpgresource.AddOptionalFieldsToSchema(dsSchema, "project")
 	tpgresource.AddRequiredFieldsToSchema(dsSchema, "name")
 
 	return &schema.Resource{

mmv1/third_party/terraform/services/gkehub2/data_source_google_gke_hub_feature_test.go

@@ -37,15 +37,13 @@ func TestAccDataSourceGoogleGkeHubFeature_basic(t *testing.T) {
 func testAccDataSourceGoogleGkeHubFeature_basic(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_gke_hub_feature" "example" {
-  location = "us-central1"
-  project  = "%{project}"
+  location = "global"
   name     = "servicemesh"
 }
 
 data "google_gke_hub_feature" "example" {
-  location = google_gke_hub_feature.feature.location
-  project  = google_gke_hub_feature.feature.project
-  name     = google_gke_hub_feature.feature.name
+  location = google_gke_hub_feature.example.location
+  name     = google_gke_hub_feature.example.name
 }
 `, context)
 }

mmv1/third_party/terraform/services/gkehub2/data_source_google_gke_hub_membership_binding_test.go

@@ -1,16 +1,11 @@
 package gkehub2_test
 
 import (
-	"fmt"
-	"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/envvar"
-	"github.com/hashicorp/terraform-provider-google/google/tpgresource"
-	transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
 )
 
 func TestAccDataSourceGoogleGKEHub2MembershipBinding_basic(t *testing.T) {
@@ -73,42 +68,3 @@ data "google_gke_hub_membership_binding" "example" {
 }
 `, context)
 }
-
-func testAccCheckGKEHub2MembershipBindingDestroyProducer(t *testing.T) func(s *terraform.State) error {
-	return func(s *terraform.State) error {
-		for name, rs := range s.RootModule().Resources {
-			if rs.Type != "google_gke_hub_membership_binding" {
-				continue
-			}
-			if strings.HasPrefix(name, "data.") {
-				continue
-			}
-
-			config := acctest.GoogleProviderConfig(t)
-
-			url, err := tpgresource.ReplaceVarsForTest(config, rs, "{{GKEHub2BasePath}}projects/{{project}}/locations/{{location}}/memberships/{{membership_id}}/bindings/{{membership_binding_id}}")
-			if err != nil {
-				return err
-			}
-
-			billingProject := ""
-
-			if config.BillingProject != "" {
-				billingProject = config.BillingProject
-			}
-
-			_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
-				Config:    config,
-				Method:    "GET",
-				Project:   billingProject,
-				RawURL:    url,
-				UserAgent: config.UserAgent,
-			})
-			if err == nil {
-				return fmt.Errorf("GKEHub2MembershipBinding still exists at %s", url)
-			}
-		}
-
-		return nil
-	}
-}