switch implementation to use return value

sbiscigl · sbiscigl · commit e00054656787 · 2025-08-28T14:24:19.000-04:00
diff --git a/generated/src/aws-cpp-sdk-s3-crt/include/aws/s3-crt/S3ExpressSigner.h b/generated/src/aws-cpp-sdk-s3-crt/include/aws/s3-crt/S3ExpressSigner.h
@@ -43,8 +43,6 @@ namespace Aws {
 
             Aws::Auth::AWSCredentials GetCredentials(const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) const override;
 
-            Aws::Auth::AWSCredentials GetCredentials(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) const override;
-
         protected:
             bool ServiceRequireUnsignedPayload(const String &serviceName) const override;
 
diff --git a/generated/src/aws-cpp-sdk-s3-crt/source/S3ExpressSigner.cpp b/generated/src/aws-cpp-sdk-s3-crt/source/S3ExpressSigner.cpp
@@ -95,8 +95,3 @@ Aws::Auth::AWSCredentials S3ExpressSigner::GetCredentials(const std::shared_ptr<
     auto identity = m_S3ExpressIdentityProvider->GetS3ExpressIdentity(serviceSpecificParameters);
     return {identity.getAccessKeyId(), identity.getSecretKeyId()};
 }
-
-Aws::Auth::AWSCredentials S3ExpressSigner::GetCredentials(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) const {
-    auto identity = m_S3ExpressIdentityProvider->GetS3ExpressIdentity(context, serviceSpecificParameters);
-    return {identity.getAccessKeyId(), identity.getSecretKeyId()};
-}
diff --git a/generated/src/aws-cpp-sdk-s3/include/aws/s3/S3ExpressSigner.h b/generated/src/aws-cpp-sdk-s3/include/aws/s3/S3ExpressSigner.h
@@ -43,8 +43,6 @@ namespace Aws {
 
             Aws::Auth::AWSCredentials GetCredentials(const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) const override;
 
-            Aws::Auth::AWSCredentials GetCredentials(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) const override;
-
         protected:
             bool ServiceRequireUnsignedPayload(const String &serviceName) const override;
 
diff --git a/generated/src/aws-cpp-sdk-s3/source/S3ExpressSigner.cpp b/generated/src/aws-cpp-sdk-s3/source/S3ExpressSigner.cpp
@@ -95,8 +95,3 @@ Aws::Auth::AWSCredentials S3ExpressSigner::GetCredentials(const std::shared_ptr<
     auto identity = m_S3ExpressIdentityProvider->GetS3ExpressIdentity(serviceSpecificParameters);
     return {identity.getAccessKeyId(), identity.getSecretKeyId()};
 }
-
-Aws::Auth::AWSCredentials S3ExpressSigner::GetCredentials(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) const {
-    auto identity = m_S3ExpressIdentityProvider->GetS3ExpressIdentity(context, serviceSpecificParameters);
-    return {identity.getAccessKeyId(), identity.getSecretKeyId()};
-}
diff --git a/src/aws-cpp-sdk-core/include/aws/core/auth/AWSCredentials.h b/src/aws-cpp-sdk-core/include/aws/core/auth/AWSCredentials.h
@@ -6,12 +6,42 @@
  #pragma once
 
 #include <aws/core/Core_EXPORTS.h>
+#include <aws/core/client/UserAgent.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/core/utils/DateTime.h>
 namespace Aws
 {
     namespace Auth
     {
+        /**
+         * Context class for credential resolution that tracks features used during credential retrieval.
+         */
+        class AWS_CORE_API CredentialsResolutionContext
+        {
+        public:
+          // Default constructor - no features tracked
+          CredentialsResolutionContext() = default;
+
+          /**
+           * Add a user agent feature to track credential usage.
+           */
+          void AddUserAgentFeature(Aws::Client::UserAgentFeature feature)
+          {
+            m_features.insert(feature);
+          }
+
+          /**
+           * Get all tracked credential features.
+           */
+          const Aws::Set<Aws::Client::UserAgentFeature>& GetUserAgentFeatures() const
+          {
+            return m_features;
+          }
+
+        private:
+          Aws::Set<Aws::Client::UserAgentFeature> m_features;
+        };
+
         /**
          * Simple data object around aws credentials
          */
@@ -214,12 +244,24 @@ namespace Aws
                 m_expiration = expiration;
             }
 
+            /**
+             * Gets credential resolution context. this is information about the call
+             * such as what credentials provider was used to to resolve the credentials
+             */
+            inline CredentialsResolutionContext GetContext() { return m_context; }
+
+            /**
+             * Adds a user agent feature used during credentials resolution to the credentials
+             * context. This is useful to track which credentials provider was used.
+             */
+            inline void AddUserAgentFeatire(Aws::Client::UserAgentFeature feature) { m_context.AddUserAgentFeature(feature); }
         private:
             Aws::String m_accessKeyId;
             Aws::String m_secretKey;
             Aws::String m_sessionToken;
             Aws::Utils::DateTime m_expiration;
             Aws::String m_accountId;
+            CredentialsResolutionContext m_context;
         };
     }
 }
