Skip to content

Commit c6230dd

Browse files
chanseokohchanseokoh
authored
Merge branch 'main' into fix-sourcesJar-self-service-build
2 parents 521b1e6 + e1c60ca commit c6230dd

18 files changed

Lines changed: 9081 additions & 338 deletions

‎WORKSPACE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,6 @@ grpc_java_repositories()
114114

115115
http_archive(
116116
name = "com_google_disco_to_proto3_converter",
117-
strip_prefix = "disco-to-proto3-converter-4b0956884b1aa9b367cf41488b622dc12eb16652",
118-
urls = ["https://github.com/googleapis/disco-to-proto3-converter/archive/4b0956884b1aa9b367cf41488b622dc12eb16652.zip"],
117+
strip_prefix = "disco-to-proto3-converter-ce8d8732120cdfb5bf4847c3238b5be8acde87e3",
118+
urls = ["https://github.com/googleapis/disco-to-proto3-converter/archive/ce8d8732120cdfb5bf4847c3238b5be8acde87e3.zip"],
119119
)

‎repositories.bzl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ def gapic_generator_java_repositories():
5959
_maybe(
6060
http_archive,
6161
name = "com_google_googleapis",
62-
strip_prefix = "googleapis-ba30d8097582039ac4cc4e21b4e4baa426423075",
62+
strip_prefix = "googleapis-0899ba0f4c053a4487ccf0b699df5f850e39a45f",
6363
urls = [
64-
"https://github.com/googleapis/googleapis/archive/ba30d8097582039ac4cc4e21b4e4baa426423075.zip",
64+
"https://github.com/googleapis/googleapis/archive/0899ba0f4c053a4487ccf0b699df5f850e39a45f.zip",
6565
],
6666
)
6767

