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

Commit c83d27e

Browse files
yoshi-automationyoshi-automation
authored
fix: convert to grpc_service_config (#213)
This PR was generated using Autosynth. 🌈 Synth log will be available here: https://source.cloud.google.com/results/invocations/0ba72398-8b4b-493a-ae02-9b0d0d5410e7/targets - [ ] To automatically regenerate this PR, check this box. PiperOrigin-RevId: 321584556 Source-Link: googleapis/googleapis@bad4b83
1 parent 24acec6 commit c83d27e

File tree

3 files changed

+60
-48
lines changed

3 files changed

+60
-48
lines changed

‎README.md

+1-1
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>8.0.0</version>
20+
<version>8.1.0</version>
2121
<type>pom</type>
2222
<scope>import</scope>
2323
</dependency>

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

+56-44
Original file line numberDiff line numberDiff line change
@@ -502,11 +502,13 @@ public static class Builder extends StubSettings.Builder<CloudBuildStubSettings,
502502
ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
503503
ImmutableMap.builder();
504504
definitions.put(
505-
"idempotent",
505+
"retry_policy_1_codes",
506506
ImmutableSet.copyOf(
507507
Lists.<StatusCode.Code>newArrayList(
508-
StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
509-
definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
508+
StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED)));
509+
definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
510+
definitions.put(
511+
"no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
510512
RETRYABLE_CODE_DEFINITIONS = definitions.build();
511513
}
512514

@@ -520,12 +522,22 @@ public static class Builder extends StubSettings.Builder<CloudBuildStubSettings,
520522
.setInitialRetryDelay(Duration.ofMillis(100L))
521523
.setRetryDelayMultiplier(1.3)
522524
.setMaxRetryDelay(Duration.ofMillis(60000L))
523-
.setInitialRpcTimeout(Duration.ofMillis(20000L))
525+
.setInitialRpcTimeout(Duration.ofMillis(600000L))
526+
.setRpcTimeoutMultiplier(1.0)
527+
.setMaxRpcTimeout(Duration.ofMillis(600000L))
528+
.setTotalTimeout(Duration.ofMillis(600000L))
529+
.build();
530+
definitions.put("retry_policy_1_params", settings);
531+
settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
532+
definitions.put("no_retry_params", settings);
533+
settings =
534+
RetrySettings.newBuilder()
535+
.setInitialRpcTimeout(Duration.ofMillis(600000L))
524536
.setRpcTimeoutMultiplier(1.0)
525-
.setMaxRpcTimeout(Duration.ofMillis(20000L))
537+
.setMaxRpcTimeout(Duration.ofMillis(600000L))
526538
.setTotalTimeout(Duration.ofMillis(600000L))
527539
.build();
528-
definitions.put("default", settings);
540+
definitions.put("no_retry_1_params", settings);
529541
RETRY_PARAM_DEFINITIONS = definitions.build();
530542
}
531543

@@ -609,89 +621,89 @@ private static Builder initDefaults(Builder builder) {
609621

610622
builder
611623
.listBuildsSettings()
612-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
613-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
624+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
625+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
614626

615627
builder
616628
.deleteBuildTriggerSettings()
617-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
618-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
629+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
630+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
619631

620632
builder
621633
.createBuildSettings()
622-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
623-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
634+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
635+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
624636

625637
builder
626638
.getBuildSettings()
627-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
628-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
639+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
640+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
629641

630642
builder
631643
.cancelBuildSettings()
632-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
633-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
644+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
645+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
634646

635647
builder
636648
.retryBuildSettings()
637-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
638-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
649+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
650+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
639651

640652
builder
641653
.createBuildTriggerSettings()
642-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
643-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
654+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
655+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
644656

645657
builder
646658
.getBuildTriggerSettings()
647-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
648-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
659+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
660+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
649661

650662
builder
651663
.listBuildTriggersSettings()
652-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
653-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
664+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
665+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
654666

655667
builder
656668
.updateBuildTriggerSettings()
657-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
658-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
669+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
670+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
659671

660672
builder
661673
.runBuildTriggerSettings()
662-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
663-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
674+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
675+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
664676

665677
builder
666678
.createWorkerPoolSettings()
667-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
668-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
679+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
680+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
669681

670682
builder
671683
.getWorkerPoolSettings()
672-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
673-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
684+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
685+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
674686

675687
builder
676688
.deleteWorkerPoolSettings()
677-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
678-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
689+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
690+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
679691

680692
builder
681693
.updateWorkerPoolSettings()
682-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
683-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
694+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
695+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
684696

685697
builder
686698
.listWorkerPoolsSettings()
687-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
688-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
699+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
700+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
689701
builder
690702
.createBuildOperationSettings()
691703
.setInitialCallSettings(
692704
UnaryCallSettings.<CreateBuildRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
693-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
694-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
705+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
706+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"))
695707
.build())
696708
.setResponseTransformer(
697709
ProtoOperationTransformers.ResponseTransformer.create(Build.class))
@@ -712,8 +724,8 @@ private static Builder initDefaults(Builder builder) {
712724
.retryBuildOperationSettings()
713725
.setInitialCallSettings(
714726
UnaryCallSettings.<RetryBuildRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
715-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
716-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
727+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
728+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"))
717729
.build())
718730
.setResponseTransformer(
719731
ProtoOperationTransformers.ResponseTransformer.create(Build.class))
@@ -735,8 +747,8 @@ private static Builder initDefaults(Builder builder) {
735747
.setInitialCallSettings(
736748
UnaryCallSettings
737749
.<RunBuildTriggerRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
738-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
739-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
750+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
751+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"))
740752
.build())
741753
.setResponseTransformer(
742754
ProtoOperationTransformers.ResponseTransformer.create(Build.class))

‎synth.metadata

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
"git": {
1212
"name": ".",
1313
"remote": "https://github.com/googleapis/java-cloudbuild.git",
14-
"sha": "e2de957ee257e82357c1f8a8b7aa707205e4e04d"
14+
"sha": "24acec6240ae9cb839bc2961c6f2b18e5d2d2b4a"
1515
}
1616
},
1717
{
1818
"git": {
1919
"name": "googleapis",
2020
"remote": "https://github.com/googleapis/googleapis.git",
21-
"sha": "6d05c93a2c37c67d8dc0b72b636c4b162d0dd7cd",
22-
"internalRef": "317660600"
21+
"sha": "bad4b831900d70e69b5e4d43bd7565d0aaded997",
22+
"internalRef": "321584556"
2323
}
2424
},
2525
{

0 commit comments

Comments
 (0)