fix gke tests (#9691) (#6788)

[upstream:538c6a37f56c229a4944a151765520e9a9837605]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/9691.txt

@@ -0,0 +1,3 @@
+```release-note:none
+
+```

.teamcity/components/generated/packages.kt

@@ -12,6 +12,11 @@ var packages = mapOf(
         "displayName" to "Environment Variables",
         "path" to "./google-beta/envvar"
     ),
+    "fwmodels" to mapOf(
+        "name" to "fwmodels",
+        "displayName" to "Framework Models",
+        "path" to "./google-beta/fwmodels"
+    ),
     "fwprovider" to mapOf(
         "name" to "fwprovider",
         "displayName" to "Framework Provider",

google-beta/services/gkehub/resource_gke_hub_feature_membership_test.go

@@ -326,8 +326,6 @@ func TestAccGKEHubFeatureMembership_gkehubFeatureAcmAllFields(t *testing.T) {
 		"random_suffix":   acctest.RandString(t, 10),
 		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
-		"network_name":    acctest.BootstrapSharedTestNetwork(t, "gke-cluster"),
-		"subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")),
 	}
 
 	acctest.VcrTest(t, resource.TestCase{
@@ -391,8 +389,6 @@ resource "google_container_cluster" "primary" {
   location           = "us-central1-a"
   initial_node_count = 1
   deletion_protection = false
-  network       = "%{network_name}"
-  subnetwork    = "%{subnetwork_name}"
   depends_on = [google_project_service.mci, google_project_service.container, google_project_service.container, google_project_service.gkehub]
 }
 
@@ -457,8 +453,6 @@ resource "google_container_cluster" "primary" {
   location           = "us-central1-a"
   initial_node_count = 1
   deletion_protection = false
-  network       = "%{network_name}"
-  subnetwork    = "%{subnetwork_name}"
   depends_on = [google_project_service.mci, google_project_service.container, google_project_service.container, google_project_service.gkehub]
 }
 
@@ -524,8 +518,6 @@ resource "google_container_cluster" "primary" {
   location           = "us-central1-a"
   initial_node_count = 1
   deletion_protection = false
-  network       = "%{network_name}"
-  subnetwork    = "%{subnetwork_name}"
   depends_on = [google_project_service.mci, google_project_service.container, google_project_service.container, google_project_service.gkehub, google_project_service.acm]
 }
 
@@ -772,8 +764,6 @@ func TestAccGKEHubFeatureMembership_gkehubFeatureMesh(t *testing.T) {
 		"random_suffix":   acctest.RandString(t, 10),
 		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
-		"network_name":    acctest.BootstrapSharedTestNetwork(t, "gke-cluster"),
-		"subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")),
 	}
 
 	acctest.VcrTest(t, resource.TestCase{
@@ -826,8 +816,6 @@ resource "google_container_cluster" "primary" {
   location           = "us-central1-a"
   initial_node_count = 1
   deletion_protection = false
-  network       = "%{network_name}"
-  subnetwork    = "%{subnetwork_name}"
   depends_on = [google_project_service.container, google_project_service.gkehub]
 }
 
@@ -879,8 +867,6 @@ resource "google_container_cluster" "primary" {
   location           = "us-central1-a"
   initial_node_count = 1
   deletion_protection = false
-  network       = "%{network_name}"
-  subnetwork    = "%{subnetwork_name}"
   depends_on = [google_project_service.container, google_project_service.gkehub]
 }
 
@@ -931,8 +917,6 @@ resource "google_container_cluster" "primary" {
   location           = "us-central1-a"
   initial_node_count = 1
   deletion_protection = false
-  network       = "%{network_name}"
-  subnetwork    = "%{subnetwork_name}"
   depends_on = [google_project_service.container, google_project_service.gkehub]
 }
 
@@ -983,8 +967,6 @@ resource "google_container_cluster" "primary" {
   initial_node_count = 1
   project = google_project.project.project_id
   deletion_protection = false
-  network       = "%{network_name}"
-  subnetwork    = "%{subnetwork_name}"
   depends_on = [google_project_service.container, google_project_service.container, google_project_service.gkehub]
 }
 
@@ -994,8 +976,6 @@ resource "google_container_cluster" "secondary" {
   initial_node_count = 1
   project = google_project.project.project_id
   deletion_protection = false
-  network       = "%{network_name}"
-  subnetwork    = "%{subnetwork_name}"
   depends_on = [google_project_service.container, google_project_service.container, google_project_service.gkehub]
 }
 
@@ -1005,8 +985,6 @@ resource "google_container_cluster" "tertiary" {
   initial_node_count = 1
   project = google_project.project.project_id
   deletion_protection = false
-  network       = "%{network_name}"
-  subnetwork    = "%{subnetwork_name}"
   depends_on = [google_project_service.container, google_project_service.container, google_project_service.gkehub]
 }
 
@@ -1017,8 +995,6 @@ resource "google_container_cluster" "quarternary" {
   initial_node_count = 1
   project = google_project.project.project_id
   deletion_protection = false
-  network       = "%{network_name}"
-  subnetwork    = "%{subnetwork_name}"
   depends_on = [google_project_service.container, google_project_service.container, google_project_service.gkehub]
 }
 
@@ -1085,8 +1061,6 @@ resource "google_container_cluster" "container_acmoci" {
   network = google_compute_network.testnetwork.self_link
   project = google_project.project.project_id
   deletion_protection = false
-  network       = "%{network_name}"
-  subnetwork    = "%{subnetwork_name}"
   depends_on = [google_project_service.container, google_project_service.container, google_project_service.gkehub]
 }
 

google-beta/services/gkehub2/resource_gke_hub_feature_test.go

@@ -207,8 +207,6 @@ func TestAccGKEHubFeature_gkehubFeatureMciUpdate(t *testing.T) {
 		"random_suffix":   acctest.RandString(t, 10),
 		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
-		"network_name":    acctest.BootstrapSharedTestNetwork(t, "gke-cluster"),
-		"subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")),
 	}
 
 	acctest.VcrTest(t, resource.TestCase{
@@ -247,8 +245,6 @@ resource "google_container_cluster" "primary" {
   initial_node_count = 1
   project = google_project.project.project_id
   deletion_protection = false
-  network       = "%{network_name}"
-  subnetwork    = "%{subnetwork_name}"
   depends_on = [google_project_service.mci, google_project_service.container, google_project_service.container, google_project_service.gkehub]
 }
 
@@ -258,8 +254,6 @@ resource "google_container_cluster" "secondary" {
   initial_node_count = 1
   project = google_project.project.project_id
   deletion_protection = false
-  network       = "%{network_name}"
-  subnetwork    = "%{subnetwork_name}"
   depends_on = [google_project_service.mci, google_project_service.container, google_project_service.container, google_project_service.gkehub]
 }
 
@@ -304,8 +298,6 @@ resource "google_container_cluster" "primary" {
   initial_node_count = 1
   project = google_project.project.project_id
   deletion_protection = false
-  network       = "%{network_name}"
-  subnetwork    = "%{subnetwork_name}"
   depends_on = [google_project_service.mci, google_project_service.container, google_project_service.container, google_project_service.gkehub]
 }
 
@@ -315,8 +307,6 @@ resource "google_container_cluster" "secondary" {
   initial_node_count = 1
   project = google_project.project.project_id
   deletion_protection = false
-  network       = "%{network_name}"
-  subnetwork    = "%{subnetwork_name}"
   depends_on = [google_project_service.mci, google_project_service.container, google_project_service.container, google_project_service.gkehub]
 }