Merge pull request GoogleCloudPlatform#2929 from maqiuyujoyce/202410-test-gen-mockalloydb

Support pscConfig in mockalloydb cluster

Author: google-oss-prow[bot]

mockgcp/apply-proto-patches.sh

@@ -51,3 +51,16 @@ cd tools/patch-proto
 #   MaintenanceUpdatePolicy maintenance_update_policy = 32;
 # EOF
 
+# Use our proto patch tool to add the missing pscConfig field for AlloyDB cluster.
+go run . --file ${REPO_ROOT}/mockgcp/third_party/googleapis/google/cloud/alloydb/v1beta/resources.proto --message Cluster <<EOF
+
+  // PscConfig contains PSC related configuration at a cluster level.
+  message PscConfig {
+    // Optional. Create an instance that allows connections from Private Service
+    // Connect endpoints to the instance.
+    bool psc_enabled = 1 [(google.api.field_behavior) = OPTIONAL];
+  }
+
+  // Optional. The configuration for Private Service Connect (PSC) for the cluster.
+  PscConfig psc_config = 31 [(google.api.field_behavior) = OPTIONAL];
+EOF

mockgcp/generated/mockgcp/cloud/alloydb/v1beta/resources.pb.go

@@ -299,6 +299,7 @@ Grpc-Metadata-Content-Type: application/grpc
     "network": "projects/${projectId}/global/networks/${networkID}"
   },
   "primaryConfig": null,
+  "pscConfig": null,
   "reconciling": false,
   "satisfiesPzs": false,
   "secondaryConfig": null,
@@ -391,6 +392,7 @@ Grpc-Metadata-Content-Type: application/grpc
     "network": "projects/${projectId}/global/networks/${networkID}"
   },
   "primaryConfig": null,
+  "pscConfig": null,
   "reconciling": false,
   "satisfiesPzs": false,
   "secondaryConfig": null,

pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbcluster/_http.log

@@ -210,6 +210,7 @@ Grpc-Metadata-Content-Type: application/grpc
     "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}"
   },
   "primaryConfig": null,
+  "pscConfig": null,
   "reconciling": false,
   "satisfiesPzs": false,
   "secondaryConfig": null,
@@ -777,6 +778,7 @@ Grpc-Metadata-Content-Type: application/grpc
     "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}"
   },
   "primaryConfig": null,
+  "pscConfig": null,
   "reconciling": false,
   "satisfiesPzs": false,
   "secondaryConfig": {
@@ -867,6 +869,7 @@ Grpc-Metadata-Content-Type: application/grpc
     "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}"
   },
   "primaryConfig": null,
+  "pscConfig": null,
   "reconciling": false,
   "satisfiesPzs": false,
   "secondaryConfig": {
@@ -1230,6 +1233,7 @@ Grpc-Metadata-Content-Type: application/grpc
     "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}"
   },
   "primaryConfig": null,
+  "pscConfig": null,
   "reconciling": false,
   "satisfiesPzs": false,
   "secondaryConfig": null,

pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbsecondarycluster/_http.log

@@ -572,6 +572,7 @@ Grpc-Metadata-Content-Type: application/grpc
     "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}"
   },
   "primaryConfig": null,
+  "pscConfig": null,
   "reconciling": false,
   "satisfiesPzs": false,
   "secondaryConfig": null,
@@ -722,6 +723,7 @@ Grpc-Metadata-Content-Type: application/grpc
     "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}"
   },
   "primaryConfig": null,
+  "pscConfig": null,
   "reconciling": false,
   "satisfiesPzs": false,
   "secondaryConfig": null,

pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/fullalloydbcluster/_http.log

@@ -210,6 +210,7 @@ Grpc-Metadata-Content-Type: application/grpc
     "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}"
   },
   "primaryConfig": null,
+  "pscConfig": null,
   "reconciling": false,
   "satisfiesPzs": false,
   "secondaryConfig": null,
@@ -1063,6 +1064,7 @@ Grpc-Metadata-Content-Type: application/grpc
     "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}"
   },
   "primaryConfig": null,
+  "pscConfig": null,
   "reconciling": false,
   "satisfiesPzs": false,
   "secondaryConfig": null,

pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbinstance/_http.log

@@ -210,6 +210,7 @@ Grpc-Metadata-Content-Type: application/grpc
     "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}"
   },
   "primaryConfig": null,
+  "pscConfig": null,
   "reconciling": false,
   "satisfiesPzs": false,
   "secondaryConfig": null,
@@ -777,6 +778,7 @@ Grpc-Metadata-Content-Type: application/grpc
     "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}"
   },
   "primaryConfig": null,
+  "pscConfig": null,
   "reconciling": false,
   "satisfiesPzs": false,
   "secondaryConfig": {
@@ -992,6 +994,7 @@ Grpc-Metadata-Content-Type: application/grpc
     "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}"
   },
   "primaryConfig": null,
+  "pscConfig": null,
   "reconciling": false,
   "satisfiesPzs": false,
   "secondaryConfig": {
@@ -1355,6 +1358,7 @@ Grpc-Metadata-Content-Type: application/grpc
     "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}"
   },
   "primaryConfig": null,
+  "pscConfig": null,
   "reconciling": false,
   "satisfiesPzs": false,
   "secondaryConfig": null,

pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbsecondaryinstance/_http.log

@@ -205,6 +205,7 @@ Grpc-Metadata-Content-Type: application/grpc
   "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}",
   "networkConfig": null,
   "primaryConfig": null,
+  "pscConfig": null,
   "reconciling": false,
   "satisfiesPzs": false,
   "secondaryConfig": null,
@@ -1089,6 +1090,7 @@ Grpc-Metadata-Content-Type: application/grpc
   "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}",
   "networkConfig": null,
   "primaryConfig": null,
+  "pscConfig": null,
   "reconciling": false,
   "satisfiesPzs": false,
   "secondaryConfig": null,

pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/fullalloydbinstance/_http.log

@@ -205,6 +205,7 @@ Grpc-Metadata-Content-Type: application/grpc
   "network": "projects/${projectId}/global/networks/computenetwork${uniqueId}",
   "networkConfig": null,
   "primaryConfig": null,
+  "pscConfig": null,
   "reconciling": false,
   "satisfiesPzs": false,
   "secondaryConfig": null,
@@ -1209,6 +1210,7 @@ Grpc-Metadata-Content-Type: application/grpc
   "network": "projects/${projectId}/global/networks/computenetwork${uniqueId}",
   "networkConfig": null,
   "primaryConfig": null,
+  "pscConfig": null,
   "reconciling": false,
   "satisfiesPzs": false,
   "secondaryConfig": null,

pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/readalloydbinstance/_http.log

@@ -210,6 +210,7 @@ Grpc-Metadata-Content-Type: application/grpc
     "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}"
   },
   "primaryConfig": null,
+  "pscConfig": null,
   "reconciling": false,
   "satisfiesPzs": false,
   "secondaryConfig": null,
@@ -985,6 +986,7 @@ Grpc-Metadata-Content-Type: application/grpc
     "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}"
   },
   "primaryConfig": null,
+  "pscConfig": null,
   "reconciling": false,
   "satisfiesPzs": false,
   "secondaryConfig": null,