Skip to content

Commit 133a762

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

File tree

13 files changed

+277
-100
lines changed

13 files changed

+277
-100
lines changed

‎google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigSettings.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,12 @@
7373
* <code>
7474
* ConfigSettings.Builder configSettingsBuilder =
7575
* ConfigSettings.newBuilder();
76-
* configSettingsBuilder.getSinkSettings().getRetrySettings().toBuilder()
77-
* .setTotalTimeout(Duration.ofSeconds(30));
76+
* configSettingsBuilder
77+
* .getSinkSettings()
78+
* .setRetrySettings(
79+
* configSettingsBuilder.getSinkSettings().getRetrySettings().toBuilder()
80+
* .setTotalTimeout(Duration.ofSeconds(30))
81+
* .build());
7882
* ConfigSettings configSettings = configSettingsBuilder.build();
7983
* </code>
8084
* </pre>

‎google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingSettings.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,12 @@
6767
* <code>
6868
* LoggingSettings.Builder loggingSettingsBuilder =
6969
* LoggingSettings.newBuilder();
70-
* loggingSettingsBuilder.deleteLogSettings().getRetrySettings().toBuilder()
71-
* .setTotalTimeout(Duration.ofSeconds(30));
70+
* loggingSettingsBuilder
71+
* .deleteLogSettings()
72+
* .setRetrySettings(
73+
* loggingSettingsBuilder.deleteLogSettings().getRetrySettings().toBuilder()
74+
* .setTotalTimeout(Duration.ofSeconds(30))
75+
* .build());
7276
* LoggingSettings loggingSettings = loggingSettingsBuilder.build();
7377
* </code>
7478
* </pre>

‎google-cloud-logging/src/main/java/com/google/cloud/logging/v2/MetricsSettings.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,12 @@
6262
* <code>
6363
* MetricsSettings.Builder metricsSettingsBuilder =
6464
* MetricsSettings.newBuilder();
65-
* metricsSettingsBuilder.getLogMetricSettings().getRetrySettings().toBuilder()
66-
* .setTotalTimeout(Duration.ofSeconds(30));
65+
* metricsSettingsBuilder
66+
* .getLogMetricSettings()
67+
* .setRetrySettings(
68+
* metricsSettingsBuilder.getLogMetricSettings().getRetrySettings().toBuilder()
69+
* .setTotalTimeout(Duration.ofSeconds(30))
70+
* .build());
6771
* MetricsSettings metricsSettings = metricsSettingsBuilder.build();
6872
* </code>
6973
* </pre>

‎google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,12 @@
8888
* <code>
8989
* ConfigServiceV2StubSettings.Builder configSettingsBuilder =
9090
* ConfigServiceV2StubSettings.newBuilder();
91-
* configSettingsBuilder.getSinkSettings().getRetrySettings().toBuilder()
92-
* .setTotalTimeout(Duration.ofSeconds(30));
91+
* configSettingsBuilder
92+
* .getSinkSettings()
93+
* .setRetrySettings(
94+
* configSettingsBuilder.getSinkSettings().getRetrySettings().toBuilder()
95+
* .setTotalTimeout(Duration.ofSeconds(30))
96+
* .build());
9397
* ConfigServiceV2StubSettings configSettings = configSettingsBuilder.build();
9498
* </code>
9599
* </pre>

‎google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,12 @@
9292
* <code>
9393
* LoggingServiceV2StubSettings.Builder loggingSettingsBuilder =
9494
* LoggingServiceV2StubSettings.newBuilder();
95-
* loggingSettingsBuilder.deleteLogSettings().getRetrySettings().toBuilder()
96-
* .setTotalTimeout(Duration.ofSeconds(30));
95+
* loggingSettingsBuilder
96+
* .deleteLogSettings()
97+
* .setRetrySettings(
98+
* loggingSettingsBuilder.deleteLogSettings().getRetrySettings().toBuilder()
99+
* .setTotalTimeout(Duration.ofSeconds(30))
100+
* .build());
97101
* LoggingServiceV2StubSettings loggingSettings = loggingSettingsBuilder.build();
98102
* </code>
99103
* </pre>

