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

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

Merged
merged 2 commits into from
May 3, 2023
Merged

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

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
59a1a28
fix(deps): update dependency com.google.cloud:libraries-bom to v26.14.0
renovate-bot May 3, 2023
68ac4dc
chore: update starter modules in spring-cloud-previews
cloud-java-bot May 3, 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.13.0</gcp-libraries-bom.version>
<gcp-libraries-bom.version>26.14.0</gcp-libraries-bom.version>
<cloud-sql-socket-factory.version>1.11.1</cloud-sql-socket-factory.version>
<guava.version>31.1-jre</guava.version>
<r2dbc-postgres-driver.version>1.0.1.RELEASE</r2dbc-postgres-driver.version>
Expand Down
174 changes: 87 additions & 87 deletions spring-cloud-previews/README.md
View file
Open in desktop

Large diffs are not rendered by default.

81 changes: 81 additions & 0 deletions .../google/cloud/metastore/v1/spring/DataprocMetastoreFederationSpringAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,33 @@ public DataprocMetastoreFederationSettings dataprocMetastoreFederationSettings(
clientSettingsBuilder.getFederationSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.getFederationSettings().setRetrySettings(getFederationRetrySettings);

RetrySettings listLocationsRetrySettings =
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Corresponds to upstream changes in googleapis/google-cloud-java#9350

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

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

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 @@ -198,6 +225,60 @@ public DataprocMetastoreFederationSettings dataprocMetastoreFederationSettings(
LOGGER.trace("Configured method-level retry settings for getFederation 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.");
}
}
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
65 changes: 65 additions & 0 deletions ...ava/com/google/cloud/metastore/v1/spring/DataprocMetastoreFederationSpringProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,31 @@ public class DataprocMetastoreFederationSpringProperties implements CredentialsS
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry getFederationRetry;
/**
* 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;
/**
* 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 @@ -105,4 +130,44 @@ public Retry getGetFederationRetry() {
public void setGetFederationRetry(Retry getFederationRetry) {
this.getFederationRetry = getFederationRetry;
}

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;
}

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;
}
}
81 changes: 81 additions & 0 deletions ...n/java/com/google/cloud/metastore/v1/spring/DataprocMetastoreSpringAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,33 @@ public DataprocMetastoreSettings dataprocMetastoreSettings(
clientSettingsBuilder.getBackupSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.getBackupSettings().setRetrySettings(getBackupRetrySettings);

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

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

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 @@ -264,6 +291,60 @@ public DataprocMetastoreSettings dataprocMetastoreSettings(
LOGGER.trace("Configured method-level retry settings for getBackup 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.");
}
}
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
65 changes: 65 additions & 0 deletions ...src/main/java/com/google/cloud/metastore/v1/spring/DataprocMetastoreSpringProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,31 @@ public class DataprocMetastoreSpringProperties implements CredentialsSupplier {
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry getBackupRetry;
/**
* 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;
/**
* 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 @@ -157,4 +182,44 @@ public Retry getGetBackupRetry() {
public void setGetBackupRetry(Retry getBackupRetry) {
this.getBackupRetry = getBackupRetry;
}

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;
}

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;
}
}