diff --git a/src/aws-cpp-sdk-core/include/aws/core/auth/AWSCredentialsProvider.h b/src/aws-cpp-sdk-core/include/aws/core/auth/AWSCredentialsProvider.h
@@ -18,7 +18,6 @@
 #include <aws/core/auth/AWSCredentials.h>
 #include <aws/core/config/AWSProfileConfigLoader.h>
 #include <aws/core/client/RetryStrategy.h>
-#include <aws/core/client/UserAgent.h>
 #include <aws/core/utils/memory/stl/AWSSet.h>
 #include <memory>
 
@@ -30,34 +29,6 @@ namespace Aws
     }
     namespace Auth
     {
-        /**
-         * Context class for credential resolution that tracks features used during credential retrieval.
-         */
-        class AWS_CORE_API CredentialsResolutionContext
-        {
-        public:
-            // Default constructor - no features tracked
-            CredentialsResolutionContext() = default;
-
-            /**
-             * Add a user agent feature to track credential usage.
-             */
-            void AddUserAgentFeature(Aws::Client::UserAgentFeature feature)
-            {
-                m_features.insert(feature);
-            }
-            
-            /**
-             * Get all tracked credential features.
-             */
-            const Aws::Set<Aws::Client::UserAgentFeature>& GetUserAgentFeatures() const
-            {
-                return m_features;
-            }
-
-        private:
-            Aws::Set<Aws::Client::UserAgentFeature> m_features;
-        };
         constexpr int REFRESH_THRESHOLD = 1000 * 60 * 5;
 
         constexpr int AWS_CREDENTIAL_PROVIDER_EXPIRATION_GRACE_PERIOD = 5 * 1000;
@@ -102,14 +73,6 @@ namespace Aws
              * The core of the credential provider interface. Override this method to control how credentials are retrieved.
              */
             virtual AWSCredentials GetAWSCredentials() = 0;
-
-            /**
-             * Interface that allows providers to populate context during credential retrieval.
-             */
-            virtual AWSCredentials GetAWSCredentials(CredentialsResolutionContext& context) {
-                AWS_UNREFERENCED_PARAM(context);
-                return GetAWSCredentials();
-            }
             
         protected:
             /**
@@ -182,11 +145,6 @@ namespace Aws
             * are not found, empty credentials are returned. Credentials are not cached.
             */
             AWSCredentials GetAWSCredentials() override;
-            
-            /**
-            * Context-based interface that adds environment credential tracking.
-            */
-            AWSCredentials GetAWSCredentials(CredentialsResolutionContext& context) override;
         };
 
         /**
diff --git a/src/aws-cpp-sdk-core/include/aws/core/auth/AWSCredentialsProviderChain.h b/src/aws-cpp-sdk-core/include/aws/core/auth/AWSCredentialsProviderChain.h
@@ -29,13 +29,6 @@ namespace Aws
              */
             virtual AWSCredentials GetAWSCredentials();
 
-            /**
-             * When a credentials provider in the chain returns empty credentials,
-             * We go on to the next provider until we have either exhausted the installed providers in the chain or something returns non-empty credentials.
-             * This overload populates the context with credential tracking information.
-             */
-            virtual AWSCredentials GetAWSCredentials(CredentialsResolutionContext& context);
-
             /**
              * Gets all providers stored in this chain.
              */
diff --git a/src/aws-cpp-sdk-core/include/aws/core/auth/signer/AWSAuthV4Signer.h b/src/aws-cpp-sdk-core/include/aws/core/auth/signer/AWSAuthV4Signer.h
@@ -184,8 +184,6 @@ namespace Aws
 
             virtual Aws::Auth::AWSCredentials GetCredentials(const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) const;
 
