From 97e0efc48d3506e06fc200e34a3d7b20a9d872b8 Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Fri, 23 Aug 2024 15:51:34 +0000 Subject: [PATCH] update deps --- BUILD | 1 - CMakeLists.txt | 2 +- Makefile | 1 - Package.swift | 2 -- build_autogenerated.yaml | 4 ++-- config.m4 | 2 -- config.w32 | 2 -- gRPC-C++.podspec | 2 -- gRPC-Core.podspec | 3 --- grpc.gemspec | 2 -- package.xml | 2 -- src/python/grpcio/grpc_core_dependencies.py | 1 - test/core/security/BUILD | 1 + tools/doxygen/Doxyfile.c++.internal | 2 -- tools/doxygen/Doxyfile.core.internal | 2 -- 15 files changed, 4 insertions(+), 25 deletions(-) diff --git a/BUILD b/BUILD index 386d271fbf1..f1efe67fdd1 100644 --- a/BUILD +++ b/BUILD @@ -690,7 +690,6 @@ grpc_cc_library( "//src/core:endpoint_info_handshaker", "//src/core:experiments", "//src/core:forkable", - "//src/core:gcp_service_account_identity_credentials", "//src/core:grpc_authorization_base", "//src/core:grpc_external_account_credentials", "//src/core:grpc_fake_credentials", diff --git a/CMakeLists.txt b/CMakeLists.txt index 26617f7c6af..ca8840f8592 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2439,7 +2439,6 @@ add_library(grpc src/core/lib/security/credentials/external/file_external_account_credentials.cc src/core/lib/security/credentials/external/url_external_account_credentials.cc src/core/lib/security/credentials/fake/fake_credentials.cc - src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc src/core/lib/security/credentials/google_default/credentials_generic.cc src/core/lib/security/credentials/google_default/google_default_credentials.cc src/core/lib/security/credentials/iam/iam_credentials.cc @@ -30606,6 +30605,7 @@ add_executable(test_core_security_credentials_test ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.grpc.pb.cc ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.grpc.pb.h + src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc test/core/event_engine/event_engine_test_utils.cc test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc test/core/security/credentials_test.cc diff --git a/Makefile b/Makefile index 8ea58e9836f..a426c5ae922 100644 --- a/Makefile +++ b/Makefile @@ -1276,7 +1276,6 @@ LIBGRPC_SRC = \ src/core/lib/security/credentials/external/file_external_account_credentials.cc \ src/core/lib/security/credentials/external/url_external_account_credentials.cc \ src/core/lib/security/credentials/fake/fake_credentials.cc \ - src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc \ src/core/lib/security/credentials/google_default/credentials_generic.cc \ src/core/lib/security/credentials/google_default/google_default_credentials.cc \ src/core/lib/security/credentials/iam/iam_credentials.cc \ diff --git a/Package.swift b/Package.swift index 002d86ec09c..a6e7852597f 100644 --- a/Package.swift +++ b/Package.swift @@ -1565,8 +1565,6 @@ let package = Package( "src/core/lib/security/credentials/external/url_external_account_credentials.h", "src/core/lib/security/credentials/fake/fake_credentials.cc", "src/core/lib/security/credentials/fake/fake_credentials.h", - "src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc", - "src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h", "src/core/lib/security/credentials/google_default/credentials_generic.cc", "src/core/lib/security/credentials/google_default/google_default_credentials.cc", "src/core/lib/security/credentials/google_default/google_default_credentials.h", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 880a022779a..3f0284993f0 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -1038,7 +1038,6 @@ libs: - src/core/lib/security/credentials/external/file_external_account_credentials.h - src/core/lib/security/credentials/external/url_external_account_credentials.h - src/core/lib/security/credentials/fake/fake_credentials.h - - src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h - src/core/lib/security/credentials/google_default/google_default_credentials.h - src/core/lib/security/credentials/iam/iam_credentials.h - src/core/lib/security/credentials/insecure/insecure_credentials.h @@ -1853,7 +1852,6 @@ libs: - src/core/lib/security/credentials/external/file_external_account_credentials.cc - src/core/lib/security/credentials/external/url_external_account_credentials.cc - src/core/lib/security/credentials/fake/fake_credentials.cc - - src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc - src/core/lib/security/credentials/google_default/credentials_generic.cc - src/core/lib/security/credentials/google_default/google_default_credentials.cc - src/core/lib/security/credentials/iam/iam_credentials.cc @@ -19653,6 +19651,7 @@ targets: build: test language: c++ headers: + - src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h - test/core/event_engine/event_engine_test_utils.h - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h - test/core/test_util/cmdline.h @@ -19667,6 +19666,7 @@ targets: - test/core/test_util/tracer_util.h src: - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.proto + - src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc - test/core/event_engine/event_engine_test_utils.cc - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc - test/core/security/credentials_test.cc diff --git a/config.m4 b/config.m4 index 389077876f5..c7f38bced2a 100644 --- a/config.m4 +++ b/config.m4 @@ -651,7 +651,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/security/credentials/external/file_external_account_credentials.cc \ src/core/lib/security/credentials/external/url_external_account_credentials.cc \ src/core/lib/security/credentials/fake/fake_credentials.cc \ - src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc \ src/core/lib/security/credentials/google_default/credentials_generic.cc \ src/core/lib/security/credentials/google_default/google_default_credentials.cc \ src/core/lib/security/credentials/iam/iam_credentials.cc \ @@ -1550,7 +1549,6 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/composite) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/external) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/fake) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/gcp_service_account_identity) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/google_default) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/iam) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/insecure) diff --git a/config.w32 b/config.w32 index 9d32c8e56e0..0e722d1bd9b 100644 --- a/config.w32 +++ b/config.w32 @@ -616,7 +616,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\security\\credentials\\external\\file_external_account_credentials.cc " + "src\\core\\lib\\security\\credentials\\external\\url_external_account_credentials.cc " + "src\\core\\lib\\security\\credentials\\fake\\fake_credentials.cc " + - "src\\core\\lib\\security\\credentials\\gcp_service_account_identity\\gcp_service_account_identity_credentials.cc " + "src\\core\\lib\\security\\credentials\\google_default\\credentials_generic.cc " + "src\\core\\lib\\security\\credentials\\google_default\\google_default_credentials.cc " + "src\\core\\lib\\security\\credentials\\iam\\iam_credentials.cc " + @@ -1688,7 +1687,6 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\credentials\\composite"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\credentials\\external"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\credentials\\fake"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\credentials\\gcp_service_account_identity"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\credentials\\google_default"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\credentials\\iam"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\credentials\\insecure"); diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index ad9aeac1765..42545ee1bf5 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -1142,7 +1142,6 @@ Pod::Spec.new do |s| 'src/core/lib/security/credentials/external/file_external_account_credentials.h', 'src/core/lib/security/credentials/external/url_external_account_credentials.h', 'src/core/lib/security/credentials/fake/fake_credentials.h', - 'src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h', 'src/core/lib/security/credentials/google_default/google_default_credentials.h', 'src/core/lib/security/credentials/iam/iam_credentials.h', 'src/core/lib/security/credentials/insecure/insecure_credentials.h', @@ -2429,7 +2428,6 @@ Pod::Spec.new do |s| 'src/core/lib/security/credentials/external/file_external_account_credentials.h', 'src/core/lib/security/credentials/external/url_external_account_credentials.h', 'src/core/lib/security/credentials/fake/fake_credentials.h', - 'src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h', 'src/core/lib/security/credentials/google_default/google_default_credentials.h', 'src/core/lib/security/credentials/iam/iam_credentials.h', 'src/core/lib/security/credentials/insecure/insecure_credentials.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index c28ac6d602b..9b35f946375 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -1681,8 +1681,6 @@ Pod::Spec.new do |s| 'src/core/lib/security/credentials/external/url_external_account_credentials.h', 'src/core/lib/security/credentials/fake/fake_credentials.cc', 'src/core/lib/security/credentials/fake/fake_credentials.h', - 'src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc', - 'src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h', 'src/core/lib/security/credentials/google_default/credentials_generic.cc', 'src/core/lib/security/credentials/google_default/google_default_credentials.cc', 'src/core/lib/security/credentials/google_default/google_default_credentials.h', @@ -3209,7 +3207,6 @@ Pod::Spec.new do |s| 'src/core/lib/security/credentials/external/file_external_account_credentials.h', 'src/core/lib/security/credentials/external/url_external_account_credentials.h', 'src/core/lib/security/credentials/fake/fake_credentials.h', - 'src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h', 'src/core/lib/security/credentials/google_default/google_default_credentials.h', 'src/core/lib/security/credentials/iam/iam_credentials.h', 'src/core/lib/security/credentials/insecure/insecure_credentials.h', diff --git a/grpc.gemspec b/grpc.gemspec index 4569b5c5b5a..d90dfc5dddd 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -1567,8 +1567,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/security/credentials/external/url_external_account_credentials.h ) s.files += %w( src/core/lib/security/credentials/fake/fake_credentials.cc ) s.files += %w( src/core/lib/security/credentials/fake/fake_credentials.h ) - s.files += %w( src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc ) - s.files += %w( src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h ) s.files += %w( src/core/lib/security/credentials/google_default/credentials_generic.cc ) s.files += %w( src/core/lib/security/credentials/google_default/google_default_credentials.cc ) s.files += %w( src/core/lib/security/credentials/google_default/google_default_credentials.h ) diff --git a/package.xml b/package.xml index c4a684fcb32..fde0df1ef9c 100644 --- a/package.xml +++ b/package.xml @@ -1549,8 +1549,6 @@ - - diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 24cbcebd5db..74eedd1126c 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -625,7 +625,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/security/credentials/external/file_external_account_credentials.cc', 'src/core/lib/security/credentials/external/url_external_account_credentials.cc', 'src/core/lib/security/credentials/fake/fake_credentials.cc', - 'src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc', 'src/core/lib/security/credentials/google_default/credentials_generic.cc', 'src/core/lib/security/credentials/google_default/google_default_credentials.cc', 'src/core/lib/security/credentials/iam/iam_credentials.cc', diff --git a/test/core/security/BUILD b/test/core/security/BUILD index e11332fb22e..ed139dd4ffb 100644 --- a/test/core/security/BUILD +++ b/test/core/security/BUILD @@ -111,6 +111,7 @@ grpc_cc_test( "//:gpr", "//:grpc", "//src/core:channel_args", + "//src/core:gcp_service_account_identity_credentials", "//test/core/event_engine:event_engine_test_utils", "//test/core/event_engine/fuzzing_event_engine", "//test/core/test_util:grpc_test_util", diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 5cce76240e2..bdcc33a9a70 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -2572,8 +2572,6 @@ src/core/lib/security/credentials/external/url_external_account_credentials.cc \ src/core/lib/security/credentials/external/url_external_account_credentials.h \ src/core/lib/security/credentials/fake/fake_credentials.cc \ src/core/lib/security/credentials/fake/fake_credentials.h \ -src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc \ -src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h \ src/core/lib/security/credentials/google_default/credentials_generic.cc \ src/core/lib/security/credentials/google_default/google_default_credentials.cc \ src/core/lib/security/credentials/google_default/google_default_credentials.h \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 8891bd16c23..978ef442a36 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -2343,8 +2343,6 @@ src/core/lib/security/credentials/external/url_external_account_credentials.cc \ src/core/lib/security/credentials/external/url_external_account_credentials.h \ src/core/lib/security/credentials/fake/fake_credentials.cc \ src/core/lib/security/credentials/fake/fake_credentials.h \ -src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc \ -src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h \ src/core/lib/security/credentials/google_default/credentials_generic.cc \ src/core/lib/security/credentials/google_default/google_default_credentials.cc \ src/core/lib/security/credentials/google_default/google_default_credentials.h \