Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 455c410

Browse files
yoshi-automationyoshi-automation
authored
feat: add dynamic_substitutions to BuildOptions, STACKDRIVER_ONLY/CLOUD_LOGGING_ONLY to LoggingMode, name/service_account to Build (#246)
This PR was generated using Autosynth. 🌈 Synth log will be available here: https://source.cloud.google.com/results/invocations/b12affff-e85c-44ff-9cad-bd06f777bd37/targets - [ ] To automatically regenerate this PR, check this box. PiperOrigin-RevId: 331027363 Source-Link: googleapis/googleapis@bc18612 PiperOrigin-RevId: 330974505 Source-Link: googleapis/googleapis@3257ba5 PiperOrigin-RevId: 330504082 Source-Link: googleapis/googleapis@48ce887
1 parent f798aff commit 455c410

33 files changed

+3564
-478
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
1717
<dependency>
1818
<groupId>com.google.cloud</groupId>
1919
<artifactId>libraries-bom</artifactId>
20-
<version>9.1.0</version>
20+
<version>10.1.0</version>
2121
<type>pom</type>
2222
<scope>import</scope>
2323
</dependency>
@@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies:
3838
<dependency>
3939
<groupId>com.google.cloud</groupId>
4040
<artifactId>google-cloud-build</artifactId>
41-
<version>2.0.0</version>
41+
<version>2.0.1</version>
4242
</dependency>
4343

4444
```

‎google-cloud-build/src/main/java/com/google/cloud/devtools/cloudbuild/v1/stub/GrpcCloudBuildStub.java

+29
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ protected GrpcCloudBuildStub(
289289
public Map<String, String> extract(ListBuildsRequest request) {
290290
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
291291
params.put("project_id", String.valueOf(request.getProjectId()));
292+
params.put("parent", String.valueOf(request.getParent()));
292293
return params.build();
293294
}
294295
})
@@ -306,21 +307,49 @@ public Map<String, String> extract(ListBuildsRequest request) {
306307
public Map<String, String> extract(CreateBuildRequest request) {
307308
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
308309
params.put("project_id", String.valueOf(request.getProjectId()));
310+
params.put("parent", String.valueOf(request.getParent()));
309311
return params.build();
310312
}
311313
})
312314
.build();
313315
GrpcCallSettings<GetBuildRequest, Build> getBuildTransportSettings =
314316
GrpcCallSettings.<GetBuildRequest, Build>newBuilder()
315317
.setMethodDescriptor(getBuildMethodDescriptor)
318+
.setParamsExtractor(
319+
new RequestParamsExtractor<GetBuildRequest>() {
320+
@Override
321+
public Map<String, String> extract(GetBuildRequest request) {
322+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
323+
params.put("name", String.valueOf(request.getName()));
324+
return params.build();
325+
}
326+
})
316327
.build();
317328
GrpcCallSettings<CancelBuildRequest, Build> cancelBuildTransportSettings =
318329
GrpcCallSettings.<CancelBuildRequest, Build>newBuilder()
319330
.setMethodDescriptor(cancelBuildMethodDescriptor)
331+
.setParamsExtractor(
332+
new RequestParamsExtractor<CancelBuildRequest>() {
333+
@Override
334+
public Map<String, String> extract(CancelBuildRequest request) {
335+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
336+
params.put("name", String.valueOf(request.getName()));
337+
return params.build();
338+
}
339+
})
320340
.build();
321341
GrpcCallSettings<RetryBuildRequest, Operation> retryBuildTransportSettings =
322342
GrpcCallSettings.<RetryBuildRequest, Operation>newBuilder()
323343
.setMethodDescriptor(retryBuildMethodDescriptor)
344+
.setParamsExtractor(
345+
new RequestParamsExtractor<RetryBuildRequest>() {
346+
@Override
347+
public Map<String, String> extract(RetryBuildRequest request) {
348+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
349+
params.put("name", String.valueOf(request.getName()));
350+
return params.build();
351+
}
352+
})
324353
.build();
325354
GrpcCallSettings<CreateBuildTriggerRequest, BuildTrigger> createBuildTriggerTransportSettings =
326355
GrpcCallSettings.<CreateBuildTriggerRequest, BuildTrigger>newBuilder()

‎google-cloud-build/src/test/java/com/google/cloud/devtools/cloudbuild/v1/CloudBuildClientTest.java

+29-6
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
import com.google.api.gax.rpc.InvalidArgumentException;
2828
import com.google.api.gax.rpc.StatusCode;
2929
import com.google.cloudbuild.v1.Build;
30+
import com.google.cloudbuild.v1.BuildName;
3031
import com.google.cloudbuild.v1.BuildTrigger;
32+
import com.google.cloudbuild.v1.BuildTriggerName;
3133
import com.google.cloudbuild.v1.CancelBuildRequest;
3234
import com.google.cloudbuild.v1.CreateBuildRequest;
3335
import com.google.cloudbuild.v1.CreateBuildTriggerRequest;
@@ -46,6 +48,7 @@
4648
import com.google.cloudbuild.v1.RepoSource;
4749
import com.google.cloudbuild.v1.RetryBuildRequest;
4850
import com.google.cloudbuild.v1.RunBuildTriggerRequest;
51+
import com.google.cloudbuild.v1.ServiceAccountName;
4952
import com.google.cloudbuild.v1.UpdateBuildTriggerRequest;
5053
import com.google.cloudbuild.v1.UpdateWorkerPoolRequest;
5154
import com.google.cloudbuild.v1.WorkerPool;
@@ -200,20 +203,24 @@ public void deleteBuildTriggerExceptionTest() throws Exception {
200203
@Test
201204
@SuppressWarnings("all")
202205
public void createBuildTest() throws Exception {
206+
BuildName name = BuildName.ofProjectBuildName("[PROJECT]", "[BUILD]");
203207
String id = "id3355";
204208
String projectId2 = "projectId2939242356";
205209
String statusDetail = "statusDetail2089931070";
206210
String logsBucket = "logsBucket1565363834";
207211
String buildTriggerId = "buildTriggerId1105559411";
208212
String logUrl = "logUrl342054388";
213+
ServiceAccountName serviceAccount = ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]");
209214
Build expectedResponse =
210215
Build.newBuilder()
216+
.setName(name.toString())
211217
.setId(id)
212218
.setProjectId(projectId2)
213219
.setStatusDetail(statusDetail)
214220
.setLogsBucket(logsBucket)
215221
.setBuildTriggerId(buildTriggerId)
216222
.setLogUrl(logUrl)
223+
.setServiceAccount(serviceAccount.toString())
217224
.build();
218225
Operation resultOperation =
219226
Operation.newBuilder()
@@ -263,20 +270,24 @@ public void createBuildExceptionTest() throws Exception {
263270
@Test
264271
@SuppressWarnings("all")
265272
public void getBuildTest() {
273+
BuildName name = BuildName.ofProjectBuildName("[PROJECT]", "[BUILD]");
266274
String id2 = "id23227150";
267275
String projectId2 = "projectId2939242356";
268276
String statusDetail = "statusDetail2089931070";
269277
String logsBucket = "logsBucket1565363834";
270278
String buildTriggerId = "buildTriggerId1105559411";
271279
String logUrl = "logUrl342054388";
280+
ServiceAccountName serviceAccount = ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]");
272281
Build expectedResponse =
273282
Build.newBuilder()
283+
.setName(name.toString())
274284
.setId(id2)
275285
.setProjectId(projectId2)
276286
.setStatusDetail(statusDetail)
277287
.setLogsBucket(logsBucket)
278288
.setBuildTriggerId(buildTriggerId)
279289
.setLogUrl(logUrl)
290+
.setServiceAccount(serviceAccount.toString())
280291
.build();
281292
mockCloudBuild.addResponse(expectedResponse);
282293

@@ -318,20 +329,24 @@ public void getBuildExceptionTest() throws Exception {
318329
@Test
319330
@SuppressWarnings("all")
320331
public void cancelBuildTest() {
332+
BuildName name = BuildName.ofProjectBuildName("[PROJECT]", "[BUILD]");
321333
String id2 = "id23227150";
322334
String projectId2 = "projectId2939242356";
323335
String statusDetail = "statusDetail2089931070";
324336
String logsBucket = "logsBucket1565363834";
325337
String buildTriggerId = "buildTriggerId1105559411";
326338
String logUrl = "logUrl342054388";
339+
ServiceAccountName serviceAccount = ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]");
327340
Build expectedResponse =
328341
Build.newBuilder()
342+
.setName(name.toString())
329343
.setId(id2)
330344
.setProjectId(projectId2)
331345
.setStatusDetail(statusDetail)
332346
.setLogsBucket(logsBucket)
333347
.setBuildTriggerId(buildTriggerId)
334348
.setLogUrl(logUrl)
349+
.setServiceAccount(serviceAccount.toString())
335350
.build();
336351
mockCloudBuild.addResponse(expectedResponse);
337352

@@ -373,20 +388,24 @@ public void cancelBuildExceptionTest() throws Exception {
373388
@Test
374389
@SuppressWarnings("all")
375390
public void retryBuildTest() throws Exception {
391+
BuildName name = BuildName.ofProjectBuildName("[PROJECT]", "[BUILD]");
376392
String id2 = "id23227150";
377393
String projectId2 = "projectId2939242356";
378394
String statusDetail = "statusDetail2089931070";
379395
String logsBucket = "logsBucket1565363834";
380396
String buildTriggerId = "buildTriggerId1105559411";
381397
String logUrl = "logUrl342054388";
398+
ServiceAccountName serviceAccount = ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]");
382399
Build expectedResponse =
383400
Build.newBuilder()
401+
.setName(name.toString())
384402
.setId(id2)
385403
.setProjectId(projectId2)
386404
.setStatusDetail(statusDetail)
387405
.setLogsBucket(logsBucket)
388406
.setBuildTriggerId(buildTriggerId)
389407
.setLogUrl(logUrl)
408+
.setServiceAccount(serviceAccount.toString())
390409
.build();
391410
Operation resultOperation =
392411
Operation.newBuilder()
@@ -438,14 +457,14 @@ public void retryBuildExceptionTest() throws Exception {
438457
public void createBuildTriggerTest() {
439458
String id = "id3355";
440459
String description = "description-1724546052";
441-
String name = "name3373707";
460+
BuildTriggerName name = BuildTriggerName.of("[PROJECT]", "[TRIGGER]");
442461
String filename = "filename-734768633";
443462
boolean disabled = true;
444463
BuildTrigger expectedResponse =
445464
BuildTrigger.newBuilder()
446465
.setId(id)
447466
.setDescription(description)
448-
.setName(name)
467+
.setName(name.toString())
449468
.setFilename(filename)
450469
.setDisabled(disabled)
451470
.build();
@@ -491,14 +510,14 @@ public void createBuildTriggerExceptionTest() throws Exception {
491510
public void getBuildTriggerTest() {
492511
String id = "id3355";
493512
String description = "description-1724546052";
494-
String name = "name3373707";
513+
BuildTriggerName name = BuildTriggerName.of("[PROJECT]", "[TRIGGER]");
495514
String filename = "filename-734768633";
496515
boolean disabled = true;
497516
BuildTrigger expectedResponse =
498517
BuildTrigger.newBuilder()
499518
.setId(id)
500519
.setDescription(description)
501-
.setName(name)
520+
.setName(name.toString())
502521
.setFilename(filename)
503522
.setDisabled(disabled)
504523
.build();
@@ -592,14 +611,14 @@ public void listBuildTriggersExceptionTest() throws Exception {
592611
public void updateBuildTriggerTest() {
593612
String id = "id3355";
594613
String description = "description-1724546052";
595-
String name = "name3373707";
614+
BuildTriggerName name = BuildTriggerName.of("[PROJECT]", "[TRIGGER]");
596615
String filename = "filename-734768633";
597616
boolean disabled = true;
598617
BuildTrigger expectedResponse =
599618
BuildTrigger.newBuilder()
600619
.setId(id)
601620
.setDescription(description)
602-
.setName(name)
621+
.setName(name.toString())
603622
.setFilename(filename)
604623
.setDisabled(disabled)
605624
.build();
@@ -646,20 +665,24 @@ public void updateBuildTriggerExceptionTest() throws Exception {
646665
@Test
647666
@SuppressWarnings("all")
648667
public void runBuildTriggerTest() throws Exception {
668+
BuildName name = BuildName.ofProjectBuildName("[PROJECT]", "[BUILD]");
649669
String id = "id3355";
650670
String projectId2 = "projectId2939242356";
651671
String statusDetail = "statusDetail2089931070";
652672
String logsBucket = "logsBucket1565363834";
653673
String buildTriggerId = "buildTriggerId1105559411";
654674
String logUrl = "logUrl342054388";
675+
ServiceAccountName serviceAccount = ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]");
655676
Build expectedResponse =
656677
Build.newBuilder()
678+
.setName(name.toString())
657679
.setId(id)
658680
.setProjectId(projectId2)
659681
.setStatusDetail(statusDetail)
660682
.setLogsBucket(logsBucket)
661683
.setBuildTriggerId(buildTriggerId)
662684
.setLogUrl(logUrl)
685+
.setServiceAccount(serviceAccount.toString())
663686
.build();
664687
Operation resultOperation =
665688
Operation.newBuilder()

‎proto-google-cloud-build-v1/pom.xml

+8
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@
2121
<groupId>com.google.api.grpc</groupId>
2222
<artifactId>proto-google-common-protos</artifactId>
2323
</dependency>
24+
<dependency>
25+
<groupId>com.google.guava</groupId>
26+
<artifactId>guava</artifactId>
27+
</dependency>
28+
<dependency>
29+
<groupId>com.google.api</groupId>
30+
<artifactId>api-common</artifactId>
31+
</dependency>
2432
</dependencies>
2533

2634
<build>

0 commit comments

Comments
 (0)