‎google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,12 @@
7777
* <code>
7878
* MetricsServiceV2StubSettings.Builder metricsSettingsBuilder =
7979
* MetricsServiceV2StubSettings.newBuilder();
80-
* metricsSettingsBuilder.getLogMetricSettings().getRetrySettings().toBuilder()
81-
* .setTotalTimeout(Duration.ofSeconds(30));
80+
* metricsSettingsBuilder
81+
* .getLogMetricSettings()
82+
* .setRetrySettings(
83+
* metricsSettingsBuilder.getLogMetricSettings().getRetrySettings().toBuilder()
84+
* .setTotalTimeout(Duration.ofSeconds(30))
85+
* .build());
8286
* MetricsServiceV2StubSettings metricsSettings = metricsSettingsBuilder.build();
8387
* </code>
8488
* </pre>

‎google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@
2828
import com.google.api.resourcenames.ResourceName;
2929
import com.google.common.collect.Lists;
3030
import com.google.logging.v2.BillingName;
31+
import com.google.logging.v2.CmekSettings;
3132
import com.google.logging.v2.CreateExclusionRequest;
3233
import com.google.logging.v2.CreateSinkRequest;
3334
import com.google.logging.v2.DeleteExclusionRequest;
3435
import com.google.logging.v2.DeleteSinkRequest;
3536
import com.google.logging.v2.ExclusionName;
3637
import com.google.logging.v2.ExclusionNames;
38+
import com.google.logging.v2.GetCmekSettingsRequest;
3739
import com.google.logging.v2.GetExclusionRequest;
3840
import com.google.logging.v2.GetSinkRequest;
3941
import com.google.logging.v2.ListExclusionsRequest;
@@ -49,6 +51,7 @@
4951
import com.google.logging.v2.ProjectSinkName;
5052
import com.google.logging.v2.SinkName;
5153
import com.google.logging.v2.SinkNames;
54+
import com.google.logging.v2.UpdateCmekSettingsRequest;
5255
import com.google.logging.v2.UpdateExclusionRequest;
5356
import com.google.logging.v2.UpdateSinkRequest;
5457
import com.google.protobuf.AbstractMessage;
@@ -658,4 +661,94 @@ public void deleteExclusionExceptionTest() throws Exception {
658661
// Expected exception
659662
}
660663
}
664+
665+
@Test
666+
@SuppressWarnings("all")
667+
public void getCmekSettingsTest() {
668+
String name = "name3373707";
669+
String kmsKeyName = "kmsKeyName2094986649";
670+
String serviceAccountId = "serviceAccountId-111486921";
671+
CmekSettings expectedResponse =
672+
CmekSettings.newBuilder()
673+
.setName(name)
674+
.setKmsKeyName(kmsKeyName)
675+
.setServiceAccountId(serviceAccountId)
676+
.build();
677+
mockConfigServiceV2.addResponse(expectedResponse);
678+
679+
GetCmekSettingsRequest request = GetCmekSettingsRequest.newBuilder().build();
680+
681+
CmekSettings actualResponse = client.getCmekSettings(request);
682+
Assert.assertEquals(expectedResponse, actualResponse);
683+
684+
List<AbstractMessage> actualRequests = mockConfigServiceV2.getRequests();
685+
Assert.assertEquals(1, actualRequests.size());
686+
GetCmekSettingsRequest actualRequest = (GetCmekSettingsRequest) actualRequests.get(0);
687+
688+
Assert.assertTrue(
689+
channelProvider.isHeaderSent(
690+
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
691+
GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
692+
}
693+
694+
@Test
695+
@SuppressWarnings("all")
696+
public void getCmekSettingsExceptionTest() throws Exception {
697+
StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
698+
mockConfigServiceV2.addException(exception);
699+
700+
try {
701+
GetCmekSettingsRequest request = GetCmekSettingsRequest.newBuilder().build();
702+
703+
client.getCmekSettings(request);
704+
Assert.fail("No exception raised");
705+
} catch (InvalidArgumentException e) {
706+
// Expected exception
707+
}
708+
}
709+
710+
@Test
711+
@SuppressWarnings("all")
712+
public void updateCmekSettingsTest() {
713+
String name = "name3373707";
714+
String kmsKeyName = "kmsKeyName2094986649";
715+
String serviceAccountId = "serviceAccountId-111486921";
716+
CmekSettings expectedResponse =
717+
CmekSettings.newBuilder()
718+
.setName(name)
719+
.setKmsKeyName(kmsKeyName)
720+
.setServiceAccountId(serviceAccountId)
721+
.build();
722+
mockConfigServiceV2.addResponse(expectedResponse);
723+
724+
UpdateCmekSettingsRequest request = UpdateCmekSettingsRequest.newBuilder().build();
725+
726+
CmekSettings actualResponse = client.updateCmekSettings(request);
727+
Assert.assertEquals(expectedResponse, actualResponse);
728+
729+
List<AbstractMessage> actualRequests = mockConfigServiceV2.getRequests();
730+
Assert.assertEquals(1, actualRequests.size());
731+
UpdateCmekSettingsRequest actualRequest = (UpdateCmekSettingsRequest) actualRequests.get(0);
732+
733+
Assert.assertTrue(
734+
channelProvider.isHeaderSent(
735+
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
736+
GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
737+
}
738+
739+
@Test
740+
@SuppressWarnings("all")
741+
public void updateCmekSettingsExceptionTest() throws Exception {
742+
StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
743+
mockConfigServiceV2.addException(exception);
744+
745+
try {
746+
UpdateCmekSettingsRequest request = UpdateCmekSettingsRequest.newBuilder().build();
747+
748+
client.updateCmekSettings(request);
749+
Assert.fail("No exception raised");
750+
} catch (InvalidArgumentException e) {
751+
// Expected exception
752+
}
753+
}
661754
}

‎google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@
1717

1818
import static com.google.cloud.logging.v2.LoggingClient.ListLogEntriesPagedResponse;
1919
import static com.google.cloud.logging.v2.LoggingClient.ListLogsPagedResponse;
20+
import static com.google.cloud.logging.v2.LoggingClient.ListMonitoredResourceDescriptorsPagedResponse;
2021

2122
import com.google.api.MonitoredResource;
23+
import com.google.api.MonitoredResourceDescriptor;
2224
import com.google.api.gax.core.NoCredentialsProvider;
2325
import com.google.api.gax.grpc.GaxGrpcProperties;
2426
import com.google.api.gax.grpc.testing.LocalChannelProvider;
@@ -32,6 +34,8 @@
3234
import com.google.logging.v2.ListLogEntriesResponse;
3335
import com.google.logging.v2.ListLogsRequest;
3436
import com.google.logging.v2.ListLogsResponse;
37+
import com.google.logging.v2.ListMonitoredResourceDescriptorsRequest;
38+
import com.google.logging.v2.ListMonitoredResourceDescriptorsResponse;
3539
import com.google.logging.v2.LogEntry;
3640
import com.google.logging.v2.LogName;
3741
import com.google.logging.v2.LogNames;
@@ -243,6 +247,60 @@ public void listLogEntriesExceptionTest() throws Exception {
243247
}
244248
}
245249

250+
@Test
251+
@SuppressWarnings("all")
252+
public void listMonitoredResourceDescriptorsTest() {
253+
String nextPageToken = "";
254+
MonitoredResourceDescriptor resourceDescriptorsElement =
255+
MonitoredResourceDescriptor.newBuilder().build();
256+
List<MonitoredResourceDescriptor> resourceDescriptors =
257+
Arrays.asList(resourceDescriptorsElement);
258+
ListMonitoredResourceDescriptorsResponse expectedResponse =
259+
ListMonitoredResourceDescriptorsResponse.newBuilder()
260+
.setNextPageToken(nextPageToken)
261+
.addAllResourceDescriptors(resourceDescriptors)
262+
.build();
263+
mockLoggingServiceV2.addResponse(expectedResponse);
264+
265+
ListMonitoredResourceDescriptorsRequest request =
266+
ListMonitoredResourceDescriptorsRequest.newBuilder().build();
267+
268+
ListMonitoredResourceDescriptorsPagedResponse pagedListResponse =
269+
client.listMonitoredResourceDescriptors(request);
270+
271+
List<MonitoredResourceDescriptor> resources =
272+
Lists.newArrayList(pagedListResponse.iterateAll());
273+
Assert.assertEquals(1, resources.size());
274+
Assert.assertEquals(expectedResponse.getResourceDescriptorsList().get(0), resources.get(0));
275+
276+
List<AbstractMessage> actualRequests = mockLoggingServiceV2.getRequests();
277+
Assert.assertEquals(1, actualRequests.size());
278+
ListMonitoredResourceDescriptorsRequest actualRequest =
279+
(ListMonitoredResourceDescriptorsRequest) actualRequests.get(0);
280+
281+
Assert.assertTrue(
282+
channelProvider.isHeaderSent(
283+
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
284+
GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
285+
}
286+
287+
@Test
288+
@SuppressWarnings("all")
289+
public void listMonitoredResourceDescriptorsExceptionTest() throws Exception {
290+
StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
291+
mockLoggingServiceV2.addException(exception);
292+
293+
try {
294+
ListMonitoredResourceDescriptorsRequest request =
295+
ListMonitoredResourceDescriptorsRequest.newBuilder().build();
296+
297+
client.listMonitoredResourceDescriptors(request);
298+
Assert.fail("No exception raised");
299+
} catch (InvalidArgumentException e) {
300+
// Expected exception
301+
}
302+
}
303+
246304
@Test
247305
@SuppressWarnings("all")
248306
public void listLogsTest() {

‎proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingMetricsProto.java

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -100,47 +100,47 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
100100
+ ".v2.LogMetric\022\027\n\017next_page_token\030\002 \001(\t\"Q"
101101
+ "\n\023GetLogMetricRequest\022:\n\013metric_name\030\001 \001"
102102
+ "(\tB%\340A\002\372A\037\n\035logging.googleapis.com/Metri"
103-
+ "c\"\217\001\n\026CreateLogMetricRequest\022B\n\006parent\030\001"
104-
+ " \001(\tB2\340A\002\372A,\n*cloudresourcemanager.googl"
105-
+ "eapis.com/Metric\0221\n\006metric\030\002 \001(\0132\034.googl"
106-
+ "e.logging.v2.LogMetricB\003\340A\002\"\207\001\n\026UpdateLo"
107-
+ "gMetricRequest\022:\n\013metric_name\030\001 \001(\tB%\340A\002"
108-
+ "\372A\037\n\035logging.googleapis.com/Metric\0221\n\006me"
109-
+ "tric\030\002 \001(\0132\034.google.logging.v2.LogMetric"
110-
+ "B\003\340A\002\"T\n\026DeleteLogMetricRequest\022:\n\013metri"
111-
+ "c_name\030\001 \001(\tB%\340A\002\372A\037\n\035logging.googleapis"
112-
+ ".com/Metric2\256\010\n\020MetricsServiceV2\022\227\001\n\016Lis"
113-
+ "tLogMetrics\022(.google.logging.v2.ListLogM"
114-
+ "etricsRequest\032).google.logging.v2.ListLo"
115-
+ "gMetricsResponse\"0\202\323\344\223\002!\022\037/v2/{parent=pr"
116-
+ "ojects/*}/metrics\332A\006parent\022\222\001\n\014GetLogMet"
117-
+ "ric\022&.google.logging.v2.GetLogMetricRequ"
118-
+ "est\032\034.google.logging.v2.LogMetric\"<\202\323\344\223\002"
119-
+ "(\022&/v2/{metric_name=projects/*/metrics/*"
120-
+ "}\332A\013metric_name\022\233\001\n\017CreateLogMetric\022).go"
121-
+ "ogle.logging.v2.CreateLogMetricRequest\032\034"
122-
+ ".google.logging.v2.LogMetric\"?\202\323\344\223\002)\"\037/v"
123-
+ "2/{parent=projects/*}/metrics:\006metric\332A\r"
124-
+ "parent,metric\022\247\001\n\017UpdateLogMetric\022).goog"
125-
+ "le.logging.v2.UpdateLogMetricRequest\032\034.g"
126-
+ "oogle.logging.v2.LogMetric\"K\202\323\344\223\0020\032&/v2/"
127-
+ "{metric_name=projects/*/metrics/*}:\006metr"
128-
+ "ic\332A\022metric_name,metric\022\222\001\n\017DeleteLogMet"
129-
+ "ric\022).google.logging.v2.DeleteLogMetricR"
130-
+ "equest\032\026.google.protobuf.Empty\"<\202\323\344\223\002(*&"
131-
+ "/v2/{metric_name=projects/*/metrics/*}\332A"
132-
+ "\013metric_name\032\215\002\312A\026logging.googleapis.com"
133-
+ "\322A\360\001https://www.googleapis.com/auth/clou"
134-
+ "d-platform,https://www.googleapis.com/au"
135-
+ "th/cloud-platform.read-only,https://www."
136-
+ "googleapis.com/auth/logging.admin,https:"
137-
+ "//www.googleapis.com/auth/logging.read,h"
138-
+ "ttps://www.googleapis.com/auth/logging.w"
139-
+ "riteB\237\001\n\025com.google.logging.v2B\023LoggingM"
140-
+ "etricsProtoP\001Z8google.golang.org/genprot"
141-
+ "o/googleapis/logging/v2;logging\370\001\001\252\002\027Goo"
142-
+ "gle.Cloud.Logging.V2\312\002\027Google\\Cloud\\Logg"
143-
+ "ing\\V2b\006proto3"
103+
+ "c\"\202\001\n\026CreateLogMetricRequest\0225\n\006parent\030\001"
104+
+ " \001(\tB%\340A\002\372A\037\n\035logging.googleapis.com/Met"
105+
+ "ric\0221\n\006metric\030\002 \001(\0132\034.google.logging.v2."
106+
+ "LogMetricB\003\340A\002\"\207\001\n\026UpdateLogMetricReques"
107+
+ "t\022:\n\013metric_name\030\001 \001(\tB%\340A\002\372A\037\n\035logging."
108+
+ "googleapis.com/Metric\0221\n\006metric\030\002 \001(\0132\034."
109+
+ "google.logging.v2.LogMetricB\003\340A\002\"T\n\026Dele"
110+
+ "teLogMetricRequest\022:\n\013metric_name\030\001 \001(\tB"
111+
+ "%\340A\002\372A\037\n\035logging.googleapis.com/Metric2\256"
112+
+ "\010\n\020MetricsServiceV2\022\227\001\n\016ListLogMetrics\022("
113+
+ ".google.logging.v2.ListLogMetricsRequest"
114+
+ "\032).google.logging.v2.ListLogMetricsRespo"
115+
+ "nse\"0\202\323\344\223\002!\022\037/v2/{parent=projects/*}/met"
116+
+ "rics\332A\006parent\022\222\001\n\014GetLogMetric\022&.google."
117+
+ "logging.v2.GetLogMetricRequest\032\034.google."
118+
+ "logging.v2.LogMetric\"<\202\323\344\223\002(\022&/v2/{metri"
119+
+ "c_name=projects/*/metrics/*}\332A\013metric_na"
120+
+ "me\022\233\001\n\017CreateLogMetric\022).google.logging."
121+
+ "v2.CreateLogMetricRequest\032\034.google.loggi"
122+
+ "ng.v2.LogMetric\"?\202\323\344\223\002)\"\037/v2/{parent=pro"
123+
+ "jects/*}/metrics:\006metric\332A\rparent,metric"
124+
+ "\022\247\001\n\017UpdateLogMetric\022).google.logging.v2"
125+
+ ".UpdateLogMetricRequest\032\034.google.logging"
126+
+ ".v2.LogMetric\"K\202\323\344\223\0020\032&/v2/{metric_name="
127+
+ "projects/*/metrics/*}:\006metric\332A\022metric_n"
128+
+ "ame,metric\022\222\001\n\017DeleteLogMetric\022).google."
129+
+ "logging.v2.DeleteLogMetricRequest\032\026.goog"
130+
+ "le.protobuf.Empty\"<\202\323\344\223\002(*&/v2/{metric_n"
131+
+ "ame=projects/*/metrics/*}\332A\013metric_name\032"
132+
+ "\215\002\312A\026logging.googleapis.com\322A\360\001https://w"
133+
+ "ww.googleapis.com/auth/cloud-platform,ht"
134+
+ "tps://www.googleapis.com/auth/cloud-plat"
135+
+ "form.read-only,https://www.googleapis.co"
136+
+ "m/auth/logging.admin,https://www.googlea"
137+
+ "pis.com/auth/logging.read,https://www.go"
138+
+ "ogleapis.com/auth/logging.writeB\237\001\n\025com."
139+
+ "google.logging.v2B\023LoggingMetricsProtoP\001"
140+
+ "Z8google.golang.org/genproto/googleapis/"
141+
+ "logging/v2;logging\370\001\001\252\002\027Google.Cloud.Log"
142+
+ "ging.V2\312\002\027Google\\Cloud\\Logging\\V2b\006proto"
143+
+ "3"
144144
};
145145
descriptor =
146146
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(

0 commit comments

Comments
 (0)