Skip to content

Commit f3be131

Browse files
yoshi-automationyoshi-automation
authored
docs(regen): update sample code to set total timeout, add API client header test
1 parent d141c3d commit f3be131

File tree

5 files changed

+121
-11
lines changed

5 files changed

+121
-11
lines changed

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,12 @@
105105
* <code>
106106
* BigtableInstanceAdminStubSettings.Builder baseBigtableInstanceAdminSettingsBuilder =
107107
* BigtableInstanceAdminStubSettings.newBuilder();
108-
* baseBigtableInstanceAdminSettingsBuilder.getInstanceSettings().getRetrySettings().toBuilder()
109-
* .setTotalTimeout(Duration.ofSeconds(30));
108+
* baseBigtableInstanceAdminSettingsBuilder
109+
* .getInstanceSettings()
110+
* .setRetrySettings(
111+
* baseBigtableInstanceAdminSettingsBuilder.getInstanceSettings().getRetrySettings().toBuilder()
112+
* .setTotalTimeout(Duration.ofSeconds(30))
113+
* .build());
110114
* BigtableInstanceAdminStubSettings baseBigtableInstanceAdminSettings = baseBigtableInstanceAdminSettingsBuilder.build();
111115
* </code>
112116
* </pre>

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,12 @@
102102
* <code>
103103
* BigtableTableAdminStubSettings.Builder baseBigtableTableAdminSettingsBuilder =
104104
* BigtableTableAdminStubSettings.newBuilder();
105-
* baseBigtableTableAdminSettingsBuilder.createTableSettings().getRetrySettings().toBuilder()
106-
* .setTotalTimeout(Duration.ofSeconds(30));
105+
* baseBigtableTableAdminSettingsBuilder
106+
* .createTableSettings()
107+
* .setRetrySettings(
108+
* baseBigtableTableAdminSettingsBuilder.createTableSettings().getRetrySettings().toBuilder()
109+
* .setTotalTimeout(Duration.ofSeconds(30))
110+
* .build());
107111
* BigtableTableAdminStubSettings baseBigtableTableAdminSettings = baseBigtableTableAdminSettingsBuilder.build();
108112
* </code>
109113
* </pre>

‎google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClientTest.java

+61
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,67 @@ public void listClustersExceptionTest() throws Exception {
496496
}
497497
}
498498

