From a691e0379079f0fd3f65f054b4d73456f314dbe8 Mon Sep 17 00:00:00 2001
From: Shuya Ma <87669292+shuyama1@users.noreply.github.com>
Date: Fri, 8 Dec 2023 11:28:47 -0800
Subject: [PATCH] =?UTF-8?q?add=20optional=20input=20ParentService=20to=20B?=
 =?UTF-8?q?ootstrapSharedServiceNetworkingC=E2=80=A6=20(#9598)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mmv1/products/looker/Instance.yaml            |  2 +-
 .../terraform/acctest/bootstrap_test_utils.go | 36 +++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/mmv1/products/looker/Instance.yaml b/mmv1/products/looker/Instance.yaml
index 5af50943cc3b..38b871deb18e 100644
--- a/mmv1/products/looker/Instance.yaml
+++ b/mmv1/products/looker/Instance.yaml
@@ -71,7 +71,7 @@ examples:
     test_vars_overrides:
       address_name: 'acctest.BootstrapSharedTestGlobalAddress(t, "looker-vpc-network-1", acctest.AddressWithPrefixLength(20))'
       kms_key_name: 'acctest.BootstrapKMSKeyInLocation(t, "us-central1").CryptoKey.Name'
-      network_name: 'acctest.BootstrapSharedServiceNetworkingConnection(t, "looker-vpc-network-1", acctest.AddressWithPrefixLength(20))'
+      network_name: 'acctest.BootstrapSharedServiceNetworkingConnection(t, "looker-vpc-network-1", acctest.ServiceNetworkWithPrefixLength(20))'
     skip_docs: true
 parameters:
   - !ruby/object:Api::Type::String
diff --git a/mmv1/third_party/terraform/acctest/bootstrap_test_utils.go b/mmv1/third_party/terraform/acctest/bootstrap_test_utils.go
index 213db73ecbd3..d0bb61468ad6 100644
--- a/mmv1/third_party/terraform/acctest/bootstrap_test_utils.go
+++ b/mmv1/third_party/terraform/acctest/bootstrap_test_utils.go
@@ -443,6 +443,35 @@ func BootstrapSharedTestGlobalAddress(t *testing.T, testId string, params ...fun
 	return address.Name
 }
 
+type ServiceNetworkSettings struct {
+	PrefixLength  int
+	ParentService string
+}
+
+func ServiceNetworkWithPrefixLength(prefixLength int) func(*ServiceNetworkSettings) {
+	return func(settings *ServiceNetworkSettings) {
+		settings.PrefixLength = prefixLength
+	}
+}
+
+func ServiceNetworkWithParentService(parentService string) func(*ServiceNetworkSettings) {
+	return func(settings *ServiceNetworkSettings) {
+		settings.ParentService = parentService
+	}
+}
+
+func NewServiceNetworkSettings(options ...func(*ServiceNetworkSettings)) *ServiceNetworkSettings {
+	settings := &ServiceNetworkSettings{
+		PrefixLength:  16,                                 // default prefix length
+		ParentService: "servicenetworking.googleapis.com", // default parent service
+	}
+
+	for _, o := range options {
+		o(settings)
+	}
+	return settings
+}
+
 // BootstrapSharedServiceNetworkingConnection will create a shared network
 // if it hasn't been created in the test project, a global address
 // if it hasn't been created in the test project, and a service networking connection
@@ -461,8 +490,9 @@ func BootstrapSharedTestGlobalAddress(t *testing.T, testId string, params ...fun
 // https://cloud.google.com/vpc/docs/configure-private-services-access#removing-connection
 //
 // testId specifies the test for which a shared network and a gobal address are used/initialized.
-func BootstrapSharedServiceNetworkingConnection(t *testing.T, testId string, params ...func(*AddressSettings)) string {
-	parentService := "services/servicenetworking.googleapis.com"
+func BootstrapSharedServiceNetworkingConnection(t *testing.T, testId string, params ...func(*ServiceNetworkSettings)) string {
+	settings := NewServiceNetworkSettings(params...)
+	parentService := "services/" + settings.ParentService
 	projectId := envvar.GetTestProjectFromEnv()
 
 	config := BootstrapConfig(t)
@@ -479,7 +509,7 @@ func BootstrapSharedServiceNetworkingConnection(t *testing.T, testId string, par
 
 	networkName := SharedTestNetworkPrefix + testId
 	networkId := fmt.Sprintf("projects/%v/global/networks/%v", project.ProjectNumber, networkName)
-	globalAddressName := BootstrapSharedTestGlobalAddress(t, testId, params...)
+	globalAddressName := BootstrapSharedTestGlobalAddress(t, testId, AddressWithPrefixLength(settings.PrefixLength))
 
 	readCall := config.NewServiceNetworkingClient(config.UserAgent).Services.Connections.List(parentService).Network(networkId)
 	if config.UserProjectOverride {