Skip to content

Commit 3e39459

Browse files
diegomarquezpcloud-java-bot
diegomarquezp
and
cloud-java-bot
authored
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]>
1 parent fa5ab16 commit 3e39459

File tree

8 files changed

+542
-89
lines changed

8 files changed

+542
-89
lines changed

‎spring-cloud-generator/scripts/generate-steps.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,10 @@ function postprocess_library() {
201201
rule_prefix=$(cat googleapis/$googleapis_folder/BUILD.bazel | grep _java_gapic_spring | perl -lane 'print m/"(.*)_java_gapic_spring/')
202202

203203
# copy generated code and unzip
204-
cp googleapis/bazel-bin/$googleapis_folder/"$rule_prefix"_java_gapic_spring-spring.srcjar ../spring-cloud-previews
204+
pushd googleapis
205+
bazel_bin_location=$(bazelisk info bazel-bin)
206+
popd
207+
cp ${bazel_bin_location}/${googleapis_folder}/"${rule_prefix}"_java_gapic_spring-spring.srcjar ../spring-cloud-previews
205208
cd ../spring-cloud-previews
206209
unzip -o "$rule_prefix"_java_gapic_spring-spring.srcjar -d "$starter_artifactid"/
207210
rm -rf "$rule_prefix"_java_gapic_spring-spring.srcjar
@@ -256,4 +259,4 @@ function run_formatter(){
256259
from_directory=$1
257260
cd $from_directory
258261
mvn com.coveo:fmt-maven-plugin:format -Dfmt.skip=false
259-
}
262+
}

‎spring-cloud-previews/README.md‎

Lines changed: 87 additions & 87 deletions
Large diffs are not rendered by default.