-            virtual Aws::Auth::AWSCredentials GetCredentials(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) const;
-
             Aws::String GetServiceName() const { return m_serviceName; }
             Aws::String GetRegion() const { return m_region; }
             Aws::String GenerateSignature(const Aws::Auth::AWSCredentials& credentials,
diff --git a/src/aws-cpp-sdk-core/include/aws/core/client/UserAgent.h b/src/aws-cpp-sdk-core/include/aws/core/client/UserAgent.h
@@ -32,7 +32,6 @@ enum class UserAgentFeature {
   ACCOUNT_ID_MODE_REQUIRED,
   RESOLVED_ACCOUNT_ID,
   GZIP_REQUEST_COMPRESSION,
-  CREDENTIALS_SIGV4_SIGNER,
   CREDENTIALS_ENV_VARS,
 };
 
diff --git a/src/aws-cpp-sdk-core/source/auth/AWSCredentialsProvider.cpp b/src/aws-cpp-sdk-core/source/auth/AWSCredentialsProvider.cpp
@@ -103,16 +103,11 @@ AWSCredentials EnvironmentAWSCredentialsProvider::GetAWSCredentials()
             AWS_LOGSTREAM_DEBUG(ENVIRONMENT_LOG_TAG, "Found accountId");
         }
     }
-    
-    return credentials;
-}
 
-AWSCredentials EnvironmentAWSCredentialsProvider::GetAWSCredentials(CredentialsResolutionContext& context)
-{
-    AWSCredentials credentials = GetAWSCredentials();
     if (!credentials.IsEmpty()) {
-        context.AddUserAgentFeature(Aws::Client::UserAgentFeature::CREDENTIALS_ENV_VARS);
+      credentials.AddUserAgentFeatire(UserAgentFeature::CREDENTIALS_ENV_VARS);
     }
+
     return credentials;
 }
 
diff --git a/src/aws-cpp-sdk-core/source/auth/AWSCredentialsProviderChain.cpp b/src/aws-cpp-sdk-core/source/auth/AWSCredentialsProviderChain.cpp
@@ -41,29 +41,6 @@ AWSCredentials AWSCredentialsProviderChain::GetAWSCredentials()
     return AWSCredentials();
 }
 
