Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: sync googleapis and disco-to-proto3-converter repos #892

Merged
merged 2 commits into from
Jan 10, 2022
Merged

chore: sync googleapis and disco-to-proto3-converter repos #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fe872b
chore: sync googleapis and disco-to-proto3-converter repos
chanseokoh Jan 7, 2022
fe95853
chore: update integration golden files
chanseokoh Jan 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,6 @@ grpc_java_repositories()

http_archive(
name = "com_google_disco_to_proto3_converter",
strip_prefix = "disco-to-proto3-converter-4b0956884b1aa9b367cf41488b622dc12eb16652",
urls = ["https://github.com/googleapis/disco-to-proto3-converter/archive/4b0956884b1aa9b367cf41488b622dc12eb16652.zip"],
strip_prefix = "disco-to-proto3-converter-ce8d8732120cdfb5bf4847c3238b5be8acde87e3",
urls = ["https://github.com/googleapis/disco-to-proto3-converter/archive/ce8d8732120cdfb5bf4847c3238b5be8acde87e3.zip"],
)
4 changes: 2 additions & 2 deletions repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ def gapic_generator_java_repositories():
_maybe(
http_archive,
name = "com_google_googleapis",
strip_prefix = "googleapis-ba30d8097582039ac4cc4e21b4e4baa426423075",
strip_prefix = "googleapis-0899ba0f4c053a4487ccf0b699df5f850e39a45f",
urls = [
"https://github.com/googleapis/googleapis/archive/ba30d8097582039ac4cc4e21b4e4baa426423075.zip",
"https://github.com/googleapis/googleapis/archive/0899ba0f4c053a4487ccf0b699df5f850e39a45f.zip",
],
)

