fix: use bazelisk info to obtain googleapis bazel-bin when generating… (

#2635) * fix: use bazelisk info to obtain googleapis bazel-bin when generating autoconfigs * chore: update starter modules in spring-cloud-previews --------- Co-authored-by: Cloud Java Bot <[email protected]>
GoogleCloudPlatform · Feb 23, 2024 · 3e39459 · 3e39459
1 parent fa5ab16
commit 3e39459
Show file tree

Hide file tree

Showing 8 changed files with 542 additions and 89 deletions.
diff --git a/spring-cloud-generator/scripts/generate-steps.sh b/spring-cloud-generator/scripts/generate-steps.sh
@@ -201,7 +201,10 @@ function postprocess_library() {
   rule_prefix=$(cat googleapis/$googleapis_folder/BUILD.bazel | grep _java_gapic_spring | perl -lane 'print m/"(.*)_java_gapic_spring/')
 
   # copy generated code and unzip
-  cp googleapis/bazel-bin/$googleapis_folder/"$rule_prefix"_java_gapic_spring-spring.srcjar ../spring-cloud-previews
+  pushd googleapis
+  bazel_bin_location=$(bazelisk info bazel-bin)
+  popd
+  cp ${bazel_bin_location}/${googleapis_folder}/"${rule_prefix}"_java_gapic_spring-spring.srcjar ../spring-cloud-previews
   cd ../spring-cloud-previews
   unzip -o "$rule_prefix"_java_gapic_spring-spring.srcjar -d "$starter_artifactid"/
   rm -rf "$rule_prefix"_java_gapic_spring-spring.srcjar
@@ -256,4 +259,4 @@ function run_formatter(){
   from_directory=$1
   cd $from_directory
   mvn com.coveo:fmt-maven-plugin:format -Dfmt.skip=false
-}
+}
diff --git a/spring-cloud-previews/README.md b/spring-cloud-previews/README.md
diff --git a/...gle/cloud/bigquery/datatransfer/v1/spring/DataTransferServiceSpringAutoConfiguration.java b/...gle/cloud/bigquery/datatransfer/v1/spring/DataTransferServiceSpringAutoConfiguration.java
@@ -266,6 +266,13 @@ public DataTransferServiceSettings dataTransferServiceSettings(
           .enrollDataSourcesSettings()
           .setRetrySettings(enrollDataSourcesRetrySettings);
 
+      RetrySettings unenrollDataSourcesRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.unenrollDataSourcesSettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder
+          .unenrollDataSourcesSettings()
+          .setRetrySettings(unenrollDataSourcesRetrySettings);
+
       RetrySettings listLocationsRetrySettings =
           RetryUtil.updateRetrySettings(
               clientSettingsBuilder.listLocationsSettings().getRetrySettings(), serviceRetry);
@@ -481,6 +488,20 @@ public DataTransferServiceSettings dataTransferServiceSettings(
             "Configured method-level retry settings for enrollDataSources from properties.");
       }
     }