-AWSCredentials AWSCredentialsProviderChain::GetAWSCredentials(CredentialsResolutionContext& context)
-{
-    ReaderLockGuard lock(m_cachedProviderLock);
-    if (m_cachedProvider) {
-      AWSCredentials credentials = m_cachedProvider->GetAWSCredentials(context);
-      if (!credentials.GetAWSAccessKeyId().empty() && !credentials.GetAWSSecretKey().empty())
-      {
-        return credentials;
-      }
-    }
-    lock.UpgradeToWriterLock();
-    for (auto&& credentialsProvider : m_providerChain)
-    {
-        AWSCredentials credentials = credentialsProvider->GetAWSCredentials(context);
-        if (!credentials.GetAWSAccessKeyId().empty() && !credentials.GetAWSSecretKey().empty())
-        {
-            m_cachedProvider = credentialsProvider;
-            return credentials;
-        }
-    }
-    return AWSCredentials();
-}
-
 DefaultAWSCredentialsProviderChain::DefaultAWSCredentialsProviderChain() : AWSCredentialsProviderChain()
 {
     AddProvider(Aws::MakeShared<EnvironmentAWSCredentialsProvider>(DefaultCredentialsProviderChainTag));
diff --git a/src/aws-cpp-sdk-core/source/auth/signer/AWSAuthV4Signer.cpp b/src/aws-cpp-sdk-core/source/auth/signer/AWSAuthV4Signer.cpp
@@ -26,6 +26,7 @@
 
 #include <iomanip>
 #include <cstring>
+#include <numeric>
 
 using namespace Aws;
 using namespace Aws::Client;
@@ -81,12 +82,9 @@ AWSAuthV4Signer::~AWSAuthV4Signer()
 bool AWSAuthV4Signer::SignRequestWithSigV4a(Aws::Http::HttpRequest& request, const char* region, const char* serviceName,
     bool signBody, long long expirationTimeInSeconds, Aws::Crt::Auth::SignatureType signatureType) const
 {
-    Aws::Auth::CredentialsResolutionContext context;
-    AWSCredentials credentials = GetCredentials(context, request.GetServiceSpecificParameters());
-
-    context.AddUserAgentFeature(Aws::Client::UserAgentFeature::CREDENTIALS_SIGV4_SIGNER);
+    AWSCredentials credentials = GetCredentials(request.GetServiceSpecificParameters());
     
-    UpdateUserAgentWithCredentialFeatures(request, context);
+    UpdateUserAgentWithCredentialFeatures(request, credentials.GetContext());
     auto crtCredentials = Aws::MakeShared<Aws::Crt::Auth::Credentials>(v4AsymmetricLogTag,
         Aws::Crt::ByteCursorFromCString(credentials.GetAWSAccessKeyId().c_str()),
         Aws::Crt::ByteCursorFromCString(credentials.GetAWSSecretKey().c_str()),
@@ -341,12 +339,9 @@ bool AWSAuthV4Signer::SignRequestWithCreds(Aws::Http::HttpRequest& request, cons
 
 bool AWSAuthV4Signer::SignRequest(Aws::Http::HttpRequest& request, const char* region, const char* serviceName, bool signBody) const
 {
-    Aws::Auth::CredentialsResolutionContext context;
-    AWSCredentials credentials = GetCredentials(context, request.GetServiceSpecificParameters());
-
-    context.AddUserAgentFeature(Aws::Client::UserAgentFeature::CREDENTIALS_SIGV4_SIGNER);
+    AWSCredentials credentials = GetCredentials(request.GetServiceSpecificParameters());
     
-    UpdateUserAgentWithCredentialFeatures(request, context);
+    UpdateUserAgentWithCredentialFeatures(request, credentials.GetContext());
     
     return SignRequestWithCreds(request, credentials, region, serviceName, signBody);
 }
@@ -475,12 +470,9 @@ bool AWSAuthV4Signer::PresignRequest(Aws::Http::HttpRequest& request, const Aws:
 
 bool AWSAuthV4Signer::PresignRequest(Aws::Http::HttpRequest& request, const char* region, const char* serviceName, long long expirationTimeInSeconds) const
 {
-    Aws::Auth::CredentialsResolutionContext context;
-    AWSCredentials credentials = GetCredentials(context, request.GetServiceSpecificParameters());
-
-    context.AddUserAgentFeature(Aws::Client::UserAgentFeature::CREDENTIALS_SIGV4_SIGNER);
+    AWSCredentials credentials = GetCredentials(request.GetServiceSpecificParameters());
     
-    UpdateUserAgentWithCredentialFeatures(request, context);
+    UpdateUserAgentWithCredentialFeatures(request, credentials.GetContext());
     
     return PresignRequest(request, credentials, region,serviceName, expirationTimeInSeconds );
 }
@@ -614,11 +606,6 @@ Aws::Auth::AWSCredentials AWSAuthV4Signer::GetCredentials(const std::shared_ptr<
     return m_credentialsProvider->GetAWSCredentials();
 }
 
-Aws::Auth::AWSCredentials AWSAuthV4Signer::GetCredentials(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) const {
-    AWS_UNREFERENCED_PARAM(serviceSpecificParameters);
-    return m_credentialsProvider->GetAWSCredentials(context);
-}
-
 void AWSAuthV4Signer::UpdateUserAgentWithCredentialFeatures(Aws::Http::HttpRequest& request, const Aws::Auth::CredentialsResolutionContext& context) const {
     if (!request.HasHeader(USER_AGENT)) {
         AWS_LOGSTREAM_DEBUG(v4LogTag, "Request does not have User-Agent header, skipping credential feature update");
@@ -638,25 +625,6 @@ void AWSAuthV4Signer::UpdateUserAgentWithCredentialFeatures(Aws::Http::HttpReque
             case Aws::Client::UserAgentFeature::CREDENTIALS_ENV_VARS:
                 featureStr = "g";
                 break;
-            case Aws::Client::UserAgentFeature::CREDENTIALS_SIGV4_SIGNER:
-                if (request.HasHeader(USER_AGENT)) {
-                    auto userAgentParts = Aws::Utils::StringUtils::Split(request.GetHeaderValue(USER_AGENT), ' ');
-                    
-                    // Find position to insert metadata (before metrics section)
-                    auto metricsIt = std::find_if(userAgentParts.begin(), userAgentParts.end(),
-                        [](const Aws::String& part) { return part.find("m/") == 0; });
-                        
-                    // Insert metadata at appropriate position
-                    userAgentParts.insert(metricsIt, "md/override_get_credentials");
-                    
-                    // Reassemble with spaces
-                    Aws::String newUserAgent = userAgentParts.front();
-                    for (auto it = std::next(userAgentParts.begin()); it != userAgentParts.end(); ++it) {
-                        newUserAgent += " " + *it;
-                    }
-                    request.SetHeaderValue(USER_AGENT, newUserAgent);
-                }
-                break;
             default:
                 break;
         }
@@ -670,7 +638,7 @@ void AWSAuthV4Signer::UpdateUserAgentWithCredentialFeatures(Aws::Http::HttpReque
     }
   
     if (!credentialFeatures.str().empty()) {
-        Aws::String userAgent = request.GetHeaderValue(USER_AGENT);
+        const auto userAgent = request.GetHeaderValue(USER_AGENT);
         auto userAgentParsed = Aws::Utils::StringUtils::Split(userAgent, ' ');
         auto metricsSegment = std::find_if(userAgentParsed.begin(), userAgentParsed.end(), 
             [](const Aws::String& value) { return value.find("m/") != Aws::String::npos; });
@@ -684,10 +652,12 @@ void AWSAuthV4Signer::UpdateUserAgentWithCredentialFeatures(Aws::Http::HttpReque
         }
         
         // Reassemble all parts with spaces
-        Aws::String newUserAgent = userAgentParsed.front();
-        for (auto it = std::next(userAgentParsed.begin()); it != userAgentParsed.end(); ++it) {
-            newUserAgent += " " + *it;
-        }
+        const auto newUserAgent =  std::accumulate(std::next(userAgentParsed.begin()),
+          userAgentParsed.end(),
+          userAgentParsed.front(),
+          [](const std::string& a, const std::string& b) {
+            return a + " " + b;
+          });
         request.SetUserAgent(newUserAgent);
     }
 }
diff --git a/src/aws-cpp-sdk-core/source/client/UserAgent.cpp b/src/aws-cpp-sdk-core/source/client/UserAgent.cpp
@@ -42,7 +42,6 @@ const std::pair<UserAgentFeature, const char*> BUSINESS_METRIC_MAPPING[] = {
     {UserAgentFeature::ACCOUNT_ID_MODE_REQUIRED, "R"},
     {UserAgentFeature::RESOLVED_ACCOUNT_ID, "T"},
     {UserAgentFeature::GZIP_REQUEST_COMPRESSION, "L"},
-    {UserAgentFeature::CREDENTIALS_SIGV4_SIGNER, "MD"},
     {UserAgentFeature::CREDENTIALS_ENV_VARS, "g"},
 };
 
diff --git a/tests/aws-cpp-sdk-core-tests/aws/auth/CredentialTrackingTest.cpp b/tests/aws-cpp-sdk-core-tests/aws/auth/CredentialTrackingTest.cpp
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/S3ExpressSignerHeader.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/S3ExpressSignerHeader.vm
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/S3ExpressSignerSource.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/S3ExpressSignerSource.vm

Original file line number	Diff line number	Diff line change
`@@ -95,8 +95,3 @@ Aws::Auth::AWSCredentials S3ExpressSigner::GetCredentials(const std::shared_ptr<`
`95`	`95`	`auto identity = m_S3ExpressIdentityProvider->GetS3ExpressIdentity(serviceSpecificParameters);`
`96`	`96`	`return {identity.getAccessKeyId(), identity.getSecretKeyId()};`
`97`	`97`	`}`
`98`		`-`
`99`		`-Aws::Auth::AWSCredentials S3ExpressSigner::GetCredentials(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) const {`
`100`		`- auto identity = m_S3ExpressIdentityProvider->GetS3ExpressIdentity(context, serviceSpecificParameters);`
`101`		`- return {identity.getAccessKeyId(), identity.getSecretKeyId()};`
`102`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -103,16 +103,11 @@ AWSCredentials EnvironmentAWSCredentialsProvider::GetAWSCredentials()`
`103`	`103`	`AWS_LOGSTREAM_DEBUG(ENVIRONMENT_LOG_TAG, "Found accountId");`
`104`	`104`	`}`
`105`	`105`	`}`
`106`		`-`
`107`		`- return credentials;`
`108`		`-}`
`109`	`106`
`110`		`-AWSCredentials EnvironmentAWSCredentialsProvider::GetAWSCredentials(CredentialsResolutionContext& context)`
`111`		`-{`
`112`		`- AWSCredentials credentials = GetAWSCredentials();`
`113`	`107`	`if (!credentials.IsEmpty()) {`
`114`		`- context.AddUserAgentFeature(Aws::Client::UserAgentFeature::CREDENTIALS_ENV_VARS);`
	`108`	`+ credentials.AddUserAgentFeatire(UserAgentFeature::CREDENTIALS_ENV_VARS);`
`115`	`109`	`}`
	`110`	`+`
`116`	`111`	`return credentials;`
`117`	`112`	`}`
`118`	`113`