Expand Down
25 changes: 13 additions & 12 deletions test/integration/goldens/redis/com/google/cloud/redis/v1beta1/CloudRedisClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
* `/projects/{project_id}/locations/{location_id}/instances/{instance_id}`
* </ul>
*
* <p>Note that location_id must be refering to a GCP `region`; for example:
* <p>Note that location_id must be referring to a GCP `region`; for example:
*
* <ul>
* <li>`projects/redpepper-1290/locations/us-central1/instances/my-redis`
Expand Down Expand Up @@ -472,7 +472,7 @@ public final UnaryCallable<GetInstanceRequest, Instance> getInstanceCallable() {
*
* <p>The creation is executed asynchronously and callers may check the returned operation to
* track its progress. Once the operation is completed the Redis instance will be fully
* functional. Completed longrunning.Operation will contain the new instance object in the
* functional. The completed longrunning.Operation will contain the new instance object in the
* response field.
*
* <p>The returned operation is automatically deleted after a few hours, so there is no need to
Expand Down Expand Up @@ -524,7 +524,7 @@ public final OperationFuture<Instance, Any> createInstanceAsync(
*
* <p>The creation is executed asynchronously and callers may check the returned operation to
* track its progress. Once the operation is completed the Redis instance will be fully
* functional. Completed longrunning.Operation will contain the new instance object in the
* functional. The completed longrunning.Operation will contain the new instance object in the
* response field.
*
* <p>The returned operation is automatically deleted after a few hours, so there is no need to
Expand Down Expand Up @@ -576,7 +576,7 @@ public final OperationFuture<Instance, Any> createInstanceAsync(
*
* <p>The creation is executed asynchronously and callers may check the returned operation to
* track its progress. Once the operation is completed the Redis instance will be fully
* functional. Completed longrunning.Operation will contain the new instance object in the
* functional. The completed longrunning.Operation will contain the new instance object in the
* response field.
*
* <p>The returned operation is automatically deleted after a few hours, so there is no need to
Expand Down Expand Up @@ -612,7 +612,7 @@ public final OperationFuture<Instance, Any> createInstanceAsync(CreateInstanceRe
*
* <p>The creation is executed asynchronously and callers may check the returned operation to
* track its progress. Once the operation is completed the Redis instance will be fully
* functional. Completed longrunning.Operation will contain the new instance object in the
* functional. The completed longrunning.Operation will contain the new instance object in the
* response field.
*
* <p>The returned operation is automatically deleted after a few hours, so there is no need to
Expand Down Expand Up @@ -649,7 +649,7 @@ public final OperationFuture<Instance, Any> createInstanceAsync(CreateInstanceRe
*
* <p>The creation is executed asynchronously and callers may check the returned operation to
* track its progress. Once the operation is completed the Redis instance will be fully
* functional. Completed longrunning.Operation will contain the new instance object in the
* functional. The completed longrunning.Operation will contain the new instance object in the
* response field.
*
* <p>The returned operation is automatically deleted after a few hours, so there is no need to
Expand Down Expand Up @@ -696,7 +696,8 @@ public final UnaryCallable<CreateInstanceRequest, Operation> createInstanceCalla
* @param updateMask Required. Mask of fields to update. At least one path must be supplied in
* this field. The elements of the repeated paths field may only include these fields from
* [Instance][google.cloud.redis.v1beta1.Instance]:
* <p>&#42; `displayName` &#42; `labels` &#42; `memorySizeGb` &#42; `redisConfig`
* <p>&#42; `displayName` &#42; `labels` &#42; `memorySizeGb` &#42; `redisConfig` &#42;
* `replica_count`
* @param instance Required. Update description. Only fields specified in update_mask are updated.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
Expand Down Expand Up @@ -1164,7 +1165,7 @@ public final UnaryCallable<ExportInstanceRequest, Operation> exportInstanceCalla

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

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

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

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

// AUTO-GENERATED DOCUMENTATION AND METHOD.
/**
* Initiates a failover of the master node to current replica node for a specific STANDARD tier
* Initiates a failover of the primary node to current replica node for a specific STANDARD tier
* Cloud Memorystore for Redis instance.
*
* <p>Sample code:
Expand Down
45 changes: 45 additions & 0 deletions test/integration/goldens/redis/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import com.google.protobuf.Timestamp;
import io.grpc.StatusRuntimeException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -194,6 +195,10 @@ public void getInstanceTest() throws Exception {
.setMemorySizeGb(34199707)
.setAuthorizedNetwork("authorizedNetwork1515554835")
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
.setReplicaCount(564075208)
.addAllNodes(new ArrayList<NodeInfo>())
.setReadEndpoint("readEndpoint294053195")
.setReadEndpointPort(-1676143102)
.build();
mockCloudRedis.addResponse(expectedResponse);

Expand Down Expand Up @@ -247,6 +252,10 @@ public void getInstanceTest2() throws Exception {
.setMemorySizeGb(34199707)
.setAuthorizedNetwork("authorizedNetwork1515554835")
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
.setReplicaCount(564075208)
.addAllNodes(new ArrayList<NodeInfo>())
.setReadEndpoint("readEndpoint294053195")
.setReadEndpointPort(-1676143102)
.build();
mockCloudRedis.addResponse(expectedResponse);

Expand Down Expand Up @@ -300,6 +309,10 @@ public void createInstanceTest() throws Exception {
.setMemorySizeGb(34199707)
.setAuthorizedNetwork("authorizedNetwork1515554835")
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
.setReplicaCount(564075208)
.addAllNodes(new ArrayList<NodeInfo>())
.setReadEndpoint("readEndpoint294053195")
.setReadEndpointPort(-1676143102)
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -367,6 +380,10 @@ public void createInstanceTest2() throws Exception {
.setMemorySizeGb(34199707)
.setAuthorizedNetwork("authorizedNetwork1515554835")
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
.setReplicaCount(564075208)
.addAllNodes(new ArrayList<NodeInfo>())
.setReadEndpoint("readEndpoint294053195")
.setReadEndpointPort(-1676143102)
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -434,6 +451,10 @@ public void updateInstanceTest() throws Exception {
.setMemorySizeGb(34199707)
.setAuthorizedNetwork("authorizedNetwork1515554835")
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
.setReplicaCount(564075208)
.addAllNodes(new ArrayList<NodeInfo>())
.setReadEndpoint("readEndpoint294053195")
.setReadEndpointPort(-1676143102)
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -498,6 +519,10 @@ public void upgradeInstanceTest() throws Exception {
.setMemorySizeGb(34199707)
.setAuthorizedNetwork("authorizedNetwork1515554835")
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
.setReplicaCount(564075208)
.addAllNodes(new ArrayList<NodeInfo>())
.setReadEndpoint("readEndpoint294053195")
.setReadEndpointPort(-1676143102)
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -562,6 +587,10 @@ public void upgradeInstanceTest2() throws Exception {
.setMemorySizeGb(34199707)
.setAuthorizedNetwork("authorizedNetwork1515554835")
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
.setReplicaCount(564075208)
.addAllNodes(new ArrayList<NodeInfo>())
.setReadEndpoint("readEndpoint294053195")
.setReadEndpointPort(-1676143102)
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -626,6 +655,10 @@ public void importInstanceTest() throws Exception {
.setMemorySizeGb(34199707)
.setAuthorizedNetwork("authorizedNetwork1515554835")
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
.setReplicaCount(564075208)
.addAllNodes(new ArrayList<NodeInfo>())
.setReadEndpoint("readEndpoint294053195")
.setReadEndpointPort(-1676143102)
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -690,6 +723,10 @@ public void exportInstanceTest() throws Exception {
.setMemorySizeGb(34199707)
.setAuthorizedNetwork("authorizedNetwork1515554835")
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
.setReplicaCount(564075208)
.addAllNodes(new ArrayList<NodeInfo>())
.setReadEndpoint("readEndpoint294053195")
.setReadEndpointPort(-1676143102)
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -754,6 +791,10 @@ public void failoverInstanceTest() throws Exception {
.setMemorySizeGb(34199707)
.setAuthorizedNetwork("authorizedNetwork1515554835")
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
.setReplicaCount(564075208)
.addAllNodes(new ArrayList<NodeInfo>())
.setReadEndpoint("readEndpoint294053195")
.setReadEndpointPort(-1676143102)
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -820,6 +861,10 @@ public void failoverInstanceTest2() throws Exception {
.setMemorySizeGb(34199707)
.setAuthorizedNetwork("authorizedNetwork1515554835")
.setPersistenceIamIdentity("persistenceIamIdentity1464017428")
.setReplicaCount(564075208)
.addAllNodes(new ArrayList<NodeInfo>())
.setReadEndpoint("readEndpoint294053195")
.setReadEndpointPort(-1676143102)
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down
6 changes: 4 additions & 2 deletions test/integration/goldens/redis/com/google/cloud/redis/v1beta1/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
*/

/**
* The interfaces provided are listed below, along with usage samples.
* A client to Google Cloud Memorystore for Redis API
*
* <p>The interfaces provided are listed below, along with usage samples.
*
* <p>======================= CloudRedisClient =======================
*
Expand All @@ -34,7 +36,7 @@
* `/projects/{project_id}/locations/{location_id}/instances/{instance_id}`
* </ul>
*
* <p>Note that location_id must be refering to a GCP `region`; for example:
* <p>Note that location_id must be referring to a GCP `region`; for example:
*
* <ul>
* <li>`projects/redpepper-1290/locations/us-central1/instances/my-redis`
Expand Down
Loading