Bearer token to follow single definition rule for linker issues (logging tag definitions)

Author: sbaluja

src/aws-cpp-sdk-core/include/smithy/identity/auth/built-in/BearerTokenAuthSchemeOption.h

@@ -4,14 +4,13 @@
  */
 #pragma once
 
+#include <smithy/Smithy_EXPORTS.h>
 #include <smithy/identity/auth/AuthSchemeOption.h>
+
 namespace smithy
 {
-struct BearerTokenAuthSchemeOption
-{
-    static AuthSchemeOption bearerTokenAuthSchemeOption;
-};
-
-AuthSchemeOption BearerTokenAuthSchemeOption::bearerTokenAuthSchemeOption =
-    AuthSchemeOption("smithy.api#HTTPBearerAuth");
+    struct BearerTokenAuthSchemeOption
+    {
+        static SMITHY_API AuthSchemeOption bearerTokenAuthSchemeOption;
+    };
 } // namespace smithy

src/aws-cpp-sdk-core/include/smithy/identity/resolver/AwsBearerTokenIdentityResolver.h

@@ -17,8 +17,6 @@ class AwsBearerTokenIdentityResolver
     : public IdentityResolverBase<AwsBearerTokenIdentityBase>
 {
   public:
-    static const char BEARER_TOKEN_PROVIDER_CHAIN_LOG_TAG[];
-
     using IdentityT = AwsBearerTokenIdentity;
     virtual ~AwsBearerTokenIdentityResolver() = default;
 
@@ -57,7 +55,7 @@ class AwsBearerTokenIdentityResolver
             if (!bearerTokenProvider)
             {
                 AWS_LOGSTREAM_FATAL(
-                    BEARER_TOKEN_PROVIDER_CHAIN_LOG_TAG,
+                    "BearerTokenProvider",
                     "Unexpected nullptr in "
                     "DefaultBearerTokenProviderChain::m_providerChain");
                 return Aws::Client::AWSError<Aws::Client::CoreErrors>(
@@ -70,7 +68,7 @@ class AwsBearerTokenIdentityResolver
             if (!bearerToken.IsExpiredOrEmpty())
             {
                 auto outcomePtr = Aws::MakeUnique<AwsBearerTokenIdentity>(
-                    BEARER_TOKEN_PROVIDER_CHAIN_LOG_TAG);
+                    "BearerTokenProvider");
                 outcomePtr->token() = bearerToken.GetToken();
                 outcomePtr->expiration() = bearerToken.GetExpiration();
                 return ResolveIdentityFutureOutcome(std::move(outcomePtr));
@@ -104,8 +102,5 @@ class DefaultAwsBearerTokenIdentityResolver
         : AwsBearerTokenIdentityResolver(Aws::Vector<std::shared_ptr<Aws::Auth::AWSBearerTokenProviderBase>>{
               Aws::MakeShared<Aws::Auth::SSOBearerTokenProvider>("SSOBearerTokenProvider")}){};
 };
-const char
-    AwsBearerTokenIdentityResolver::BEARER_TOKEN_PROVIDER_CHAIN_LOG_TAG[] =
-        "BearerTokenProvider";
 
 } // namespace smithy

src/aws-cpp-sdk-core/include/smithy/identity/signer/built-in/BearerTokenSigner.h

@@ -21,7 +21,6 @@ class BearerTokenSigner : public AwsSignerBase<AwsBearerTokenIdentityBase>
 {
 
   public:
-    static const char LOGGING_TAG[];
 
     using BearerTokenAuthSchemeParameters =
         smithy::DefaultAuthSchemeResolverParameters;
@@ -44,7 +43,7 @@ class BearerTokenSigner : public AwsSignerBase<AwsBearerTokenIdentityBase>
             // security when making requests with bearer tokens.
             // https://datatracker.ietf.org/doc/html/rfc6750
             AWS_LOGSTREAM_ERROR(
-                LOGGING_TAG,
+                "BearerTokenSigner",
                 "HTTPS scheme must be used with a bearer token authorization");
             return SigningError(
                 Aws::Client::CoreErrors::INVALID_PARAMETER_VALUE, "",
@@ -71,5 +70,4 @@ class BearerTokenSigner : public AwsSignerBase<AwsBearerTokenIdentityBase>
     Aws::String m_region;
 };
 
-const char BearerTokenSigner::LOGGING_TAG[] = "BearerTokenSigner";
 } // namespace smithy

src/aws-cpp-sdk-core/source/smithy/identity/AuthSchemeOption.cpp

@@ -5,8 +5,10 @@
 #include <smithy/identity/auth/built-in/SigV4AuthSchemeOption.h>
 #include <smithy/identity/auth/built-in/SigV4aAuthSchemeOption.h>
 #include <smithy/identity/auth/built-in/NoAuthSchemeOption.h>
+#include <smithy/identity/auth/built-in/BearerTokenAuthSchemeOption.h>
 using namespace smithy;
 
 AuthSchemeOption SigV4AuthSchemeOption::sigV4AuthSchemeOption = AuthSchemeOption("aws.auth#sigv4");
 AuthSchemeOption SigV4aAuthSchemeOption::sigV4aAuthSchemeOption = AuthSchemeOption("aws.auth#sigv4a");
 AuthSchemeOption NoAuthSchemeOption::noAuthSchemeOption = AuthSchemeOption("smithy.api#noAuth");
+AuthSchemeOption BearerTokenAuthSchemeOption::bearerTokenAuthSchemeOption = AuthSchemeOption("smithy.api#HTTPBearerAuth");