SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump com.google.apis:google-api-services-cloudresourcemanager from v1-rev20200210-1.30.9 to v3-rev20250522-2.0.0 (#2892)

Browse Source 
* Bump com.google.apis:google-api-services-cloudresourcemanager

Bumps com.google.apis:google-api-services-cloudresourcemanager from v1-rev20200210-1.30.9 to v3-rev20250522-2.0.0.

---
updated-dependencies:
- dependency-name: com.google.apis:google-api-services-cloudresourcemanager
  dependency-version: v3-rev20250522-2.0.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Upgrade dependencies and packages

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ryan Baxter <ryan.baxter@broadcom.com>
This commit is contained in:
dependabot[bot]
2025-06-10 09:18:57 -04:00
committed by GitHub
parent c90d9f5d6d
commit a7cd8c223f
2 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pom.xml
View File

@@ -29,6 +29,7 @@
<bintray.package>config</bintray.package>
<spring-cloud-commons.version>5.0.0-SNAPSHOT</spring-cloud-commons.version>
<aws-java-sdk.version>2.31.58</aws-java-sdk.version>
<google-libraries-bom.version>26.61.0</google-libraries-bom.version>
<google-api-services-iam.version>v1-rev20201112-1.30.10</google-api-services-iam.version>
<google-cloud-iamcredentials.version>2.60.0</google-cloud-iamcredentials.version>
<wiremock.version>2.35.2</wiremock.version>
@@ -78,30 +79,22 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>${google-libraries-bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-iam</artifactId>
<version>${google-api-services-iam.version}</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-iamcredentials</artifactId>
<version>${google-cloud-iamcredentials.version}</version>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
<version>0.27.0</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-secretmanager</artifactId>
<version>1.7.2</version>
</dependency>
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-cloudresourcemanager</artifactId>
<version>v1-rev20200210-1.30.9</version>
<version>v3-rev20250522-2.0.0</version>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>

10
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/secretmanager/GoogleSecretManagerV1AccessStrategy.java
View File

@@ -26,11 +26,11 @@ import java.util.List;
import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
import com.google.api.client.http.HttpRequestInitializer;
import com.google.api.client.json.jackson2.JacksonFactory;
import com.google.api.client.json.gson.GsonFactory;
import com.google.api.gax.core.FixedCredentialsProvider;
import com.google.api.services.cloudresourcemanager.CloudResourceManager;
import com.google.api.services.cloudresourcemanager.model.TestIamPermissionsRequest;
import com.google.api.services.cloudresourcemanager.model.TestIamPermissionsResponse;
import com.google.api.services.cloudresourcemanager.v3.CloudResourceManager;
import com.google.api.services.cloudresourcemanager.v3.model.TestIamPermissionsRequest;
import com.google.api.services.cloudresourcemanager.v3.model.TestIamPermissionsResponse;
import com.google.auth.http.HttpCredentialsAdapter;
import com.google.auth.oauth2.AccessToken;
import com.google.auth.oauth2.GoogleCredentials;
@@ -163,7 +163,7 @@ public class GoogleSecretManagerV1AccessStrategy implements GoogleSecretManagerA
GoogleCredentials credential = new GoogleCredentials(accessToken);
HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(credential);
service = new CloudResourceManager.Builder(GoogleNetHttpTransport.newTrustedTransport(),
JacksonFactory.getDefaultInstance(), requestInitializer)
GsonFactory.getDefaultInstance(), requestInitializer)
.setApplicationName(APPLICATION_NAME)
.build();
List<String> permissionsList = Arrays.asList(ACCESS_SECRET_PERMISSION);