‎test/integration/goldens/redis/com/google/cloud/redis/v1beta1/CloudRedisClient.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
* `/projects/{project_id}/locations/{location_id}/instances/{instance_id}`
5858
* </ul>
5959
*
60-
* <p>Note that location_id must be refering to a GCP `region`; for example:
60+
* <p>Note that location_id must be referring to a GCP `region`; for example:
6161
*
6262
* <ul>
6363
* <li>`projects/redpepper-1290/locations/us-central1/instances/my-redis`
@@ -472,7 +472,7 @@ public final UnaryCallable<GetInstanceRequest, Instance> getInstanceCallable() {
472472
*
473473
* <p>The creation is executed asynchronously and callers may check the returned operation to
474474
* track its progress. Once the operation is completed the Redis instance will be fully
475-
* functional. Completed longrunning.Operation will contain the new instance object in the
475+
* functional. The completed longrunning.Operation will contain the new instance object in the
476476
* response field.
477477
*
478478
* <p>The returned operation is automatically deleted after a few hours, so there is no need to
@@ -524,7 +524,7 @@ public final OperationFuture<Instance, Any> createInstanceAsync(
524524
*
525525
* <p>The creation is executed asynchronously and callers may check the returned operation to
526526
* track its progress. Once the operation is completed the Redis instance will be fully
527-
* functional. Completed longrunning.Operation will contain the new instance object in the
527+
* functional. The completed longrunning.Operation will contain the new instance object in the
528528
* response field.
529529
*
530530
* <p>The returned operation is automatically deleted after a few hours, so there is no need to
@@ -576,7 +576,7 @@ public final OperationFuture<Instance, Any> createInstanceAsync(
576576
*
577577
* <p>The creation is executed asynchronously and callers may check the returned operation to
578578
* track its progress. Once the operation is completed the Redis instance will be fully
579-
* functional. Completed longrunning.Operation will contain the new instance object in the
579+
* functional. The completed longrunning.Operation will contain the new instance object in the
580580
* response field.
581581
*
582582
* <p>The returned operation is automatically deleted after a few hours, so there is no need to
@@ -612,7 +612,7 @@ public final OperationFuture<Instance, Any> createInstanceAsync(CreateInstanceRe
612612
*
613613
* <p>The creation is executed asynchronously and callers may check the returned operation to
614614
* track its progress. Once the operation is completed the Redis instance will be fully
615-
* functional. Completed longrunning.Operation will contain the new instance object in the
615+
* functional. The completed longrunning.Operation will contain the new instance object in the
616616
* response field.
617617
*
618618
* <p>The returned operation is automatically deleted after a few hours, so there is no need to
@@ -649,7 +649,7 @@ public final OperationFuture<Instance, Any> createInstanceAsync(CreateInstanceRe
649649
*
650650
* <p>The creation is executed asynchronously and callers may check the returned operation to
651651
* track its progress. Once the operation is completed the Redis instance will be fully
652-
* functional. Completed longrunning.Operation will contain the new instance object in the
652+
* functional. The completed longrunning.Operation will contain the new instance object in the
653653
* response field.
654654
*
655655
* <p>The returned operation is automatically deleted after a few hours, so there is no need to
@@ -696,7 +696,8 @@ public final UnaryCallable<CreateInstanceRequest, Operation> createInstanceCalla
696696
* @param updateMask Required. Mask of fields to update. At least one path must be supplied in
697697
* this field. The elements of the repeated paths field may only include these fields from
698698
* [Instance][google.cloud.redis.v1beta1.Instance]:
699-
* <p>&#42; `displayName` &#42; `labels` &#42; `memorySizeGb` &#42; `redisConfig`
699+
* <p>&#42; `displayName` &#42; `labels` &#42; `memorySizeGb` &#42; `redisConfig` &#42;
700+
* `replica_count`
700701
* @param instance Required. Update description. Only fields specified in update_mask are updated.
701702
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
702703
*/
@@ -1164,7 +1165,7 @@ public final UnaryCallable<ExportInstanceRequest, Operation> exportInstanceCalla
11641165

11651166
// AUTO-GENERATED DOCUMENTATION AND METHOD.
11661167
/**
1167-
* Initiates a failover of the master node to current replica node for a specific STANDARD tier
1168+
* Initiates a failover of the primary node to current replica node for a specific STANDARD tier
11681169
* Cloud Memorystore for Redis instance.
11691170
*
11701171
* <p>Sample code:
@@ -1197,7 +1198,7 @@ public final OperationFuture<Instance, Any> failoverInstanceAsync(
11971198

11981199
// AUTO-GENERATED DOCUMENTATION AND METHOD.
11991200
/**
1200-
* Initiates a failover of the master node to current replica node for a specific STANDARD tier
1201+
* Initiates a failover of the primary node to current replica node for a specific STANDARD tier
12011202
* Cloud Memorystore for Redis instance.
12021203
*
12031204
* <p>Sample code:
@@ -1230,7 +1231,7 @@ public final OperationFuture<Instance, Any> failoverInstanceAsync(
12301231

12311232
// AUTO-GENERATED DOCUMENTATION AND METHOD.
12321233
/**
1233-
* Initiates a failover of the master node to current replica node for a specific STANDARD tier
1234+
* Initiates a failover of the primary node to current replica node for a specific STANDARD tier
12341235
* Cloud Memorystore for Redis instance.
12351236
*
12361237
* <p>Sample code:
@@ -1255,7 +1256,7 @@ public final OperationFuture<Instance, Any> failoverInstanceAsync(
12551256

12561257
// AUTO-GENERATED DOCUMENTATION AND METHOD.
12571258
/**
1258-
* Initiates a failover of the master node to current replica node for a specific STANDARD tier
1259+
* Initiates a failover of the primary node to current replica node for a specific STANDARD tier
12591260
* Cloud Memorystore for Redis instance.
12601261
*
12611262
* <p>Sample code:
@@ -1280,7 +1281,7 @@ public final OperationFuture<Instance, Any> failoverInstanceAsync(
12801281

12811282
// AUTO-GENERATED DOCUMENTATION AND METHOD.
12821283
/**
1283-
* Initiates a failover of the master node to current replica node for a specific STANDARD tier
1284+
* Initiates a failover of the primary node to current replica node for a specific STANDARD tier
12841285
* Cloud Memorystore for Redis instance.
12851286
*
12861287
* <p>Sample code:

‎test/integration/goldens/redis/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import com.google.protobuf.Timestamp;
3636
import io.grpc.StatusRuntimeException;
3737
import java.io.IOException;
38+
import java.util.ArrayList;
3839
import java.util.Arrays;
3940
import java.util.HashMap;
4041
import java.util.List;
@@ -194,6 +195,10 @@ public void getInstanceTest() throws Exception {
194195
.setMemorySizeGb(34199707)
195196
.setAuthorizedNetwork("authorizedNetwork1515554835")
196197
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
198+
.setReplicaCount(564075208)
199+
.addAllNodes(new ArrayList<NodeInfo>())
200+
.setReadEndpoint("readEndpoint294053195")
201+
.setReadEndpointPort(-1676143102)
197202
.build();
198203
mockCloudRedis.addResponse(expectedResponse);
199204

@@ -247,6 +252,10 @@ public void getInstanceTest2() throws Exception {
247252
.setMemorySizeGb(34199707)
248253
.setAuthorizedNetwork("authorizedNetwork1515554835")
249254
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
255+
.setReplicaCount(564075208)
256+
.addAllNodes(new ArrayList<NodeInfo>())
257+
.setReadEndpoint("readEndpoint294053195")
258+
.setReadEndpointPort(-1676143102)
250259
.build();
251260
mockCloudRedis.addResponse(expectedResponse);
252261

@@ -300,6 +309,10 @@ public void createInstanceTest() throws Exception {
300309
.setMemorySizeGb(34199707)
301310
.setAuthorizedNetwork("authorizedNetwork1515554835")
302311
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
312+
.setReplicaCount(564075208)
313+
.addAllNodes(new ArrayList<NodeInfo>())
314+
.setReadEndpoint("readEndpoint294053195")
315+
.setReadEndpointPort(-1676143102)
303316
.build();
304317
Operation resultOperation =
305318
Operation.newBuilder()
@@ -367,6 +380,10 @@ public void createInstanceTest2() throws Exception {
367380
.setMemorySizeGb(34199707)
368381
.setAuthorizedNetwork("authorizedNetwork1515554835")
369382
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
383+
.setReplicaCount(564075208)
384+
.addAllNodes(new ArrayList<NodeInfo>())
385+
.setReadEndpoint("readEndpoint294053195")
386+
.setReadEndpointPort(-1676143102)
370387
.build();
371388
Operation resultOperation =
372389
Operation.newBuilder()
@@ -434,6 +451,10 @@ public void updateInstanceTest() throws Exception {
434451
.setMemorySizeGb(34199707)
435452
.setAuthorizedNetwork("authorizedNetwork1515554835")
436453
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
454+
.setReplicaCount(564075208)
455+
.addAllNodes(new ArrayList<NodeInfo>())
456+
.setReadEndpoint("readEndpoint294053195")
457+
.setReadEndpointPort(-1676143102)
437458
.build();
438459
Operation resultOperation =
439460
Operation.newBuilder()
@@ -498,6 +519,10 @@ public void upgradeInstanceTest() throws Exception {
498519
.setMemorySizeGb(34199707)
499520
.setAuthorizedNetwork("authorizedNetwork1515554835")
500521
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
522+
.setReplicaCount(564075208)
523+
.addAllNodes(new ArrayList<NodeInfo>())
524+
.setReadEndpoint("readEndpoint294053195")
525+
.setReadEndpointPort(-1676143102)
501526
.build();
502527
Operation resultOperation =
503528
Operation.newBuilder()
@@ -562,6 +587,10 @@ public void upgradeInstanceTest2() throws Exception {
562587
.setMemorySizeGb(34199707)
563588
.setAuthorizedNetwork("authorizedNetwork1515554835")
564589
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
590+
.setReplicaCount(564075208)
591+
.addAllNodes(new ArrayList<NodeInfo>())
592+
.setReadEndpoint("readEndpoint294053195")
593+
.setReadEndpointPort(-1676143102)
565594
.build();
566595
Operation resultOperation =
567596
Operation.newBuilder()
@@ -626,6 +655,10 @@ public void importInstanceTest() throws Exception {
626655
.setMemorySizeGb(34199707)
627656
.setAuthorizedNetwork("authorizedNetwork1515554835")
628657
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
658+
.setReplicaCount(564075208)
659+
.addAllNodes(new ArrayList<NodeInfo>())
660+
.setReadEndpoint("readEndpoint294053195")
661+
.setReadEndpointPort(-1676143102)
629662
.build();
630663
Operation resultOperation =
631664
Operation.newBuilder()
@@ -690,6 +723,10 @@ public void exportInstanceTest() throws Exception {
690723
.setMemorySizeGb(34199707)
691724
.setAuthorizedNetwork("authorizedNetwork1515554835")
692725
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
726+
.setReplicaCount(564075208)
727+
.addAllNodes(new ArrayList<NodeInfo>())
728+
.setReadEndpoint("readEndpoint294053195")
729+
.setReadEndpointPort(-1676143102)
693730
.build();
694731
Operation resultOperation =
695732
Operation.newBuilder()
@@ -754,6 +791,10 @@ public void failoverInstanceTest() throws Exception {
754791
.setMemorySizeGb(34199707)
755792
.setAuthorizedNetwork("authorizedNetwork1515554835")
756793
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
794+
.setReplicaCount(564075208)
795+
.addAllNodes(new ArrayList<NodeInfo>())
796+
.setReadEndpoint("readEndpoint294053195")
797+
.setReadEndpointPort(-1676143102)
757798
.build();
758799
Operation resultOperation =
759800
Operation.newBuilder()
@@ -820,6 +861,10 @@ public void failoverInstanceTest2() throws Exception {
820861
.setMemorySizeGb(34199707)
821862
.setAuthorizedNetwork("authorizedNetwork1515554835")
822863
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
864+
.setReplicaCount(564075208)
865+
.addAllNodes(new ArrayList<NodeInfo>())
866+
.setReadEndpoint("readEndpoint294053195")
867+
.setReadEndpointPort(-1676143102)
823868
.build();
824869
Operation resultOperation =
825870
Operation.newBuilder()

‎test/integration/goldens/redis/com/google/cloud/redis/v1beta1/package-info.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
*/
1616

1717
/**
18-
* The interfaces provided are listed below, along with usage samples.
18+
* A client to Google Cloud Memorystore for Redis API
19+
*
20+
* <p>The interfaces provided are listed below, along with usage samples.
1921
*
2022
* <p>======================= CloudRedisClient =======================
2123
*
@@ -34,7 +36,7 @@
3436
* `/projects/{project_id}/locations/{location_id}/instances/{instance_id}`
3537
* </ul>
3638
*
37-
* <p>Note that location_id must be refering to a GCP `region`; for example:
39+
* <p>Note that location_id must be referring to a GCP `region`; for example:
3840
*
3941
* <ul>
4042
* <li>`projects/redpepper-1290/locations/us-central1/instances/my-redis`

0 commit comments

Comments
 (0)