+    Retry unenrollDataSourcesRetry = clientProperties.getUnenrollDataSourcesRetry();
+    if (unenrollDataSourcesRetry != null) {
+      RetrySettings unenrollDataSourcesRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.unenrollDataSourcesSettings().getRetrySettings(),
+              unenrollDataSourcesRetry);
+      clientSettingsBuilder
+          .unenrollDataSourcesSettings()
+          .setRetrySettings(unenrollDataSourcesRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for unenrollDataSources from properties.");
+      }
+    }
     Retry listLocationsRetry = clientProperties.getListLocationsRetry();
     if (listLocationsRetry != null) {
       RetrySettings listLocationsRetrySettings =

diff --git a/...com/google/cloud/bigquery/datatransfer/v1/spring/DataTransferServiceSpringProperties.java b/...com/google/cloud/bigquery/datatransfer/v1/spring/DataTransferServiceSpringProperties.java
@@ -117,6 +117,11 @@ public class DataTransferServiceSpringProperties implements CredentialsSupplier
    * precedence over service-level retry configurations for that RPC method.
    */
   @NestedConfigurationProperty private Retry enrollDataSourcesRetry;
+  /**
+   * Allow override of retry settings at method-level for unenrollDataSources. If defined, this
+   * takes precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry unenrollDataSourcesRetry;
   /**
    * Allow override of retry settings at method-level for listLocations. If defined, this takes
    * precedence over service-level retry configurations for that RPC method.
@@ -285,6 +290,14 @@ public void setEnrollDataSourcesRetry(Retry enrollDataSourcesRetry) {
     this.enrollDataSourcesRetry = enrollDataSourcesRetry;
   }
 
+  public Retry getUnenrollDataSourcesRetry() {
+    return this.unenrollDataSourcesRetry;
+  }
+
+  public void setUnenrollDataSourcesRetry(Retry unenrollDataSourcesRetry) {
+    this.unenrollDataSourcesRetry = unenrollDataSourcesRetry;
+  }
+
   public Retry getListLocationsRetry() {
     return this.listLocationsRetry;
   }

diff --git a/...le/cloud/orchestration/airflow/service/v1/spring/EnvironmentsSpringAutoConfiguration.java b/...le/cloud/orchestration/airflow/service/v1/spring/EnvironmentsSpringAutoConfiguration.java
@@ -193,6 +193,91 @@ public EnvironmentsSettings environmentsSettings(
           .pollAirflowCommandSettings()
           .setRetrySettings(pollAirflowCommandRetrySettings);
 
+      RetrySettings listWorkloadsRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.listWorkloadsSettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder.listWorkloadsSettings().setRetrySettings(listWorkloadsRetrySettings);
+
+      RetrySettings createUserWorkloadsSecretRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.createUserWorkloadsSecretSettings().getRetrySettings(),
+              serviceRetry);
+      clientSettingsBuilder
+          .createUserWorkloadsSecretSettings()
+          .setRetrySettings(createUserWorkloadsSecretRetrySettings);
+
+      RetrySettings getUserWorkloadsSecretRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.getUserWorkloadsSecretSettings().getRetrySettings(),
+              serviceRetry);
+      clientSettingsBuilder
+          .getUserWorkloadsSecretSettings()
+          .setRetrySettings(getUserWorkloadsSecretRetrySettings);
+
+      RetrySettings listUserWorkloadsSecretsRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.listUserWorkloadsSecretsSettings().getRetrySettings(),
+              serviceRetry);
+      clientSettingsBuilder
+          .listUserWorkloadsSecretsSettings()
+          .setRetrySettings(listUserWorkloadsSecretsRetrySettings);
+
+      RetrySettings updateUserWorkloadsSecretRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.updateUserWorkloadsSecretSettings().getRetrySettings(),
+              serviceRetry);
+      clientSettingsBuilder
+          .updateUserWorkloadsSecretSettings()
+          .setRetrySettings(updateUserWorkloadsSecretRetrySettings);
+
+      RetrySettings deleteUserWorkloadsSecretRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.deleteUserWorkloadsSecretSettings().getRetrySettings(),
+              serviceRetry);
+      clientSettingsBuilder
+          .deleteUserWorkloadsSecretSettings()
+          .setRetrySettings(deleteUserWorkloadsSecretRetrySettings);
+
+      RetrySettings createUserWorkloadsConfigMapRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.createUserWorkloadsConfigMapSettings().getRetrySettings(),
+              serviceRetry);
+      clientSettingsBuilder
+          .createUserWorkloadsConfigMapSettings()
+          .setRetrySettings(createUserWorkloadsConfigMapRetrySettings);
+
+      RetrySettings getUserWorkloadsConfigMapRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.getUserWorkloadsConfigMapSettings().getRetrySettings(),
+              serviceRetry);
+      clientSettingsBuilder
+          .getUserWorkloadsConfigMapSettings()
+          .setRetrySettings(getUserWorkloadsConfigMapRetrySettings);
+
+      RetrySettings listUserWorkloadsConfigMapsRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.listUserWorkloadsConfigMapsSettings().getRetrySettings(),
+              serviceRetry);
+      clientSettingsBuilder
+          .listUserWorkloadsConfigMapsSettings()
+          .setRetrySettings(listUserWorkloadsConfigMapsRetrySettings);
+
+      RetrySettings updateUserWorkloadsConfigMapRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.updateUserWorkloadsConfigMapSettings().getRetrySettings(),
+              serviceRetry);
+      clientSettingsBuilder
+          .updateUserWorkloadsConfigMapSettings()
+          .setRetrySettings(updateUserWorkloadsConfigMapRetrySettings);
+
+      RetrySettings deleteUserWorkloadsConfigMapRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.deleteUserWorkloadsConfigMapSettings().getRetrySettings(),
+              serviceRetry);
+      clientSettingsBuilder
+          .deleteUserWorkloadsConfigMapSettings()
+          .setRetrySettings(deleteUserWorkloadsConfigMapRetrySettings);
+
       RetrySettings fetchDatabasePropertiesRetrySettings =
           RetryUtil.updateRetrySettings(
               clientSettingsBuilder.fetchDatabasePropertiesSettings().getRetrySettings(),
@@ -272,6 +357,159 @@ public EnvironmentsSettings environmentsSettings(
             "Configured method-level retry settings for pollAirflowCommand from properties.");
       }
     }
+    Retry listWorkloadsRetry = clientProperties.getListWorkloadsRetry();
+    if (listWorkloadsRetry != null) {
+      RetrySettings listWorkloadsRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.listWorkloadsSettings().getRetrySettings(), listWorkloadsRetry);
+      clientSettingsBuilder.listWorkloadsSettings().setRetrySettings(listWorkloadsRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("Configured method-level retry settings for listWorkloads from properties.");
+      }
+    }
+    Retry createUserWorkloadsSecretRetry = clientProperties.getCreateUserWorkloadsSecretRetry();
+    if (createUserWorkloadsSecretRetry != null) {
+      RetrySettings createUserWorkloadsSecretRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.createUserWorkloadsSecretSettings().getRetrySettings(),
+              createUserWorkloadsSecretRetry);
+      clientSettingsBuilder
+          .createUserWorkloadsSecretSettings()
+          .setRetrySettings(createUserWorkloadsSecretRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for createUserWorkloadsSecret from properties.");
+      }
+    }
+    Retry getUserWorkloadsSecretRetry = clientProperties.getGetUserWorkloadsSecretRetry();
+    if (getUserWorkloadsSecretRetry != null) {
+      RetrySettings getUserWorkloadsSecretRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.getUserWorkloadsSecretSettings().getRetrySettings(),
+              getUserWorkloadsSecretRetry);
+      clientSettingsBuilder
+          .getUserWorkloadsSecretSettings()
+          .setRetrySettings(getUserWorkloadsSecretRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for getUserWorkloadsSecret from properties.");
+      }
+    }
+    Retry listUserWorkloadsSecretsRetry = clientProperties.getListUserWorkloadsSecretsRetry();
+    if (listUserWorkloadsSecretsRetry != null) {
+      RetrySettings listUserWorkloadsSecretsRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.listUserWorkloadsSecretsSettings().getRetrySettings(),
+              listUserWorkloadsSecretsRetry);
+      clientSettingsBuilder
+          .listUserWorkloadsSecretsSettings()
+          .setRetrySettings(listUserWorkloadsSecretsRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for listUserWorkloadsSecrets from properties.");
+      }
+    }
+    Retry updateUserWorkloadsSecretRetry = clientProperties.getUpdateUserWorkloadsSecretRetry();
+    if (updateUserWorkloadsSecretRetry != null) {
+      RetrySettings updateUserWorkloadsSecretRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.updateUserWorkloadsSecretSettings().getRetrySettings(),
+              updateUserWorkloadsSecretRetry);
+      clientSettingsBuilder
+          .updateUserWorkloadsSecretSettings()
+          .setRetrySettings(updateUserWorkloadsSecretRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for updateUserWorkloadsSecret from properties.");
+      }
+    }
+    Retry deleteUserWorkloadsSecretRetry = clientProperties.getDeleteUserWorkloadsSecretRetry();
+    if (deleteUserWorkloadsSecretRetry != null) {
+      RetrySettings deleteUserWorkloadsSecretRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.deleteUserWorkloadsSecretSettings().getRetrySettings(),
+              deleteUserWorkloadsSecretRetry);
+      clientSettingsBuilder
+          .deleteUserWorkloadsSecretSettings()
+          .setRetrySettings(deleteUserWorkloadsSecretRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for deleteUserWorkloadsSecret from properties.");
+      }
+    }
+    Retry createUserWorkloadsConfigMapRetry =
+        clientProperties.getCreateUserWorkloadsConfigMapRetry();
+    if (createUserWorkloadsConfigMapRetry != null) {
+      RetrySettings createUserWorkloadsConfigMapRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.createUserWorkloadsConfigMapSettings().getRetrySettings(),
+              createUserWorkloadsConfigMapRetry);
+      clientSettingsBuilder
+          .createUserWorkloadsConfigMapSettings()
+          .setRetrySettings(createUserWorkloadsConfigMapRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for createUserWorkloadsConfigMap from properties.");
+      }
+    }
+    Retry getUserWorkloadsConfigMapRetry = clientProperties.getGetUserWorkloadsConfigMapRetry();
+    if (getUserWorkloadsConfigMapRetry != null) {
+      RetrySettings getUserWorkloadsConfigMapRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.getUserWorkloadsConfigMapSettings().getRetrySettings(),
+              getUserWorkloadsConfigMapRetry);
+      clientSettingsBuilder
+          .getUserWorkloadsConfigMapSettings()
+          .setRetrySettings(getUserWorkloadsConfigMapRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for getUserWorkloadsConfigMap from properties.");
+      }
+    }
+    Retry listUserWorkloadsConfigMapsRetry = clientProperties.getListUserWorkloadsConfigMapsRetry();
+    if (listUserWorkloadsConfigMapsRetry != null) {
+      RetrySettings listUserWorkloadsConfigMapsRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.listUserWorkloadsConfigMapsSettings().getRetrySettings(),
+              listUserWorkloadsConfigMapsRetry);
+      clientSettingsBuilder
+          .listUserWorkloadsConfigMapsSettings()
+          .setRetrySettings(listUserWorkloadsConfigMapsRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for listUserWorkloadsConfigMaps from properties.");
+      }
+    }
+    Retry updateUserWorkloadsConfigMapRetry =
+        clientProperties.getUpdateUserWorkloadsConfigMapRetry();
+    if (updateUserWorkloadsConfigMapRetry != null) {
+      RetrySettings updateUserWorkloadsConfigMapRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.updateUserWorkloadsConfigMapSettings().getRetrySettings(),
+              updateUserWorkloadsConfigMapRetry);
+      clientSettingsBuilder
+          .updateUserWorkloadsConfigMapSettings()
+          .setRetrySettings(updateUserWorkloadsConfigMapRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for updateUserWorkloadsConfigMap from properties.");
+      }
+    }
+    Retry deleteUserWorkloadsConfigMapRetry =
+        clientProperties.getDeleteUserWorkloadsConfigMapRetry();
+    if (deleteUserWorkloadsConfigMapRetry != null) {
+      RetrySettings deleteUserWorkloadsConfigMapRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.deleteUserWorkloadsConfigMapSettings().getRetrySettings(),
+              deleteUserWorkloadsConfigMapRetry);
+      clientSettingsBuilder
+          .deleteUserWorkloadsConfigMapSettings()
+          .setRetrySettings(deleteUserWorkloadsConfigMapRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for deleteUserWorkloadsConfigMap from properties.");
+      }
+    }
     Retry fetchDatabasePropertiesRetry = clientProperties.getFetchDatabasePropertiesRetry();
     if (fetchDatabasePropertiesRetry != null) {
       RetrySettings fetchDatabasePropertiesRetrySettings =