Revert "[C++] SDKs to track feature Ids for Credentials (ENV)(#3516)"

This reverts commit 27bb163.

Author: sbiscigl

src/aws-cpp-sdk-core/include/aws/core/auth/AWSCredentials.h

@@ -6,42 +6,12 @@
  #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
          */
@@ -244,24 +214,12 @@ 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 AddUserAgentFeature(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;
         };
     }
 }

src/aws-cpp-sdk-core/include/aws/core/auth/signer/AWSAuthV4Signer.h

@@ -36,7 +36,6 @@ namespace Aws
     {
         class AWSCredentials;
         class AWSCredentialsProvider;
-        class CredentialsResolutionContext;
 
         enum class AWSSigningAlgorithm
         {
@@ -192,7 +191,6 @@ namespace Aws
 
         protected:
             virtual bool ServiceRequireUnsignedPayload(const Aws::String& serviceName) const;
-            void UpdateUserAgentWithCredentialFeatures(Aws::Http::HttpRequest& request, const Aws::Auth::CredentialsResolutionContext& context) const;
             bool m_includeSha256HashHeader;
 
         private:

src/aws-cpp-sdk-core/include/aws/core/client/UserAgent.h

@@ -32,12 +32,10 @@ enum class UserAgentFeature {
   ACCOUNT_ID_MODE_REQUIRED,
   RESOLVED_ACCOUNT_ID,
   GZIP_REQUEST_COMPRESSION,
-  CREDENTIALS_ENV_VARS,
 };
 
 class AWS_CORE_API UserAgent {
  public:
-  static Aws::String BusinessMetricForFeature(UserAgentFeature feature);
   explicit UserAgent(const ClientConfiguration& clientConfiguration, const Aws::String& retryStrategyName, const Aws::String& apiName);
   Aws::String SerializeWithFeatures(const Aws::Set<UserAgentFeature>& features) const;
   void SetApiName(const Aws::String& apiName) { m_api = apiName; }

src/aws-cpp-sdk-core/source/auth/AWSCredentialsProvider.cpp

@@ -18,7 +18,6 @@
 #include <aws/core/client/AWSError.h>
 #include <aws/core/utils/StringUtils.h>
 #include <aws/core/utils/xml/XmlSerializer.h>
-#include <aws/core/client/UserAgent.h>
 #include <cstdlib>
 #include <fstream>
 #include <string.h>
@@ -104,10 +103,6 @@ AWSCredentials EnvironmentAWSCredentialsProvider::GetAWSCredentials()
         }
     }
 
-    if (!credentials.IsEmpty()) {
-      credentials.AddUserAgentFeature(UserAgentFeature::CREDENTIALS_ENV_VARS);
-    }
-
     return credentials;
 }
 

src/aws-cpp-sdk-core/source/auth/signer/AWSAuthV4Signer.cpp

@@ -8,7 +8,6 @@
 #include <aws/core/auth/signer/AWSAuthSignerHelper.h>
 
 #include <aws/core/auth/AWSCredentialsProvider.h>
-#include <aws/core/client/UserAgent.h>
 #include <aws/core/http/HttpRequest.h>
 #include <aws/core/http/URI.h>
 #include <aws/core/utils/DateTime.h>
@@ -26,7 +25,6 @@
 
 #include <iomanip>
 #include <cstring>
-#include <numeric>
 
 using namespace Aws;
 using namespace Aws::Client;