499+
@Test
500+
@SuppressWarnings("all")
501+
public void updateClusterTest() throws Exception {
502+
ClusterName name2 = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
503+
LocationName location = LocationName.of("[PROJECT]", "[LOCATION]");
504+
int serveNodes2 = 1623486220;
505+
Cluster expectedResponse =
506+
Cluster.newBuilder()
507+
.setName(name2.toString())
508+
.setLocation(location.toString())
509+
.setServeNodes(serveNodes2)
510+
.build();
511+
Operation resultOperation =
512+
Operation.newBuilder()
513+
.setName("updateClusterTest")
514+
.setDone(true)
515+
.setResponse(Any.pack(expectedResponse))
516+
.build();
517+
mockBigtableInstanceAdmin.addResponse(resultOperation);
518+
519+
ClusterName name = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
520+
int serveNodes = 1288838783;
521+
Cluster request =
522+
Cluster.newBuilder().setName(name.toString()).setServeNodes(serveNodes).build();
523+
524+
Cluster actualResponse = client.updateClusterAsync(request).get();
525+
Assert.assertEquals(expectedResponse, actualResponse);
526+
527+
List<AbstractMessage> actualRequests = mockBigtableInstanceAdmin.getRequests();
528+
Assert.assertEquals(1, actualRequests.size());
529+
Cluster actualRequest = (Cluster) actualRequests.get(0);
530+
531+
Assert.assertEquals(name, ClusterName.parse(actualRequest.getName()));
532+
Assert.assertEquals(serveNodes, actualRequest.getServeNodes());
533+
Assert.assertTrue(
534+
channelProvider.isHeaderSent(
535+
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
536+
GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
537+
}
538+
539+
@Test
540+
@SuppressWarnings("all")
541+
public void updateClusterExceptionTest() throws Exception {
542+
StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
543+
mockBigtableInstanceAdmin.addException(exception);
544+
545+
try {
546+
ClusterName name = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
547+
int serveNodes = 1288838783;
548+
Cluster request =
549+
Cluster.newBuilder().setName(name.toString()).setServeNodes(serveNodes).build();
550+
551+
client.updateClusterAsync(request).get();
552+
Assert.fail("No exception raised");
553+
} catch (ExecutionException e) {
554+
Assert.assertEquals(InvalidArgumentException.class, e.getCause().getClass());
555+
InvalidArgumentException apiException = (InvalidArgumentException) e.getCause();
556+
Assert.assertEquals(StatusCode.Code.INVALID_ARGUMENT, apiException.getStatusCode().getCode());
557+
}
558+
}
559+
499560
@Test
500561
@SuppressWarnings("all")
501562
public void deleteClusterTest() {

‎google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClientTest.java

+41
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import com.google.bigtable.admin.v2.CreateTableRequest;
3434
import com.google.bigtable.admin.v2.DeleteSnapshotRequest;
3535
import com.google.bigtable.admin.v2.DeleteTableRequest;
36+
import com.google.bigtable.admin.v2.DropRowRangeRequest;
3637
import com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest;
3738
import com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse;
3839
import com.google.bigtable.admin.v2.GetSnapshotRequest;
@@ -383,6 +384,46 @@ public void modifyColumnFamiliesExceptionTest() throws Exception {
383384
}
384385
}
385386

387+
@Test
388+
@SuppressWarnings("all")
389+
public void dropRowRangeTest() {
390+
Empty expectedResponse = Empty.newBuilder().build();
391+
mockBigtableTableAdmin.addResponse(expectedResponse);
392+
393+
TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
394+
DropRowRangeRequest request = DropRowRangeRequest.newBuilder().setName(name.toString()).build();
395+
396+
client.dropRowRange(request);
397+
398+
List<AbstractMessage> actualRequests = mockBigtableTableAdmin.getRequests();
399+
Assert.assertEquals(1, actualRequests.size());
400+
DropRowRangeRequest actualRequest = (DropRowRangeRequest) actualRequests.get(0);
401+
402+
Assert.assertEquals(name, TableName.parse(actualRequest.getName()));
403+
Assert.assertTrue(
404+
channelProvider.isHeaderSent(
405+
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
406+
GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
407+
}
408+
409+
@Test
410+
@SuppressWarnings("all")
411+
public void dropRowRangeExceptionTest() throws Exception {
412+
StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
413+
mockBigtableTableAdmin.addException(exception);
414+
415+
try {
416+
TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
417+
DropRowRangeRequest request =
418+
DropRowRangeRequest.newBuilder().setName(name.toString()).build();
419+
420+
client.dropRowRange(request);
421+
Assert.fail("No exception raised");
422+
} catch (InvalidArgumentException e) {
423+
// Expected exception
424+
}
425+
}
426+
386427
@Test
387428
@SuppressWarnings("all")
388429
public void generateConsistencyTokenTest() {

‎synth.metadata

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
{
2-
"updateTime": "2020-02-01T08:36:03.086462Z",
2+
"updateTime": "2020-02-08T09:42:30.672468Z",
33
"sources": [
44
{
55
"generator": {
66
"name": "artman",
7-
"version": "0.44.4",
8-
"dockerImage": "googleapis/artman@sha256:19e945954fc960a4bdfee6cb34695898ab21a8cf0bac063ee39b91f00a1faec8"
7+
"version": "0.45.0",
8+
"dockerImage": "googleapis/artman@sha256:6aec9c34db0e4be221cdaf6faba27bdc07cfea846808b3d3b964dfce3a9a0f9b"
99
}
1010
},
1111
{
1212
"git": {
1313
"name": "googleapis",
1414
"remote": "https://github.com/googleapis/googleapis.git",
15-
"sha": "b5cbe4a4ba64ab19e6627573ff52057a1657773d",
16-
"internalRef": "292647187",
17-
"log": "b5cbe4a4ba64ab19e6627573ff52057a1657773d\nSecurityCenter v1p1beta1: move file-level option on top to workaround protobuf.js bug.\n\nPiperOrigin-RevId: 292647187\n\nb224b317bf20c6a4fbc5030b4a969c3147f27ad3\nAdds API definitions for bigqueryreservation v1beta1.\n\nPiperOrigin-RevId: 292634722\n\nc1468702f9b17e20dd59007c0804a089b83197d2\nSynchronize new proto/yaml changes.\n\nPiperOrigin-RevId: 292626173\n\nffdfa4f55ab2f0afc11d0eb68f125ccbd5e404bd\nvision: v1p3beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292605599\n\n78f61482cd028fc1d9892aa5d89d768666a954cd\nvision: v1p1beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292605125\n\n60bb5a294a604fd1778c7ec87b265d13a7106171\nvision: v1p2beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292604980\n\n3bcf7aa79d45eb9ec29ab9036e9359ea325a7fc3\nvision: v1p4beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292604656\n\n2717b8a1c762b26911b45ecc2e4ee01d98401b28\nFix dataproc artman client library generation.\n\nPiperOrigin-RevId: 292555664\n\n"
15+
"sha": "e7d8a694f4559201e6913f6610069cb08b39274e",
16+
"internalRef": "293903652",
17+
"log": "e7d8a694f4559201e6913f6610069cb08b39274e\nDepend on the latest gapic-generator and resource names plugin.\n\nThis fixes the very old an very annoying bug: https://github.com/googleapis/gapic-generator/pull/3087\n\nPiperOrigin-RevId: 293903652\n\n806b2854a966d55374ee26bb0cef4e30eda17b58\nfix: correct capitalization of Ruby namespaces in SecurityCenter V1p1beta1\n\nPiperOrigin-RevId: 293903613\n\n1b83c92462b14d67a7644e2980f723112472e03a\nPublish annotations and grpc service config for Logging API.\n\nPiperOrigin-RevId: 293893514\n\ne46f761cd6ec15a9e3d5ed4ff321a4bcba8e8585\nGenerate the Bazel build file for recommendengine public api\n\nPiperOrigin-RevId: 293710856\n\n68477017c4173c98addac0373950c6aa9d7b375f\nMake `language_code` optional for UpdateIntentRequest and BatchUpdateIntentsRequest.\n\nThe comments and proto annotations describe this parameter as optional.\n\nPiperOrigin-RevId: 293703548\n\n16f823f578bca4e845a19b88bb9bc5870ea71ab2\nAdd BUILD.bazel files for managedidentities API\n\nPiperOrigin-RevId: 293698246\n\n2f53fd8178c9a9de4ad10fae8dd17a7ba36133f2\nAdd v1p1beta1 config file\n\nPiperOrigin-RevId: 293696729\n\n052b274138fce2be80f97b6dcb83ab343c7c8812\nAdd source field for user event and add field behavior annotations\n\nPiperOrigin-RevId: 293693115\n\n1e89732b2d69151b1b3418fff3d4cc0434f0dded\ndatacatalog: v1beta1 add three new RPCs to gapic v1beta1 config\n\nPiperOrigin-RevId: 293692823\n\n9c8bd09bbdc7c4160a44f1fbab279b73cd7a2337\nchange the name of AccessApproval service to AccessApprovalAdmin\n\nPiperOrigin-RevId: 293690934\n\n2e23b8fbc45f5d9e200572ca662fe1271bcd6760\nAdd ListEntryGroups method, add http bindings to support entry group tagging, and update some comments.\n\nPiperOrigin-RevId: 293666452\n\n0275e38a4ca03a13d3f47a9613aac8c8b0d3f1f2\nAdd proto_package field to managedidentities API. It is needed for APIs that still depend on artman generation.\n\nPiperOrigin-RevId: 293643323\n\n4cdfe8278cb6f308106580d70648001c9146e759\nRegenerating public protos for Data Catalog to add new Custom Type Entry feature.\n\nPiperOrigin-RevId: 293614782\n\n45d2a569ab526a1fad3720f95eefb1c7330eaada\nEnable client generation for v1 ManagedIdentities API.\n\nPiperOrigin-RevId: 293515675\n\n2c17086b77e6f3bcf04a1f65758dfb0c3da1568f\nAdd the Actions on Google common types (//google/actions/type/*).\n\nPiperOrigin-RevId: 293478245\n\n781aadb932e64a12fb6ead7cd842698d99588433\nDialogflow weekly v2/v2beta1 library update:\n- Documentation updates\nImportant updates are also posted at\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 293443396\n\ne2602608c9138c2fca24162720e67f9307c30b95\nDialogflow weekly v2/v2beta1 library update:\n- Documentation updates\nImportant updates are also posted at\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 293442964\n\nc8aef82028d06b7992278fa9294c18570dc86c3d\nAdd cc_proto_library and cc_grpc_library targets for Bigtable protos.\n\nAlso fix indentation of cc_grpc_library targets in Spanner and IAM protos.\n\nPiperOrigin-RevId: 293440538\n\ne2faab04f4cb7f9755072330866689b1943a16e9\ncloudtasks: v2 replace non-standard retry params in gapic config v2\n\nPiperOrigin-RevId: 293424055\n\ndfb4097ea628a8470292c6590a4313aee0c675bd\nerrorreporting: v1beta1 add legacy artman config for php\n\nPiperOrigin-RevId: 293423790\n\nb18aed55b45bfe5b62476292c72759e6c3e573c6\nasset: v1p1beta1 updated comment for `page_size` limit.\n\nPiperOrigin-RevId: 293421386\n\nc9ef36b7956d9859a2fc86ad35fcaa16958ab44f\nbazel: Refactor CI build scripts\n\nPiperOrigin-RevId: 293387911\n\na8ed9d921fdddc61d8467bfd7c1668f0ad90435c\nfix: set Ruby module name for OrgPolicy\n\nPiperOrigin-RevId: 293257997\n\n6c7d28509bd8315de8af0889688ee20099594269\nredis: v1beta1 add UpgradeInstance and connect_mode field to Instance\n\nPiperOrigin-RevId: 293242878\n\nae0abed4fcb4c21f5cb67a82349a049524c4ef68\nredis: v1 add connect_mode field to Instance\n\nPiperOrigin-RevId: 293241914\n\n3f7a0d29b28ee9365771da2b66edf7fa2b4e9c56\nAdds service config definition for bigqueryreservation v1beta1\n\nPiperOrigin-RevId: 293234418\n\n0c88168d5ed6fe353a8cf8cbdc6bf084f6bb66a5\naddition of BUILD & configuration for accessapproval v1\n\nPiperOrigin-RevId: 293219198\n\n39bedc2e30f4778ce81193f6ba1fec56107bcfc4\naccessapproval: v1 publish protos\n\nPiperOrigin-RevId: 293167048\n\n69d9945330a5721cd679f17331a78850e2618226\nAdd file-level `Session` resource definition\n\nPiperOrigin-RevId: 293080182\n\nf6a1a6b417f39694275ca286110bc3c1ca4db0dc\nAdd file-level `Session` resource definition\n\nPiperOrigin-RevId: 293080178\n\n29d40b78e3dc1579b0b209463fbcb76e5767f72a\nExpose managedidentities/v1beta1/ API for client library usage.\n\nPiperOrigin-RevId: 292979741\n\na22129a1fb6e18056d576dfb7717aef74b63734a\nExpose managedidentities/v1/ API for client library usage.\n\nPiperOrigin-RevId: 292968186\n\n"
1818
}
1919
},
2020
{
2121
"template": {
2222
"name": "java_library",
2323
"origin": "synthtool.gcp",
24-
"version": "2019.10.17"
24+
"version": "2020.2.4"
2525
}
2626
}
2727
],

0 commit comments

Comments
 (0)