deps: bump com.google.cloud:libraries-bom from 26.22.0 to 26.23.0 (#2183

) * deps: bump com.google.cloud:libraries-bom from 26.22.0 to 26.23.0 Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.22.0 to 26.23.0. - [Release notes](https://github.com/googleapis/java-cloud-bom/releases) - [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json) - [Commits](googleapis/java-cloud-bom@v26.22.0...v26.23.0) --- updated-dependencies: - dependency-name: com.google.cloud:libraries-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * fix: googleapis path inference from .OwlBot.yaml * chore: update starter modules in spring-cloud-previews * empty commit for builds * wip: move language IT to v2 * adjust language test --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Cloud Java Bot <cloud-java-bot@google.com> Co-authored-by: Mridula Peddada <mpeddada@google.com>
GoogleCloudPlatform · Sep 20, 2023 · 70edcc8 · 70edcc8
1 parent dce3f11
commit 70edcc8
Show file tree

Hide file tree

Showing 40 changed files with 1,143 additions and 1,030 deletions.
diff --git a/spring-cloud-gcp-dependencies/pom.xml b/spring-cloud-gcp-dependencies/pom.xml
@@ -34,7 +34,7 @@
 	</distributionManagement>
 
 	<properties>
-		<gcp-libraries-bom.version>26.22.0</gcp-libraries-bom.version>
+		<gcp-libraries-bom.version>26.23.0</gcp-libraries-bom.version>
 		<cloud-sql-socket-factory.version>1.14.0</cloud-sql-socket-factory.version>
 		<r2dbc-postgres-driver.version>1.0.2.RELEASE</r2dbc-postgres-driver.version>
 		<cloud-spanner-r2dbc.version>1.2.2</cloud-spanner-r2dbc.version>

diff --git a/spring-cloud-generator/scripts/generate-library-list.sh b/spring-cloud-generator/scripts/generate-library-list.sh
@@ -66,7 +66,8 @@ for d in ./google-cloud-java/*java-*/; do
   monorepo_name=$(echo $d | sed 's#^./google-cloud-java/##' | sed 's#/$##')
 
   # get folder location source of truth from ".OwlBot.yaml"
-  googleapis_path=$(grep 'java/gapic-google' $d/.OwlBot.yaml | sed 's#^.*"/##' | sed 's#/[^/]*/.\*-java.*$##')
+  # will only consider the first occurence
+  googleapis_path=$(grep -e 'java/gapic-google' $d/.OwlBot.yaml | head -n 1| sed 's#^.*"/##' | sed 's#/[^/]*/.\*-java.*$##')
   repo_folder=$(grep 'java/gapic-google' $d/.OwlBot.yaml -A1| tail -n1 |  sed "s#^.*$monorepo_name/[^/]*/##"| sed 's#"$##')
 
   # figure out path to look out changes for: v[1-9]

diff --git a/spring-cloud-previews/README.md b/spring-cloud-previews/README.md
diff --git a/...java/com/google/cloud/aiplatform/v1/spring/TensorboardServiceSpringAutoConfiguration.java b/...java/com/google/cloud/aiplatform/v1/spring/TensorboardServiceSpringAutoConfiguration.java
@@ -170,6 +170,13 @@ public TensorboardServiceSettings tensorboardServiceSettings(
           .readTensorboardUsageSettings()
           .setRetrySettings(readTensorboardUsageRetrySettings);
 
+      RetrySettings readTensorboardSizeRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.readTensorboardSizeSettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder
+          .readTensorboardSizeSettings()
+          .setRetrySettings(readTensorboardSizeRetrySettings);
+
       RetrySettings createTensorboardExperimentRetrySettings =
           RetryUtil.updateRetrySettings(
               clientSettingsBuilder.createTensorboardExperimentSettings().getRetrySettings(),
@@ -390,6 +397,20 @@ public TensorboardServiceSettings tensorboardServiceSettings(
             "Configured method-level retry settings for readTensorboardUsage from properties.");
       }
     }
+    Retry readTensorboardSizeRetry = clientProperties.getReadTensorboardSizeRetry();
+    if (readTensorboardSizeRetry != null) {
+      RetrySettings readTensorboardSizeRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.readTensorboardSizeSettings().getRetrySettings(),
+              readTensorboardSizeRetry);
+      clientSettingsBuilder
+          .readTensorboardSizeSettings()
+          .setRetrySettings(readTensorboardSizeRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for readTensorboardSize from properties.");
+      }
+    }
     Retry createTensorboardExperimentRetry = clientProperties.getCreateTensorboardExperimentRetry();
     if (createTensorboardExperimentRetry != null) {
       RetrySettings createTensorboardExperimentRetrySettings =

diff --git a/...c/main/java/com/google/cloud/aiplatform/v1/spring/TensorboardServiceSpringProperties.java b/...c/main/java/com/google/cloud/aiplatform/v1/spring/TensorboardServiceSpringProperties.java
@@ -57,6 +57,11 @@ public class TensorboardServiceSpringProperties implements CredentialsSupplier {
    * takes precedence over service-level retry configurations for that RPC method.
    */
   @NestedConfigurationProperty private Retry readTensorboardUsageRetry;
+  /**
+   * Allow override of retry settings at method-level for readTensorboardSize. If defined, this
+   * takes precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry readTensorboardSizeRetry;
   /**
    * Allow override of retry settings at method-level for createTensorboardExperiment. If defined,
    * this takes precedence over service-level retry configurations for that RPC method.
@@ -231,6 +236,14 @@ public void setReadTensorboardUsageRetry(Retry readTensorboardUsageRetry) {
     this.readTensorboardUsageRetry = readTensorboardUsageRetry;
   }
 
+  public Retry getReadTensorboardSizeRetry() {
+    return this.readTensorboardSizeRetry;
+  }
+
+  public void setReadTensorboardSizeRetry(Retry readTensorboardSizeRetry) {
+    this.readTensorboardSizeRetry = readTensorboardSizeRetry;
+  }
+
   public Retry getCreateTensorboardExperimentRetry() {
     return this.createTensorboardExperimentRetry;
   }

diff --git a/...n/java/com/google/cloud/channel/v1/spring/CloudChannelServiceSpringAutoConfiguration.java b/...n/java/com/google/cloud/channel/v1/spring/CloudChannelServiceSpringAutoConfiguration.java
@@ -392,6 +392,14 @@ public CloudChannelServiceSettings cloudChannelServiceSettings(
           .listPurchasableOffersSettings()
           .setRetrySettings(listPurchasableOffersRetrySettings);
 
+      RetrySettings queryEligibleBillingAccountsRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.queryEligibleBillingAccountsSettings().getRetrySettings(),
+              serviceRetry);
+      clientSettingsBuilder
+          .queryEligibleBillingAccountsSettings()
+          .setRetrySettings(queryEligibleBillingAccountsRetrySettings);
+
       RetrySettings registerSubscriberRetrySettings =
           RetryUtil.updateRetrySettings(
               clientSettingsBuilder.registerSubscriberSettings().getRetrySettings(), serviceRetry);
@@ -861,6 +869,21 @@ public CloudChannelServiceSettings cloudChannelServiceSettings(
             "Configured method-level retry settings for listPurchasableOffers from properties.");
       }
     }
+    Retry queryEligibleBillingAccountsRetry =
+        clientProperties.getQueryEligibleBillingAccountsRetry();
+    if (queryEligibleBillingAccountsRetry != null) {
+      RetrySettings queryEligibleBillingAccountsRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.queryEligibleBillingAccountsSettings().getRetrySettings(),
+              queryEligibleBillingAccountsRetry);
+      clientSettingsBuilder
+          .queryEligibleBillingAccountsSettings()
+          .setRetrySettings(queryEligibleBillingAccountsRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for queryEligibleBillingAccounts from properties.");
+      }
+    }
     Retry registerSubscriberRetry = clientProperties.getRegisterSubscriberRetry();
     if (registerSubscriberRetry != null) {
       RetrySettings registerSubscriberRetrySettings =

diff --git a/...src/main/java/com/google/cloud/channel/v1/spring/CloudChannelServiceSpringProperties.java b/...src/main/java/com/google/cloud/channel/v1/spring/CloudChannelServiceSpringProperties.java
@@ -207,6 +207,11 @@ public class CloudChannelServiceSpringProperties implements CredentialsSupplier
    * takes precedence over service-level retry configurations for that RPC method.
    */
   @NestedConfigurationProperty private Retry listPurchasableOffersRetry;
+  /**
+   * Allow override of retry settings at method-level for queryEligibleBillingAccounts. If defined,
+   * this takes precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry queryEligibleBillingAccountsRetry;
   /**
    * Allow override of retry settings at method-level for registerSubscriber. If defined, this takes
    * precedence over service-level retry configurations for that RPC method.
@@ -534,6 +539,14 @@ public void setListPurchasableOffersRetry(Retry listPurchasableOffersRetry) {
     this.listPurchasableOffersRetry = listPurchasableOffersRetry;
   }
 
+  public Retry getQueryEligibleBillingAccountsRetry() {
+    return this.queryEligibleBillingAccountsRetry;
+  }
+
+  public void setQueryEligibleBillingAccountsRetry(Retry queryEligibleBillingAccountsRetry) {
+    this.queryEligibleBillingAccountsRetry = queryEligibleBillingAccountsRetry;
+  }
+
   public Retry getRegisterSubscriberRetry() {
     return this.registerSubscriberRetry;
   }

diff --git a/.../com/google/cloud/dataproc/v1/spring/AutoscalingPolicyServiceSpringAutoConfiguration.java b/.../com/google/cloud/dataproc/v1/spring/AutoscalingPolicyServiceSpringAutoConfiguration.java
@@ -201,6 +201,23 @@ public AutoscalingPolicyServiceSettings autoscalingPolicyServiceSettings(
           .deleteAutoscalingPolicySettings()
           .setRetrySettings(deleteAutoscalingPolicyRetrySettings);
 
+      RetrySettings setIamPolicyRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.setIamPolicySettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder.setIamPolicySettings().setRetrySettings(setIamPolicyRetrySettings);
+
+      RetrySettings getIamPolicyRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.getIamPolicySettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder.getIamPolicySettings().setRetrySettings(getIamPolicyRetrySettings);
+
+      RetrySettings testIamPermissionsRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.testIamPermissionsSettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder
+          .testIamPermissionsSettings()
+          .setRetrySettings(testIamPermissionsRetrySettings);
+
       if (LOGGER.isTraceEnabled()) {
         LOGGER.trace("Configured service-level retry settings from properties.");
       }
@@ -275,6 +292,40 @@ public AutoscalingPolicyServiceSettings autoscalingPolicyServiceSettings(
             "Configured method-level retry settings for deleteAutoscalingPolicy from properties.");
       }
     }
+    Retry setIamPolicyRetry = clientProperties.getSetIamPolicyRetry();
+    if (setIamPolicyRetry != null) {
+      RetrySettings setIamPolicyRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.setIamPolicySettings().getRetrySettings(), setIamPolicyRetry);
+      clientSettingsBuilder.setIamPolicySettings().setRetrySettings(setIamPolicyRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("Configured method-level retry settings for setIamPolicy from properties.");
+      }
+    }
+    Retry getIamPolicyRetry = clientProperties.getGetIamPolicyRetry();
+    if (getIamPolicyRetry != null) {
+      RetrySettings getIamPolicyRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.getIamPolicySettings().getRetrySettings(), getIamPolicyRetry);
+      clientSettingsBuilder.getIamPolicySettings().setRetrySettings(getIamPolicyRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("Configured method-level retry settings for getIamPolicy from properties.");
+      }
+    }
+    Retry testIamPermissionsRetry = clientProperties.getTestIamPermissionsRetry();
+    if (testIamPermissionsRetry != null) {
+      RetrySettings testIamPermissionsRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.testIamPermissionsSettings().getRetrySettings(),
+              testIamPermissionsRetry);
+      clientSettingsBuilder
+          .testIamPermissionsSettings()
+          .setRetrySettings(testIamPermissionsRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for testIamPermissions from properties.");
+      }
+    }
     return clientSettingsBuilder.build();
   }
 

diff --git a/...in/java/com/google/cloud/dataproc/v1/spring/AutoscalingPolicyServiceSpringProperties.java b/...in/java/com/google/cloud/dataproc/v1/spring/AutoscalingPolicyServiceSpringProperties.java
@@ -67,6 +67,21 @@ public class AutoscalingPolicyServiceSpringProperties implements CredentialsSupp
    * takes precedence over service-level retry configurations for that RPC method.
    */
   @NestedConfigurationProperty private Retry deleteAutoscalingPolicyRetry;
+  /**
+   * Allow override of retry settings at method-level for setIamPolicy. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry setIamPolicyRetry;
+  /**
+   * Allow override of retry settings at method-level for getIamPolicy. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry getIamPolicyRetry;
+  /**
+   * Allow override of retry settings at method-level for testIamPermissions. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry testIamPermissionsRetry;
 
   @Override
   public Credentials getCredentials() {
@@ -144,4 +159,28 @@ public Retry getDeleteAutoscalingPolicyRetry() {
   public void setDeleteAutoscalingPolicyRetry(Retry deleteAutoscalingPolicyRetry) {
     this.deleteAutoscalingPolicyRetry = deleteAutoscalingPolicyRetry;
   }
+
+  public Retry getSetIamPolicyRetry() {
+    return this.setIamPolicyRetry;
+  }
+
+  public void setSetIamPolicyRetry(Retry setIamPolicyRetry) {
+    this.setIamPolicyRetry = setIamPolicyRetry;
+  }
+
+  public Retry getGetIamPolicyRetry() {
+    return this.getIamPolicyRetry;
+  }
+
+  public void setGetIamPolicyRetry(Retry getIamPolicyRetry) {
+    this.getIamPolicyRetry = getIamPolicyRetry;
+  }
+
+  public Retry getTestIamPermissionsRetry() {
+    return this.testIamPermissionsRetry;
+  }
+
+  public void setTestIamPermissionsRetry(Retry testIamPermissionsRetry) {
+    this.testIamPermissionsRetry = testIamPermissionsRetry;
+  }
 }
diff --git a/...main/java/com/google/cloud/dataproc/v1/spring/BatchControllerSpringAutoConfiguration.java b/...main/java/com/google/cloud/dataproc/v1/spring/BatchControllerSpringAutoConfiguration.java
@@ -174,6 +174,23 @@ public BatchControllerSettings batchControllerSettings(
               clientSettingsBuilder.deleteBatchSettings().getRetrySettings(), serviceRetry);
       clientSettingsBuilder.deleteBatchSettings().setRetrySettings(deleteBatchRetrySettings);
 
+      RetrySettings setIamPolicyRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.setIamPolicySettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder.setIamPolicySettings().setRetrySettings(setIamPolicyRetrySettings);
+
+      RetrySettings getIamPolicyRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.getIamPolicySettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder.getIamPolicySettings().setRetrySettings(getIamPolicyRetrySettings);
+
+      RetrySettings testIamPermissionsRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.testIamPermissionsSettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder
+          .testIamPermissionsSettings()
+          .setRetrySettings(testIamPermissionsRetrySettings);
+
       if (LOGGER.isTraceEnabled()) {
         LOGGER.trace("Configured service-level retry settings from properties.");
       }
@@ -208,6 +225,40 @@ public BatchControllerSettings batchControllerSettings(
         LOGGER.trace("Configured method-level retry settings for deleteBatch from properties.");
       }
     }
+    Retry setIamPolicyRetry = clientProperties.getSetIamPolicyRetry();
+    if (setIamPolicyRetry != null) {
+      RetrySettings setIamPolicyRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.setIamPolicySettings().getRetrySettings(), setIamPolicyRetry);
+      clientSettingsBuilder.setIamPolicySettings().setRetrySettings(setIamPolicyRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("Configured method-level retry settings for setIamPolicy from properties.");
+      }
+    }
+    Retry getIamPolicyRetry = clientProperties.getGetIamPolicyRetry();
+    if (getIamPolicyRetry != null) {
+      RetrySettings getIamPolicyRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.getIamPolicySettings().getRetrySettings(), getIamPolicyRetry);
+      clientSettingsBuilder.getIamPolicySettings().setRetrySettings(getIamPolicyRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("Configured method-level retry settings for getIamPolicy from properties.");
+      }
+    }
+    Retry testIamPermissionsRetry = clientProperties.getTestIamPermissionsRetry();
+    if (testIamPermissionsRetry != null) {
+      RetrySettings testIamPermissionsRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.testIamPermissionsSettings().getRetrySettings(),
+              testIamPermissionsRetry);
+      clientSettingsBuilder
+          .testIamPermissionsSettings()
+          .setRetrySettings(testIamPermissionsRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for testIamPermissions from properties.");
+      }
+    }
     return clientSettingsBuilder.build();
   }
 

diff --git a/...er/src/main/java/com/google/cloud/dataproc/v1/spring/BatchControllerSpringProperties.java b/...er/src/main/java/com/google/cloud/dataproc/v1/spring/BatchControllerSpringProperties.java
@@ -57,6 +57,21 @@ public class BatchControllerSpringProperties implements CredentialsSupplier {
    * precedence over service-level retry configurations for that RPC method.
    */
   @NestedConfigurationProperty private Retry deleteBatchRetry;
+  /**
+   * Allow override of retry settings at method-level for setIamPolicy. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry setIamPolicyRetry;
+  /**
+   * Allow override of retry settings at method-level for getIamPolicy. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry getIamPolicyRetry;
+  /**
+   * Allow override of retry settings at method-level for testIamPermissions. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry testIamPermissionsRetry;
 
   @Override
   public Credentials getCredentials() {
@@ -118,4 +133,28 @@ public Retry getDeleteBatchRetry() {
   public void setDeleteBatchRetry(Retry deleteBatchRetry) {
     this.deleteBatchRetry = deleteBatchRetry;
   }
+
+  public Retry getSetIamPolicyRetry() {
+    return this.setIamPolicyRetry;
+  }
+
+  public void setSetIamPolicyRetry(Retry setIamPolicyRetry) {
+    this.setIamPolicyRetry = setIamPolicyRetry;
+  }
+
+  public Retry getGetIamPolicyRetry() {
+    return this.getIamPolicyRetry;
+  }
+
+  public void setGetIamPolicyRetry(Retry getIamPolicyRetry) {
+    this.getIamPolicyRetry = getIamPolicyRetry;
+  }
+
+  public Retry getTestIamPermissionsRetry() {
+    return this.testIamPermissionsRetry;
+  }
+
+  public void setTestIamPermissionsRetry(Retry testIamPermissionsRetry) {
+    this.testIamPermissionsRetry = testIamPermissionsRetry;
+  }
 }