@@ -83,8 +81,6 @@ bool AWSAuthV4Signer::SignRequestWithSigV4a(Aws::Http::HttpRequest& request, con
     bool signBody, long long expirationTimeInSeconds, Aws::Crt::Auth::SignatureType signatureType) const
 {
     AWSCredentials credentials = GetCredentials(request.GetServiceSpecificParameters());
-    
-    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()),
@@ -340,9 +336,6 @@ bool AWSAuthV4Signer::SignRequestWithCreds(Aws::Http::HttpRequest& request, cons
 bool AWSAuthV4Signer::SignRequest(Aws::Http::HttpRequest& request, const char* region, const char* serviceName, bool signBody) const
 {
     AWSCredentials credentials = GetCredentials(request.GetServiceSpecificParameters());
-    
-    UpdateUserAgentWithCredentialFeatures(request, credentials.GetContext());
-    
     return SignRequestWithCreds(request, credentials, region, serviceName, signBody);
 }
 
@@ -471,9 +464,6 @@ 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
 {
     AWSCredentials credentials = GetCredentials(request.GetServiceSpecificParameters());
-    
-    UpdateUserAgentWithCredentialFeatures(request, credentials.GetContext());
-    
     return PresignRequest(request, credentials, region,serviceName, expirationTimeInSeconds );
 }
 
@@ -605,51 +595,3 @@ Aws::Auth::AWSCredentials AWSAuthV4Signer::GetCredentials(const std::shared_ptr<
     AWS_UNREFERENCED_PARAM(serviceSpecificParameters);
     return m_credentialsProvider->GetAWSCredentials();
 }
-
-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");
-        return;
-    }
-
-    const auto features = context.GetUserAgentFeatures();
-    if (features.empty()) {
-        AWS_LOGSTREAM_DEBUG(v4LogTag, "No credential features to add to User-Agent");
-        return;
-    }
-
-    std::vector<Aws::String> businessMetrics(features.size());
-    std::transform(features.begin(),
-      features.end(),
-      businessMetrics.begin(),
-      [](UserAgentFeature feature) -> Aws::String { return UserAgent::BusinessMetricForFeature(feature); });
-
-    const auto credentialFeatures = std::accumulate(std::next(businessMetrics.begin()),
-      businessMetrics.end(),
-      businessMetrics.front(),
-      [](const Aws::String& a, const Aws::String& b) {
-        return a + "," + b;
-      });
-
-    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; });
-
-    if (metricsSegment != userAgentParsed.end()) {
-        // Add new metrics to existing metrics section
-        *metricsSegment = Aws::String{*metricsSegment + "," + credentialFeatures};
-    } else {
-        // No metrics section exists, add new one
-        userAgentParsed.push_back("m/" + credentialFeatures);
-    }
-
-    // Reassemble all parts with spaces
-    const auto newUserAgent =  std::accumulate(std::next(userAgentParsed.begin()),
-      userAgentParsed.end(),
-      userAgentParsed.front(),
-      [](const Aws::String& a, const Aws::String& b) {
-        return a + " " + b;
-      });
-    request.SetUserAgent(newUserAgent);
-}

src/aws-cpp-sdk-core/source/client/UserAgent.cpp

@@ -42,9 +42,19 @@ 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_ENV_VARS, "g"},
 };
 
+Aws::String BusinessMetricForFeature(UserAgentFeature feature) {
+  const auto* const metric =
+      std::find_if(std::begin(BUSINESS_METRIC_MAPPING), std::end(BUSINESS_METRIC_MAPPING),
+                   [feature](const std::pair<UserAgentFeature, const char*>& pair) -> bool { return pair.first == feature; });
+  if (metric == std::end(BUSINESS_METRIC_MAPPING)) {
+    AWS_LOGSTREAM_ERROR(LOG_TAG, "business metric mapping not found for feature");
+    return {};
+  }
+  return metric->second;
+}
+
 const std::pair<const char*, UserAgentFeature> RETRY_FEATURE_MAPPING[] = {
     {"default", UserAgentFeature::RETRY_MODE_LEGACY},
     {"standard", UserAgentFeature::RETRY_MODE_STANDARD},
@@ -86,17 +96,6 @@ const char* APP_ID = "app";
 const char* BUSINESS_METRICS = "m";
 }  // namespace
 
-Aws::String UserAgent::BusinessMetricForFeature(UserAgentFeature feature) {
-  const auto* const metric =
-      std::find_if(std::begin(BUSINESS_METRIC_MAPPING), std::end(BUSINESS_METRIC_MAPPING),
-                   [feature](const std::pair<UserAgentFeature, const char*>& pair) -> bool { return pair.first == feature; });
-  if (metric == std::end(BUSINESS_METRIC_MAPPING)) {
-    AWS_LOGSTREAM_ERROR(LOG_TAG, "business metric mapping not found for feature");
-    return {};
-  }
-  return metric->second;
-}
-
 UserAgent::UserAgent(const ClientConfiguration& clientConfiguration,
   const Aws::String& retryStrategyName,
   const Aws::String& apiName)