From bc7eab354d3bc94ff341d58872a8f3c463a58861 Mon Sep 17 00:00:00 2001 From: chingor13 Date: Wed, 15 Apr 2026 17:32:09 +0000 Subject: [PATCH 1/5] build: use local google-auth-library in bazel tests --- google-auth-library-java/credentials/BUILD.bazel | 5 +++++ google-auth-library-java/oauth2_http/BUILD.bazel | 16 ++++++++++++++++ sdk-platform-java/gax-java/gax-grpc/BUILD.bazel | 4 ++-- .../gax-java/gax-httpjson/BUILD.bazel | 4 ++-- sdk-platform-java/gax-java/gax/BUILD.bazel | 4 ++-- 5 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 google-auth-library-java/credentials/BUILD.bazel create mode 100644 google-auth-library-java/oauth2_http/BUILD.bazel diff --git a/google-auth-library-java/credentials/BUILD.bazel b/google-auth-library-java/credentials/BUILD.bazel new file mode 100644 index 000000000000..04e31f4a1713 --- /dev/null +++ b/google-auth-library-java/credentials/BUILD.bazel @@ -0,0 +1,5 @@ +java_library( + name = "credentials", + srcs = glob(["java/**/*.java"]), + visibility = ["//visibility:public"], +) diff --git a/google-auth-library-java/oauth2_http/BUILD.bazel b/google-auth-library-java/oauth2_http/BUILD.bazel new file mode 100644 index 000000000000..966ee238ab10 --- /dev/null +++ b/google-auth-library-java/oauth2_http/BUILD.bazel @@ -0,0 +1,16 @@ +java_library( + name = "oauth2_http", + srcs = glob(["java/**/*.java"]), + deps = [ + "@com_google_guava_guava//jar", + "//google-auth-library-java/credentials:credentials", + "@com_google_http_client_google_http_client//jar", + "@com_google_http_client_google_http_client_gson//jar", + "@com_google_api_api_common//jar", + "@com_google_code_gson_gson//jar", + "@com_google_errorprone_error_prone_annotations//jar", + "@com_google_code_findbugs_jsr305//jar", + "@com_google_auto_value_auto_value_annotations//jar", + ], + visibility = ["//visibility:public"], +) diff --git a/sdk-platform-java/gax-java/gax-grpc/BUILD.bazel b/sdk-platform-java/gax-java/gax-grpc/BUILD.bazel index be224ff3f8bc..68fc7690a803 100644 --- a/sdk-platform-java/gax-java/gax-grpc/BUILD.bazel +++ b/sdk-platform-java/gax-java/gax-grpc/BUILD.bazel @@ -17,8 +17,8 @@ _COMPILE_DEPS = [ "@com_google_code_findbugs_jsr305//jar", "@com_google_code_gson_gson//jar", "@org_threeten_threetenbp//jar", - "@com_google_auth_google_auth_library_oauth2_http//jar", - "@com_google_auth_google_auth_library_credentials//jar", + "@gapic_generator_java//google-auth-library-java/oauth2_http", + "@gapic_generator_java//google-auth-library-java/credentials", "@com_google_api_grpc_proto_google_common_protos//jar", "@com_google_api_api_common//jar", "@com_google_auto_value_auto_value//jar", diff --git a/sdk-platform-java/gax-java/gax-httpjson/BUILD.bazel b/sdk-platform-java/gax-java/gax-httpjson/BUILD.bazel index 1e134e67707d..78b2c01bb256 100644 --- a/sdk-platform-java/gax-java/gax-httpjson/BUILD.bazel +++ b/sdk-platform-java/gax-java/gax-httpjson/BUILD.bazel @@ -14,8 +14,8 @@ _COMPILE_DEPS = [ "@com_google_errorprone_error_prone_annotations//jar", "@org_threeten_threetenbp//jar", "@com_google_http_client_google_http_client//jar", - "@com_google_auth_google_auth_library_oauth2_http//jar", - "@com_google_auth_google_auth_library_credentials//jar", + "@gapic_generator_java//google-auth-library-java/oauth2_http", + "@gapic_generator_java//google-auth-library-java/credentials", "@com_google_api_api_common//jar", "@com_google_auto_value_auto_value//jar", "@com_google_auto_value_auto_value_annotations//jar", diff --git a/sdk-platform-java/gax-java/gax/BUILD.bazel b/sdk-platform-java/gax-java/gax/BUILD.bazel index 6f6089132938..7faa2d2597bb 100644 --- a/sdk-platform-java/gax-java/gax/BUILD.bazel +++ b/sdk-platform-java/gax-java/gax/BUILD.bazel @@ -11,8 +11,8 @@ _COMPILE_DEPS = [ "@com_google_api_api_common//jar", "@com_google_api_grpc_proto_google_common_protos//jar", "@com_google_protobuf_java//jar", - "@com_google_auth_google_auth_library_credentials//jar", - "@com_google_auth_google_auth_library_oauth2_http//jar", + "@gapic_generator_java//google-auth-library-java/credentials", + "@gapic_generator_java//google-auth-library-java/oauth2_http", "@com_google_auto_value_auto_value//jar", "@com_google_auto_value_auto_value_annotations//jar", "@com_google_code_findbugs_jsr305//jar", From 48c897e05d79c94a7db1e9d6d6f2d6f5dfcaf4cf Mon Sep 17 00:00:00 2001 From: cloud-java-bot Date: Wed, 15 Apr 2026 17:37:05 +0000 Subject: [PATCH 2/5] chore: generate libraries at Wed Apr 15 17:35:27 UTC 2026 --- gapic-libraries-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gapic-libraries-bom/pom.xml b/gapic-libraries-bom/pom.xml index 9f1174f95b72..9cbef9e2cdee 100644 --- a/gapic-libraries-bom/pom.xml +++ b/gapic-libraries-bom/pom.xml @@ -4,7 +4,7 @@ com.google.cloud gapic-libraries-bom pom - 1.85.1 + 1.85.0 Google Cloud Java BOM BOM for the libraries in google-cloud-java repository. Users should not From 2f77b5179e15c7b415e5df11b996205035269c45 Mon Sep 17 00:00:00 2001 From: chingor13 Date: Wed, 15 Apr 2026 18:15:05 +0000 Subject: [PATCH 3/5] add slf4j bazel dependency --- google-auth-library-java/oauth2_http/BUILD.bazel | 1 + 1 file changed, 1 insertion(+) diff --git a/google-auth-library-java/oauth2_http/BUILD.bazel b/google-auth-library-java/oauth2_http/BUILD.bazel index 966ee238ab10..ab8c2844c534 100644 --- a/google-auth-library-java/oauth2_http/BUILD.bazel +++ b/google-auth-library-java/oauth2_http/BUILD.bazel @@ -11,6 +11,7 @@ java_library( "@com_google_errorprone_error_prone_annotations//jar", "@com_google_code_findbugs_jsr305//jar", "@com_google_auto_value_auto_value_annotations//jar", + "@org_slf4j_slf4j_api//jar", ], visibility = ["//visibility:public"], ) From fa7275337a44922dd0ce350198b336c39c908f31 Mon Sep 17 00:00:00 2001 From: chingor13 Date: Wed, 15 Apr 2026 19:03:54 +0000 Subject: [PATCH 4/5] fix guava dependency --- google-auth-library-java/oauth2_http/BUILD.bazel | 3 +++ 1 file changed, 3 insertions(+) diff --git a/google-auth-library-java/oauth2_http/BUILD.bazel b/google-auth-library-java/oauth2_http/BUILD.bazel index ab8c2844c534..3d8cc5b675c5 100644 --- a/google-auth-library-java/oauth2_http/BUILD.bazel +++ b/google-auth-library-java/oauth2_http/BUILD.bazel @@ -3,6 +3,7 @@ java_library( srcs = glob(["java/**/*.java"]), deps = [ "@com_google_guava_guava//jar", + "@com_google_guava_failureaccess//jar", "//google-auth-library-java/credentials:credentials", "@com_google_http_client_google_http_client//jar", "@com_google_http_client_google_http_client_gson//jar", @@ -11,7 +12,9 @@ java_library( "@com_google_errorprone_error_prone_annotations//jar", "@com_google_code_findbugs_jsr305//jar", "@com_google_auto_value_auto_value_annotations//jar", + "@com_google_auto_value_auto_value//jar", "@org_slf4j_slf4j_api//jar", ], + plugins = ["@com_google_api_gax_java//:auto_value_plugin"], visibility = ["//visibility:public"], ) From 89e5c462a5278af4bc3ace367d26d63a9873b1ce Mon Sep 17 00:00:00 2001 From: chingor13 Date: Wed, 15 Apr 2026 19:16:31 +0000 Subject: [PATCH 5/5] fix DoubleBraceInitialization failure --- .../oauth2/InternalAwsSecurityCredentialsSupplier.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/google-auth-library-java/oauth2_http/java/com/google/auth/oauth2/InternalAwsSecurityCredentialsSupplier.java b/google-auth-library-java/oauth2_http/java/com/google/auth/oauth2/InternalAwsSecurityCredentialsSupplier.java index a65c79fabdbf..f8c75bc65b64 100644 --- a/google-auth-library-java/oauth2_http/java/com/google/auth/oauth2/InternalAwsSecurityCredentialsSupplier.java +++ b/google-auth-library-java/oauth2_http/java/com/google/auth/oauth2/InternalAwsSecurityCredentialsSupplier.java @@ -235,12 +235,8 @@ Map createMetadataRequestHeaders(AwsCredentialSource awsCredenti // Both flows work for IDMS v1 and v2. But if IDMSv2 is enabled, then if // session token is not present, Unauthorized exception will be thrown. if (awsCredentialSource.imdsv2SessionTokenUrl != null) { - Map tokenRequestHeaders = - new HashMap() { - { - put(AWS_IMDSV2_SESSION_TOKEN_TTL_HEADER, AWS_IMDSV2_SESSION_TOKEN_TTL); - } - }; + Map tokenRequestHeaders = new HashMap<>(); + tokenRequestHeaders.put(AWS_IMDSV2_SESSION_TOKEN_TTL_HEADER, AWS_IMDSV2_SESSION_TOKEN_TTL); String imdsv2SessionToken = retrieveResource(