‎spring-cloud-previews/google-cloud-bigquerydatatransfer-spring-starter/src/main/java/com/google/cloud/bigquery/datatransfer/v1/spring/DataTransferServiceSpringAutoConfiguration.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,13 @@ public DataTransferServiceSettings dataTransferServiceSettings(
266266
.enrollDataSourcesSettings()
267267
.setRetrySettings(enrollDataSourcesRetrySettings);
268268

269+
RetrySettings unenrollDataSourcesRetrySettings =
270+
RetryUtil.updateRetrySettings(
271+
clientSettingsBuilder.unenrollDataSourcesSettings().getRetrySettings(), serviceRetry);
272+
clientSettingsBuilder
273+
.unenrollDataSourcesSettings()
274+
.setRetrySettings(unenrollDataSourcesRetrySettings);
275+
269276
RetrySettings listLocationsRetrySettings =
270277
RetryUtil.updateRetrySettings(
271278
clientSettingsBuilder.listLocationsSettings().getRetrySettings(), serviceRetry);
@@ -481,6 +488,20 @@ public DataTransferServiceSettings dataTransferServiceSettings(
481488
"Configured method-level retry settings for enrollDataSources from properties.");
482489
}
483490
}
491+
Retry unenrollDataSourcesRetry = clientProperties.getUnenrollDataSourcesRetry();
492+
if (unenrollDataSourcesRetry != null) {
493+
RetrySettings unenrollDataSourcesRetrySettings =
494+
RetryUtil.updateRetrySettings(
495+
clientSettingsBuilder.unenrollDataSourcesSettings().getRetrySettings(),
496+
unenrollDataSourcesRetry);
497+
clientSettingsBuilder
498+
.unenrollDataSourcesSettings()
499+
.setRetrySettings(unenrollDataSourcesRetrySettings);
500+
if (LOGGER.isTraceEnabled()) {
501+
LOGGER.trace(
502+
"Configured method-level retry settings for unenrollDataSources from properties.");
503+
}
504+
}
484505
Retry listLocationsRetry = clientProperties.getListLocationsRetry();
485506
if (listLocationsRetry != null) {
486507
RetrySettings listLocationsRetrySettings =

‎spring-cloud-previews/google-cloud-bigquerydatatransfer-spring-starter/src/main/java/com/google/cloud/bigquery/datatransfer/v1/spring/DataTransferServiceSpringProperties.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@ public class DataTransferServiceSpringProperties implements CredentialsSupplier
117117
* precedence over service-level retry configurations for that RPC method.
118118
*/
119119
@NestedConfigurationProperty private Retry enrollDataSourcesRetry;
120+
/**
121+
* Allow override of retry settings at method-level for unenrollDataSources. If defined, this
122+
* takes precedence over service-level retry configurations for that RPC method.
123+
*/
124+
@NestedConfigurationProperty private Retry unenrollDataSourcesRetry;
120125
/**
121126
* Allow override of retry settings at method-level for listLocations. If defined, this takes
122127
* precedence over service-level retry configurations for that RPC method.
@@ -285,6 +290,14 @@ public void setEnrollDataSourcesRetry(Retry enrollDataSourcesRetry) {
285290
this.enrollDataSourcesRetry = enrollDataSourcesRetry;
286291
}
287292

293+
public Retry getUnenrollDataSourcesRetry() {
294+
return this.unenrollDataSourcesRetry;
295+
}
296+
297+
public void setUnenrollDataSourcesRetry(Retry unenrollDataSourcesRetry) {
298+
this.unenrollDataSourcesRetry = unenrollDataSourcesRetry;
299+
}
300+
288301
public Retry getListLocationsRetry() {
289302
return this.listLocationsRetry;
290303
}

‎spring-cloud-previews/google-cloud-orchestration-airflow-spring-starter/src/main/java/com/google/cloud/orchestration/airflow/service/v1/spring/EnvironmentsSpringAutoConfiguration.java‎

Lines changed: 238 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,91 @@ public EnvironmentsSettings environmentsSettings(
193193
.pollAirflowCommandSettings()
194194
.setRetrySettings(pollAirflowCommandRetrySettings);
195195

196+
RetrySettings listWorkloadsRetrySettings =
197+
RetryUtil.updateRetrySettings(
198+
clientSettingsBuilder.listWorkloadsSettings().getRetrySettings(), serviceRetry);
199+
clientSettingsBuilder.listWorkloadsSettings().setRetrySettings(listWorkloadsRetrySettings);
200+
201+
RetrySettings createUserWorkloadsSecretRetrySettings =
202+
RetryUtil.updateRetrySettings(
203+
clientSettingsBuilder.createUserWorkloadsSecretSettings().getRetrySettings(),
204+
serviceRetry);
205+
clientSettingsBuilder
206+
.createUserWorkloadsSecretSettings()
207+
.setRetrySettings(createUserWorkloadsSecretRetrySettings);
208+
209+
RetrySettings getUserWorkloadsSecretRetrySettings =
210+
RetryUtil.updateRetrySettings(
211+
clientSettingsBuilder.getUserWorkloadsSecretSettings().getRetrySettings(),
212+
serviceRetry);
213+
clientSettingsBuilder
214+
.getUserWorkloadsSecretSettings()
215+
.setRetrySettings(getUserWorkloadsSecretRetrySettings);
216+
217+
RetrySettings listUserWorkloadsSecretsRetrySettings =
218+
RetryUtil.updateRetrySettings(
219+
clientSettingsBuilder.listUserWorkloadsSecretsSettings().getRetrySettings(),
220+
serviceRetry);
221+
clientSettingsBuilder
222+
.listUserWorkloadsSecretsSettings()
223+
.setRetrySettings(listUserWorkloadsSecretsRetrySettings);
224+
225+
RetrySettings updateUserWorkloadsSecretRetrySettings =
226+
RetryUtil.updateRetrySettings(
227+
clientSettingsBuilder.updateUserWorkloadsSecretSettings().getRetrySettings(),
228+
serviceRetry);
229+
clientSettingsBuilder
230+
.updateUserWorkloadsSecretSettings()
231+
.setRetrySettings(updateUserWorkloadsSecretRetrySettings);
232+
233+
RetrySettings deleteUserWorkloadsSecretRetrySettings =
234+
RetryUtil.updateRetrySettings(
235+
clientSettingsBuilder.deleteUserWorkloadsSecretSettings().getRetrySettings(),
236+
serviceRetry);
237+
clientSettingsBuilder
238+
.deleteUserWorkloadsSecretSettings()
239+
.setRetrySettings(deleteUserWorkloadsSecretRetrySettings);
240+
241+
RetrySettings createUserWorkloadsConfigMapRetrySettings =
242+
RetryUtil.updateRetrySettings(
243+
clientSettingsBuilder.createUserWorkloadsConfigMapSettings().getRetrySettings(),
244+
serviceRetry);
245+
clientSettingsBuilder
246+
.createUserWorkloadsConfigMapSettings()
247+
.setRetrySettings(createUserWorkloadsConfigMapRetrySettings);
248+
249+
RetrySettings getUserWorkloadsConfigMapRetrySettings =
250+
RetryUtil.updateRetrySettings(
251+
clientSettingsBuilder.getUserWorkloadsConfigMapSettings().getRetrySettings(),
252+
serviceRetry);
253+
clientSettingsBuilder
254+
.getUserWorkloadsConfigMapSettings()
255+
.setRetrySettings(getUserWorkloadsConfigMapRetrySettings);
256+
257+
RetrySettings listUserWorkloadsConfigMapsRetrySettings =
258+
RetryUtil.updateRetrySettings(
259+
clientSettingsBuilder.listUserWorkloadsConfigMapsSettings().getRetrySettings(),
260+
serviceRetry);
261+
clientSettingsBuilder
262+
.listUserWorkloadsConfigMapsSettings()
263+
.setRetrySettings(listUserWorkloadsConfigMapsRetrySettings);
264+
265+
RetrySettings updateUserWorkloadsConfigMapRetrySettings =
266+
RetryUtil.updateRetrySettings(
267+
clientSettingsBuilder.updateUserWorkloadsConfigMapSettings().getRetrySettings(),
268+
serviceRetry);
269+
clientSettingsBuilder
270+
.updateUserWorkloadsConfigMapSettings()
271+
.setRetrySettings(updateUserWorkloadsConfigMapRetrySettings);
272+
273+
RetrySettings deleteUserWorkloadsConfigMapRetrySettings =
274+
RetryUtil.updateRetrySettings(
275+
clientSettingsBuilder.deleteUserWorkloadsConfigMapSettings().getRetrySettings(),
276+
serviceRetry);
277+
clientSettingsBuilder
278+
.deleteUserWorkloadsConfigMapSettings()
279+
.setRetrySettings(deleteUserWorkloadsConfigMapRetrySettings);
280+
196281
RetrySettings fetchDatabasePropertiesRetrySettings =
197282
RetryUtil.updateRetrySettings(
198283
clientSettingsBuilder.fetchDatabasePropertiesSettings().getRetrySettings(),
@@ -272,6 +357,159 @@ public EnvironmentsSettings environmentsSettings(
272357
"Configured method-level retry settings for pollAirflowCommand from properties.");
273358
}
274359
}
360+
Retry listWorkloadsRetry = clientProperties.getListWorkloadsRetry();
361+
if (listWorkloadsRetry != null) {
362+
RetrySettings listWorkloadsRetrySettings =
363+
RetryUtil.updateRetrySettings(
364+
clientSettingsBuilder.listWorkloadsSettings().getRetrySettings(), listWorkloadsRetry);
365+
clientSettingsBuilder.listWorkloadsSettings().setRetrySettings(listWorkloadsRetrySettings);
366+
if (LOGGER.isTraceEnabled()) {
367+
LOGGER.trace("Configured method-level retry settings for listWorkloads from properties.");
368+
}
369+
}
370+
Retry createUserWorkloadsSecretRetry = clientProperties.getCreateUserWorkloadsSecretRetry();
371+
if (createUserWorkloadsSecretRetry != null) {
372+
RetrySettings createUserWorkloadsSecretRetrySettings =
373+
RetryUtil.updateRetrySettings(
374+
clientSettingsBuilder.createUserWorkloadsSecretSettings().getRetrySettings(),
375+
createUserWorkloadsSecretRetry);
376+
clientSettingsBuilder
377+
.createUserWorkloadsSecretSettings()
378+
.setRetrySettings(createUserWorkloadsSecretRetrySettings);
379+
if (LOGGER.isTraceEnabled()) {
380+
LOGGER.trace(
381+
"Configured method-level retry settings for createUserWorkloadsSecret from properties.");
382+
}
383+
}
384+
Retry getUserWorkloadsSecretRetry = clientProperties.getGetUserWorkloadsSecretRetry();
385+
if (getUserWorkloadsSecretRetry != null) {
386+
RetrySettings getUserWorkloadsSecretRetrySettings =
387+
RetryUtil.updateRetrySettings(
388+
clientSettingsBuilder.getUserWorkloadsSecretSettings().getRetrySettings(),
389+
getUserWorkloadsSecretRetry);
390+
clientSettingsBuilder
391+
.getUserWorkloadsSecretSettings()
392+
.setRetrySettings(getUserWorkloadsSecretRetrySettings);
393+
if (LOGGER.isTraceEnabled()) {
394+
LOGGER.trace(
395+
"Configured method-level retry settings for getUserWorkloadsSecret from properties.");
396+
}
397+
}
398+
Retry listUserWorkloadsSecretsRetry = clientProperties.getListUserWorkloadsSecretsRetry();
399+
if (listUserWorkloadsSecretsRetry != null) {
400+
RetrySettings listUserWorkloadsSecretsRetrySettings =
401+
RetryUtil.updateRetrySettings(
402+
clientSettingsBuilder.listUserWorkloadsSecretsSettings().getRetrySettings(),
403+
listUserWorkloadsSecretsRetry);
404+
clientSettingsBuilder
405+
.listUserWorkloadsSecretsSettings()
406+
.setRetrySettings(listUserWorkloadsSecretsRetrySettings);
407+
if (LOGGER.isTraceEnabled()) {
408+
LOGGER.trace(
409+
"Configured method-level retry settings for listUserWorkloadsSecrets from properties.");
410+
}
411+
}
412+
Retry updateUserWorkloadsSecretRetry = clientProperties.getUpdateUserWorkloadsSecretRetry();
413+
if (updateUserWorkloadsSecretRetry != null) {
414+
RetrySettings updateUserWorkloadsSecretRetrySettings =
415+
RetryUtil.updateRetrySettings(
416+
clientSettingsBuilder.updateUserWorkloadsSecretSettings().getRetrySettings(),
417+
updateUserWorkloadsSecretRetry);
418+
clientSettingsBuilder
419+
.updateUserWorkloadsSecretSettings()
420+
.setRetrySettings(updateUserWorkloadsSecretRetrySettings);
421+
if (LOGGER.isTraceEnabled()) {
422+
LOGGER.trace(
423+
"Configured method-level retry settings for updateUserWorkloadsSecret from properties.");
424+
}
425+
}
426+
Retry deleteUserWorkloadsSecretRetry = clientProperties.getDeleteUserWorkloadsSecretRetry();
427+
if (deleteUserWorkloadsSecretRetry != null) {
428+
RetrySettings deleteUserWorkloadsSecretRetrySettings =
429+
RetryUtil.updateRetrySettings(
430+
clientSettingsBuilder.deleteUserWorkloadsSecretSettings().getRetrySettings(),
431+
deleteUserWorkloadsSecretRetry);
432+
clientSettingsBuilder
433+
.deleteUserWorkloadsSecretSettings()
434+
.setRetrySettings(deleteUserWorkloadsSecretRetrySettings);
435+
if (LOGGER.isTraceEnabled()) {
436+
LOGGER.trace(
437+
"Configured method-level retry settings for deleteUserWorkloadsSecret from properties.");
438+
}
439+
}
440+
Retry createUserWorkloadsConfigMapRetry =
441+
clientProperties.getCreateUserWorkloadsConfigMapRetry();
442+
if (createUserWorkloadsConfigMapRetry != null) {
443+
RetrySettings createUserWorkloadsConfigMapRetrySettings =
444+
RetryUtil.updateRetrySettings(
445+
clientSettingsBuilder.createUserWorkloadsConfigMapSettings().getRetrySettings(),
446+
createUserWorkloadsConfigMapRetry);
447+
clientSettingsBuilder
448+
.createUserWorkloadsConfigMapSettings()
449+
.setRetrySettings(createUserWorkloadsConfigMapRetrySettings);
450+
if (LOGGER.isTraceEnabled()) {
451+
LOGGER.trace(
452+
"Configured method-level retry settings for createUserWorkloadsConfigMap from properties.");
453+
}
454+
}
455+
Retry getUserWorkloadsConfigMapRetry = clientProperties.getGetUserWorkloadsConfigMapRetry();
456+
if (getUserWorkloadsConfigMapRetry != null) {
457+
RetrySettings getUserWorkloadsConfigMapRetrySettings =
458+
RetryUtil.updateRetrySettings(
459+
clientSettingsBuilder.getUserWorkloadsConfigMapSettings().getRetrySettings(),
460+
getUserWorkloadsConfigMapRetry);
461+
clientSettingsBuilder
462+
.getUserWorkloadsConfigMapSettings()
463+
.setRetrySettings(getUserWorkloadsConfigMapRetrySettings);
464+
if (LOGGER.isTraceEnabled()) {
465+
LOGGER.trace(
466+
"Configured method-level retry settings for getUserWorkloadsConfigMap from properties.");
467+
}
468+
}
469+
Retry listUserWorkloadsConfigMapsRetry = clientProperties.getListUserWorkloadsConfigMapsRetry();
470+
if (listUserWorkloadsConfigMapsRetry != null) {
471+
RetrySettings listUserWorkloadsConfigMapsRetrySettings =
472+
RetryUtil.updateRetrySettings(
473+
clientSettingsBuilder.listUserWorkloadsConfigMapsSettings().getRetrySettings(),
474+
listUserWorkloadsConfigMapsRetry);
475+
clientSettingsBuilder
476+
.listUserWorkloadsConfigMapsSettings()
477+
.setRetrySettings(listUserWorkloadsConfigMapsRetrySettings);
478+
if (LOGGER.isTraceEnabled()) {
479+
LOGGER.trace(
480+
"Configured method-level retry settings for listUserWorkloadsConfigMaps from properties.");
481+
}
482+
}
483+
Retry updateUserWorkloadsConfigMapRetry =
484+
clientProperties.getUpdateUserWorkloadsConfigMapRetry();
485+
if (updateUserWorkloadsConfigMapRetry != null) {
486+
RetrySettings updateUserWorkloadsConfigMapRetrySettings =
487+
RetryUtil.updateRetrySettings(
488+
clientSettingsBuilder.updateUserWorkloadsConfigMapSettings().getRetrySettings(),
489+
updateUserWorkloadsConfigMapRetry);
490+
clientSettingsBuilder
491+
.updateUserWorkloadsConfigMapSettings()
492+
.setRetrySettings(updateUserWorkloadsConfigMapRetrySettings);
493+
if (LOGGER.isTraceEnabled()) {
494+
LOGGER.trace(
495+
"Configured method-level retry settings for updateUserWorkloadsConfigMap from properties.");
496+
}
497+
}
498+
Retry deleteUserWorkloadsConfigMapRetry =
499+
clientProperties.getDeleteUserWorkloadsConfigMapRetry();
500+
if (deleteUserWorkloadsConfigMapRetry != null) {
501+
RetrySettings deleteUserWorkloadsConfigMapRetrySettings =
502+
RetryUtil.updateRetrySettings(
503+
clientSettingsBuilder.deleteUserWorkloadsConfigMapSettings().getRetrySettings(),
504+
deleteUserWorkloadsConfigMapRetry);
505+
clientSettingsBuilder
506+
.deleteUserWorkloadsConfigMapSettings()
507+
.setRetrySettings(deleteUserWorkloadsConfigMapRetrySettings);
508+
if (LOGGER.isTraceEnabled()) {
509+
LOGGER.trace(
510+
"Configured method-level retry settings for deleteUserWorkloadsConfigMap from properties.");
511+
}
512+
}
275513
Retry fetchDatabasePropertiesRetry = clientProperties.getFetchDatabasePropertiesRetry();
276514
if (fetchDatabasePropertiesRetry != null) {
277515
RetrySettings fetchDatabasePropertiesRetrySettings =

0 commit comments

Comments
 (0)