Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(deps): update dependency com.google.cloud:libraries-bom to v26.20.0 (main) #2071

Merged
merged 2 commits into from
Jul 28, 2023
Merged

fix(deps): update dependency com.google.cloud:libraries-bom to v26.20.0 (main) #2071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6977124
fix(deps): update dependency com.google.cloud:libraries-bom to v26.20.0
renovate-bot Jul 27, 2023
0be0322
chore: update starter modules in spring-cloud-previews
cloud-java-bot Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spring-cloud-gcp-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</distributionManagement>

<properties>
<gcp-libraries-bom.version>26.19.0</gcp-libraries-bom.version>
<gcp-libraries-bom.version>26.20.0</gcp-libraries-bom.version>
<cloud-sql-socket-factory.version>1.13.1</cloud-sql-socket-factory.version>
<r2dbc-postgres-driver.version>1.0.2.RELEASE</r2dbc-postgres-driver.version>
</properties>
Expand Down
176 changes: 88 additions & 88 deletions spring-cloud-previews/README.md
View file
Open in desktop

Large diffs are not rendered by default.

42 changes: 21 additions & 21 deletions ...java/com/google/cloud/aiplatform/v1/spring/TensorboardServiceSpringAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,13 @@ public TensorboardServiceSettings tensorboardServiceSettings(
clientSettingsBuilder.getTensorboardSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.getTensorboardSettings().setRetrySettings(getTensorboardRetrySettings);

RetrySettings listTensorboardsRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.listTensorboardsSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder
.listTensorboardsSettings()
.setRetrySettings(listTensorboardsRetrySettings);

RetrySettings readTensorboardUsageRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.readTensorboardUsageSettings().getRetrySettings(),
Expand All @@ -163,13 +170,6 @@ public TensorboardServiceSettings tensorboardServiceSettings(
.readTensorboardUsageSettings()
.setRetrySettings(readTensorboardUsageRetrySettings);

RetrySettings listTensorboardsRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.listTensorboardsSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder
.listTensorboardsSettings()
.setRetrySettings(listTensorboardsRetrySettings);

RetrySettings createTensorboardExperimentRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.createTensorboardExperimentSettings().getRetrySettings(),
Expand Down Expand Up @@ -362,20 +362,6 @@ public TensorboardServiceSettings tensorboardServiceSettings(
LOGGER.trace("Configured method-level retry settings for getTensorboard from properties.");
}
}
Retry readTensorboardUsageRetry = clientProperties.getReadTensorboardUsageRetry();
if (readTensorboardUsageRetry != null) {
RetrySettings readTensorboardUsageRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.readTensorboardUsageSettings().getRetrySettings(),
readTensorboardUsageRetry);
clientSettingsBuilder
.readTensorboardUsageSettings()
.setRetrySettings(readTensorboardUsageRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace(
"Configured method-level retry settings for readTensorboardUsage from properties.");
}
}
Retry listTensorboardsRetry = clientProperties.getListTensorboardsRetry();
if (listTensorboardsRetry != null) {
RetrySettings listTensorboardsRetrySettings =
Expand All @@ -390,6 +376,20 @@ public TensorboardServiceSettings tensorboardServiceSettings(
"Configured method-level retry settings for listTensorboards from properties.");
}
}
Retry readTensorboardUsageRetry = clientProperties.getReadTensorboardUsageRetry();
if (readTensorboardUsageRetry != null) {
RetrySettings readTensorboardUsageRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.readTensorboardUsageSettings().getRetrySettings(),
readTensorboardUsageRetry);
clientSettingsBuilder
.readTensorboardUsageSettings()
.setRetrySettings(readTensorboardUsageRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace(
"Configured method-level retry settings for readTensorboardUsage from properties.");
}
}
Retry createTensorboardExperimentRetry = clientProperties.getCreateTensorboardExperimentRetry();
if (createTensorboardExperimentRetry != null) {
RetrySettings createTensorboardExperimentRetrySettings =
Expand Down
26 changes: 13 additions & 13 deletions ...c/main/java/com/google/cloud/aiplatform/v1/spring/TensorboardServiceSpringProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,16 @@ public class TensorboardServiceSpringProperties implements CredentialsSupplier {
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry getTensorboardRetry;
/**
* Allow override of retry settings at method-level for readTensorboardUsage. If defined, this
* takes precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry readTensorboardUsageRetry;
/**
* Allow override of retry settings at method-level for listTensorboards. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry listTensorboardsRetry;
/**
* Allow override of retry settings at method-level for readTensorboardUsage. If defined, this
* takes precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry readTensorboardUsageRetry;
/**
* Allow override of retry settings at method-level for createTensorboardExperiment. If defined,
* this takes precedence over service-level retry configurations for that RPC method.
Expand Down Expand Up @@ -215,14 +215,6 @@ public void setGetTensorboardRetry(Retry getTensorboardRetry) {
this.getTensorboardRetry = getTensorboardRetry;
}

public Retry getReadTensorboardUsageRetry() {
return this.readTensorboardUsageRetry;
}

public void setReadTensorboardUsageRetry(Retry readTensorboardUsageRetry) {
this.readTensorboardUsageRetry = readTensorboardUsageRetry;
}

public Retry getListTensorboardsRetry() {
return this.listTensorboardsRetry;
}
Expand All @@ -231,6 +223,14 @@ public void setListTensorboardsRetry(Retry listTensorboardsRetry) {
this.listTensorboardsRetry = listTensorboardsRetry;
}

public Retry getReadTensorboardUsageRetry() {
return this.readTensorboardUsageRetry;
}

public void setReadTensorboardUsageRetry(Retry readTensorboardUsageRetry) {
this.readTensorboardUsageRetry = readTensorboardUsageRetry;
}

public Retry getCreateTensorboardExperimentRetry() {
return this.createTensorboardExperimentRetry;
}
Expand Down
51 changes: 51 additions & 0 deletions ...m/google/cloud/api/servicemanagement/v1/spring/ServiceManagerSpringAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,23 @@ public ServiceManagerSettings serviceManagerSettings(
.generateConfigReportSettings()
.setRetrySettings(generateConfigReportRetrySettings);

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.");
}
Expand Down Expand Up @@ -320,6 +337,40 @@ public ServiceManagerSettings serviceManagerSettings(
"Configured method-level retry settings for generateConfigReport 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();
}

Expand Down
39 changes: 39 additions & 0 deletions ...java/com/google/cloud/api/servicemanagement/v1/spring/ServiceManagerSpringProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,21 @@ public class ServiceManagerSpringProperties implements CredentialsSupplier {
* takes precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry generateConfigReportRetry;
/**
* 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() {
Expand Down Expand Up @@ -187,4 +202,28 @@ public Retry getGenerateConfigReportRetry() {
public void setGenerateConfigReportRetry(Retry generateConfigReportRetry) {
this.generateConfigReportRetry = generateConfigReportRetry;
}

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;
}
}
30 changes: 30 additions & 0 deletions ...ava/com/google/cloud/servicedirectory/v1/spring/LookupServiceSpringAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,16 @@ public LookupServiceSettings lookupServiceSettings(
clientSettingsBuilder.resolveServiceSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.resolveServiceSettings().setRetrySettings(resolveServiceRetrySettings);

RetrySettings listLocationsRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.listLocationsSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.listLocationsSettings().setRetrySettings(listLocationsRetrySettings);

RetrySettings getLocationRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.getLocationSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.getLocationSettings().setRetrySettings(getLocationRetrySettings);

if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured service-level retry settings from properties.");
}
Expand All @@ -179,6 +189,26 @@ public LookupServiceSettings lookupServiceSettings(
LOGGER.trace("Configured method-level retry settings for resolveService from properties.");
}
}
Retry listLocationsRetry = clientProperties.getListLocationsRetry();
if (listLocationsRetry != null) {
RetrySettings listLocationsRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.listLocationsSettings().getRetrySettings(), listLocationsRetry);
clientSettingsBuilder.listLocationsSettings().setRetrySettings(listLocationsRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured method-level retry settings for listLocations from properties.");
}
}
Retry getLocationRetry = clientProperties.getGetLocationRetry();
if (getLocationRetry != null) {
RetrySettings getLocationRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.getLocationSettings().getRetrySettings(), getLocationRetry);
clientSettingsBuilder.getLocationSettings().setRetrySettings(getLocationRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured method-level retry settings for getLocation from properties.");
}
}
return clientSettingsBuilder.build();
}

Expand Down
26 changes: 26 additions & 0 deletions .../main/java/com/google/cloud/servicedirectory/v1/spring/LookupServiceSpringProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,16 @@ public class LookupServiceSpringProperties implements CredentialsSupplier {
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry resolveServiceRetry;
/**
* Allow override of retry settings at method-level for listLocations. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry listLocationsRetry;
/**
* Allow override of retry settings at method-level for getLocation. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry getLocationRetry;

@Override
public Credentials getCredentials() {
Expand Down Expand Up @@ -92,4 +102,20 @@ public Retry getResolveServiceRetry() {
public void setResolveServiceRetry(Retry resolveServiceRetry) {
this.resolveServiceRetry = resolveServiceRetry;
}

public Retry getListLocationsRetry() {
return this.listLocationsRetry;
}

public void setListLocationsRetry(Retry listLocationsRetry) {
this.listLocationsRetry = listLocationsRetry;
}

public Retry getGetLocationRetry() {
return this.getLocationRetry;
}

public void setGetLocationRetry(Retry getLocationRetry) {
this.getLocationRetry = getLocationRetry;
}
}
30 changes: 30 additions & 0 deletions ...m/google/cloud/servicedirectory/v1/spring/RegistrationServiceSpringAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,16 @@ public RegistrationServiceSettings registrationServiceSettings(
.testIamPermissionsSettings()
.setRetrySettings(testIamPermissionsRetrySettings);

RetrySettings listLocationsRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.listLocationsSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.listLocationsSettings().setRetrySettings(listLocationsRetrySettings);

RetrySettings getLocationRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.getLocationSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.getLocationSettings().setRetrySettings(getLocationRetrySettings);

if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured service-level retry settings from properties.");
}
Expand Down Expand Up @@ -459,6 +469,26 @@ public RegistrationServiceSettings registrationServiceSettings(
"Configured method-level retry settings for testIamPermissions from properties.");
}
}
Retry listLocationsRetry = clientProperties.getListLocationsRetry();
if (listLocationsRetry != null) {
RetrySettings listLocationsRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.listLocationsSettings().getRetrySettings(), listLocationsRetry);
clientSettingsBuilder.listLocationsSettings().setRetrySettings(listLocationsRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured method-level retry settings for listLocations from properties.");
}
}
Retry getLocationRetry = clientProperties.getGetLocationRetry();
if (getLocationRetry != null) {
RetrySettings getLocationRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.getLocationSettings().getRetrySettings(), getLocationRetry);
clientSettingsBuilder.getLocationSettings().setRetrySettings(getLocationRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured method-level retry settings for getLocation from properties.");
}
}
return clientSettingsBuilder.build();
}

Expand Down
Loading
Loading