Automated DCL import.

- 2cee7d6cbc42a6869756ea26a033df64a6b2045f Automatic import from cloud_mmv2_dcl_20241218_1531_RC00 by DCL Team <no-reply@google.com> GitOrigin-RevId: 2cee7d6cbc42a6869756ea26a033df64a6b2045f
GoogleCloudPlatform · Dec 18, 2024 · c1c69ec · c1c69ec
1 parent a38603e
commit c1c69ec
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/services/google/cloudbuild/alpha/cloudbuild_utils.go b/services/google/cloudbuild/alpha/cloudbuild_utils.go
@@ -35,8 +35,10 @@ func betaToGaPrivatePool(r *WorkerPool, c *WorkerPoolPrivatePoolV1Config) *Worke
 	}
 	if r.PrivateServiceConnect != nil {
 		cfgPrivateServiceConnect.NetworkAttachment = r.PrivateServiceConnect.NetworkAttachment
-		cfgPrivateServiceConnect.PublicIPAddressDisabled = r.WorkerConfig.NoExternalIP
 		cfgPrivateServiceConnect.RouteAllTraffic = r.PrivateServiceConnect.RouteAllTraffic
+		if r.WorkerConfig != nil {
+			cfgPrivateServiceConnect.PublicIPAddressDisabled = r.WorkerConfig.NoExternalIP
+		}
 	}
 
 	cfg := &WorkerPoolPrivatePoolV1Config{}

diff --git a/services/google/cloudbuild/beta/cloudbuild_utils.go b/services/google/cloudbuild/beta/cloudbuild_utils.go
@@ -35,8 +35,10 @@ func betaToGaPrivatePool(r *WorkerPool, c *WorkerPoolPrivatePoolV1Config) *Worke
 	}
 	if r.PrivateServiceConnect != nil {
 		cfgPrivateServiceConnect.NetworkAttachment = r.PrivateServiceConnect.NetworkAttachment
-		cfgPrivateServiceConnect.PublicIPAddressDisabled = r.WorkerConfig.NoExternalIP
 		cfgPrivateServiceConnect.RouteAllTraffic = r.PrivateServiceConnect.RouteAllTraffic
+		if r.WorkerConfig != nil {
+			cfgPrivateServiceConnect.PublicIPAddressDisabled = r.WorkerConfig.NoExternalIP
+		}
 	}
 
 	cfg := &WorkerPoolPrivatePoolV1Config{}

diff --git a/services/google/cloudbuild/cloudbuild_utils.go b/services/google/cloudbuild/cloudbuild_utils.go
@@ -35,8 +35,10 @@ func betaToGaPrivatePool(r *WorkerPool, c *WorkerPoolPrivatePoolV1Config) *Worke
 	}
 	if r.PrivateServiceConnect != nil {
 		cfgPrivateServiceConnect.NetworkAttachment = r.PrivateServiceConnect.NetworkAttachment
-		cfgPrivateServiceConnect.PublicIPAddressDisabled = r.WorkerConfig.NoExternalIP
 		cfgPrivateServiceConnect.RouteAllTraffic = r.PrivateServiceConnect.RouteAllTraffic
+		if r.WorkerConfig != nil {
+			cfgPrivateServiceConnect.PublicIPAddressDisabled = r.WorkerConfig.NoExternalIP
+		}
 	}
 
 	cfg := &WorkerPoolPrivatePoolV1Config{}