From 34ffa5eca5d3520c7127c10c0f1e66144e0595a1 Mon Sep 17 00:00:00 2001 From: Kukki <16548543+AlienCookie@users.noreply.github.com> Date: Tue, 24 Sep 2024 15:08:05 +0200 Subject: [PATCH] Added static Type method to some credential types * grpc_google_default_channel_credentials * TlsServerCredentials * grpc_alts(_server)_credentials * UrlExternalAccountCredentials * FileExternalAccountCredentials * AwsExternalAccountCredentials --- .../lib/security/credentials/alts/alts_credentials.cc | 4 ++-- src/core/lib/security/credentials/alts/alts_credentials.h | 8 ++++++-- .../external/aws_external_account_credentials.cc | 2 +- .../external/aws_external_account_credentials.h | 4 +++- .../external/file_external_account_credentials.cc | 2 +- .../external/file_external_account_credentials.h | 4 +++- .../external/url_external_account_credentials.cc | 2 +- .../external/url_external_account_credentials.h | 4 +++- .../google_default/google_default_credentials.cc | 3 +-- .../google_default/google_default_credentials.h | 4 +++- src/core/lib/security/credentials/tls/tls_credentials.cc | 2 +- src/core/lib/security/credentials/tls/tls_credentials.h | 4 +++- 12 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/core/lib/security/credentials/alts/alts_credentials.cc b/src/core/lib/security/credentials/alts/alts_credentials.cc index fd8c364c26a..45888d0e808 100644 --- a/src/core/lib/security/credentials/alts/alts_credentials.cc +++ b/src/core/lib/security/credentials/alts/alts_credentials.cc @@ -54,7 +54,7 @@ grpc_alts_credentials::create_security_connector( this->Ref(), std::move(call_creds), target_name); } -grpc_core::UniqueTypeName grpc_alts_credentials::type() const { +grpc_core::UniqueTypeName grpc_alts_credentials::Type() { static grpc_core::UniqueTypeName::Factory kFactory("Alts"); return kFactory.Create(); } @@ -80,7 +80,7 @@ grpc_alts_server_credentials::~grpc_alts_server_credentials() { gpr_free(handshaker_service_url_); } -grpc_core::UniqueTypeName grpc_alts_server_credentials::type() const { +grpc_core::UniqueTypeName grpc_alts_server_credentials::Type() { static grpc_core::UniqueTypeName::Factory kFactory("Alts"); return kFactory.Create(); } diff --git a/src/core/lib/security/credentials/alts/alts_credentials.h b/src/core/lib/security/credentials/alts/alts_credentials.h index 3aa072789ff..c998c05210f 100644 --- a/src/core/lib/security/credentials/alts/alts_credentials.h +++ b/src/core/lib/security/credentials/alts/alts_credentials.h @@ -43,7 +43,9 @@ class grpc_alts_credentials final : public grpc_channel_credentials { grpc_core::RefCountedPtr call_creds, const char* target_name, grpc_core::ChannelArgs* args) override; - grpc_core::UniqueTypeName type() const override; + static grpc_core::UniqueTypeName Type(); + + grpc_core::UniqueTypeName type() const override { return Type(); } const grpc_alts_credentials_options* options() const { return options_; } grpc_alts_credentials_options* mutable_options() { return options_; } @@ -70,7 +72,9 @@ class grpc_alts_server_credentials final : public grpc_server_credentials { grpc_core::RefCountedPtr create_security_connector(const grpc_core::ChannelArgs& /* args */) override; - grpc_core::UniqueTypeName type() const override; + static grpc_core::UniqueTypeName Type(); + + grpc_core::UniqueTypeName type() const override { return Type(); } const grpc_alts_credentials_options* options() const { return options_; } grpc_alts_credentials_options* mutable_options() { return options_; } diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc index 23061f1679a..3348e3c5aba 100644 --- a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc @@ -512,7 +512,7 @@ std::string AwsExternalAccountCredentials::debug_string() { ")"); } -UniqueTypeName AwsExternalAccountCredentials::type() const { +UniqueTypeName AwsExternalAccountCredentials::Type() { static UniqueTypeName::Factory kFactory("AwsExternalAccountCredentials"); return kFactory.Create(); } diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.h b/src/core/lib/security/credentials/external/aws_external_account_credentials.h index 466094cbe23..3ccac92ad7a 100644 --- a/src/core/lib/security/credentials/external/aws_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.h @@ -51,7 +51,9 @@ class AwsExternalAccountCredentials final : public ExternalAccountCredentials { std::string debug_string() override; - UniqueTypeName type() const override; + static UniqueTypeName Type(); + + UniqueTypeName type() const override { return Type(); } private: // A FetchBody impl that itself performs a sequence of FetchBody operations. diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.cc b/src/core/lib/security/credentials/external/file_external_account_credentials.cc index c38adc83dc6..6c8e1f06062 100644 --- a/src/core/lib/security/credentials/external/file_external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/file_external_account_credentials.cc @@ -157,7 +157,7 @@ std::string FileExternalAccountCredentials::debug_string() { ")"); } -UniqueTypeName FileExternalAccountCredentials::type() const { +UniqueTypeName FileExternalAccountCredentials::Type() { static UniqueTypeName::Factory kFactory("FileExternalAccountCredentials"); return kFactory.Create(); } diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.h b/src/core/lib/security/credentials/external/file_external_account_credentials.h index 7d4721a0bf4..093f0a02809 100644 --- a/src/core/lib/security/credentials/external/file_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/file_external_account_credentials.h @@ -46,7 +46,9 @@ class FileExternalAccountCredentials final : public ExternalAccountCredentials { std::string debug_string() override; - UniqueTypeName type() const override; + static UniqueTypeName Type(); + + UniqueTypeName type() const override { return Type(); } private: class FileFetchBody final : public FetchBody { diff --git a/src/core/lib/security/credentials/external/url_external_account_credentials.cc b/src/core/lib/security/credentials/external/url_external_account_credentials.cc index bcea5eadc09..39efb91d8f3 100644 --- a/src/core/lib/security/credentials/external/url_external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/url_external_account_credentials.cc @@ -137,7 +137,7 @@ std::string UrlExternalAccountCredentials::debug_string() { ")"); } -UniqueTypeName UrlExternalAccountCredentials::type() const { +UniqueTypeName UrlExternalAccountCredentials::Type() { static UniqueTypeName::Factory kFactory("UrlExternalAccountCredentials"); return kFactory.Create(); } diff --git a/src/core/lib/security/credentials/external/url_external_account_credentials.h b/src/core/lib/security/credentials/external/url_external_account_credentials.h index bf44736edf6..d7a28777d2d 100644 --- a/src/core/lib/security/credentials/external/url_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/url_external_account_credentials.h @@ -50,7 +50,9 @@ class UrlExternalAccountCredentials final : public ExternalAccountCredentials { std::string debug_string() override; - UniqueTypeName type() const override; + static UniqueTypeName Type(); + + UniqueTypeName type() const override { return Type(); } private: OrphanablePtr RetrieveSubjectToken( diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc index ba9aeca2942..6581194e911 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc @@ -162,8 +162,7 @@ grpc_google_default_channel_credentials::update_arguments( return args.SetIfUnset(GRPC_ARG_DNS_ENABLE_SRV_QUERIES, true); } -grpc_core::UniqueTypeName grpc_google_default_channel_credentials::type() - const { +grpc_core::UniqueTypeName grpc_google_default_channel_credentials::Type() { static grpc_core::UniqueTypeName::Factory kFactory("GoogleDefault"); return kFactory.Create(); } diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.h b/src/core/lib/security/credentials/google_default/google_default_credentials.h index 58f9ae40cdc..889aebde57b 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.h +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.h @@ -65,7 +65,9 @@ class grpc_google_default_channel_credentials grpc_core::ChannelArgs update_arguments(grpc_core::ChannelArgs args) override; - grpc_core::UniqueTypeName type() const override; + static grpc_core::UniqueTypeName Type(); + + grpc_core::UniqueTypeName type() const override { return Type(); } const grpc_channel_credentials* alts_creds() const { return alts_creds_.get(); diff --git a/src/core/lib/security/credentials/tls/tls_credentials.cc b/src/core/lib/security/credentials/tls/tls_credentials.cc index 765f669e5ce..5fd5abf419e 100644 --- a/src/core/lib/security/credentials/tls/tls_credentials.cc +++ b/src/core/lib/security/credentials/tls/tls_credentials.cc @@ -145,7 +145,7 @@ TlsServerCredentials::create_security_connector( CreateTlsServerSecurityConnector(this->Ref(), options_); } -grpc_core::UniqueTypeName TlsServerCredentials::type() const { +grpc_core::UniqueTypeName TlsServerCredentials::Type() { static grpc_core::UniqueTypeName::Factory kFactory("Tls"); return kFactory.Create(); } diff --git a/src/core/lib/security/credentials/tls/tls_credentials.h b/src/core/lib/security/credentials/tls/tls_credentials.h index fd78967d8f5..a22cd428657 100644 --- a/src/core/lib/security/credentials/tls/tls_credentials.h +++ b/src/core/lib/security/credentials/tls/tls_credentials.h @@ -62,7 +62,9 @@ class TlsServerCredentials final : public grpc_server_credentials { grpc_core::RefCountedPtr create_security_connector(const grpc_core::ChannelArgs& /* args */) override; - grpc_core::UniqueTypeName type() const override; + static grpc_core::UniqueTypeName Type(); + + grpc_core::UniqueTypeName type() const override { return Type(); } grpc_tls_credentials_options* options() const { return options_.get(); }