Merge pull request GoogleCloudPlatform#2505 from justinsb/redis_singl…

…e_field_update tests: update redis examples for latest mockgcp
gemmahou · Aug 14, 2024 · 6485c02 · 6485c02
2 parents 48317d8 + 2adba1f
commit 6485c02
Show file tree

Hide file tree

Showing 5 changed files with 172 additions and 2,577 deletions.
diff --git a/mockgcp/mockredis/cluster.go b/mockgcp/mockredis/cluster.go
@@ -213,9 +213,11 @@ func (r *clusterServer) UpdateCluster(ctx context.Context, req *pb.UpdateCluster
 			obj.SizeGb = req.Cluster.SizeGb
 		case "replicaCount":
 			obj.ReplicaCount = req.Cluster.ReplicaCount
+		case "shardCount":
+			obj.ShardCount = req.Cluster.ShardCount
 
 		default:
-			return nil, status.Errorf(codes.InvalidArgument, "update_mask path %q not valid", path)
+			return nil, status.Errorf(codes.InvalidArgument, "update_mask path %q not supported by mockgcp", path)
 		}
 	}
 

diff --git a/...ata/basic/redis/v1beta1/basicrediscluster/_generated_object_basicrediscluster.golden.yaml b/...ata/basic/redis/v1beta1/basicrediscluster/_generated_object_basicrediscluster.golden.yaml
@@ -15,7 +15,7 @@ spec:
     external: ${projectId}
   pscConfigs:
   - networkRef:
-      external: projects/${projectId}/global/networks/computenetwork-${uniqueId}
+      external: projects/${projectId}/global/networks/${networkID}
   shardCount: 10
 status:
   conditions:
@@ -32,19 +32,19 @@ status:
       port: 6379
       pscConfig:
         networkRef:
-          external: projects/${projectId}/global/networks/computenetwork-${uniqueId}
-    preciseSizeGb: 130
+          external: projects/${projectId}/global/networks/${networkID}
+    preciseSizeGb: 39
     pscConnections:
-    - address: 10.128.0.3
-      forwardingRule: https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/sca-auto-fr-c1b4ae0f-bca3-40e3-9816-d1479c568143
-      network: projects/${projectId}/global/networks/computenetwork-${uniqueId}
-      projectID: ${projectId}
-      pscConnectionID: "7500705292091395"
     - address: 10.128.0.2
-      forwardingRule: https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/sca-auto-fr-ee088ecf-fe3e-47b1-bf2e-bcc5a6cd074a
-      network: projects/${projectId}/global/networks/computenetwork-${uniqueId}
+      forwardingRule: https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/${forwardingRuleID}
+      network: projects/${projectId}/global/networks/${networkID}
+      projectID: ${projectId}
+      pscConnectionID: ${pscConnectionID}
+    - address: 10.128.0.3
+      forwardingRule: https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/${forwardingRuleID}
+      network: projects/${projectId}/global/networks/${networkID}
       projectID: ${projectId}
-      pscConnectionID: "7500705292091394"
-    sizeGb: 130
+      pscConnectionID: ${pscConnectionID}
+    sizeGb: 39
     state: ACTIVE
-    uid: 68a3a69a-9675-44ad-a944-25dd89505b7c
+    uid: 0123456789abcdef