Feature ID tracking for CBOR

Removed magic strings "smithy-protocol" and "rpc-v2-cbor" and placed into Aws::Http::SMITHY_PROTOCOL_HEADER & Aws::RPC_V2_CBOR

Author: sbaluja

src/aws-cpp-sdk-core/include/aws/core/AmazonSerializableWebServiceRequest.h

@@ -21,6 +21,7 @@ namespace Aws
     static const char AMZN_XML_CONTENT_TYPE[]              = "application/xml";
     static const char AMZN_EVENTSTREAM_CONTENT_TYPE[]      = "application/vnd.amazon.eventstream";
     static const char CBOR_CONTENT_TYPE[]                  = "application/cbor";
+    static const char RPC_V2_CBOR[]                        = "rpc-v2-cbor";
 
     /**
      * High-level abstraction over AWS requests. GetBody() calls SerializePayload() and uses a stringbuf under the hood.

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

@@ -42,6 +42,7 @@ enum class UserAgentFeature {
   CREDENTIALS_SSO,
   CREDENTIALS_SSO_LEGACY,
   CREDENTIALS_PROFILE_SOURCE_PROFILE,
+  PROTOCOL_RPC_V2_CBOR,
 };
 
 class AWS_CORE_API UserAgent {

src/aws-cpp-sdk-core/include/aws/core/http/HttpRequest.h

@@ -59,6 +59,7 @@ namespace Aws
         extern AWS_CORE_API const char AWS_TRAILER_HEADER[];
         extern AWS_CORE_API const char SDK_INVOCATION_ID_HEADER[];
         extern AWS_CORE_API const char SDK_REQUEST_HEADER[];
+        extern AWS_CORE_API const char SMITHY_PROTOCOL_HEADER[];
         extern AWS_CORE_API const char X_AMZN_TRACE_ID_HEADER[];
         extern AWS_CORE_API const char CHUNKED_VALUE[];
         extern AWS_CORE_API const char AWS_CHUNKED_VALUE[];

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

@@ -927,6 +927,11 @@ void AWSClient::BuildHttpRequest(const Aws::AmazonWebServiceRequest& request, co
         }
     }
 
+    if (httpRequest->HasHeader(Aws::Http::SMITHY_PROTOCOL_HEADER))
+    {
+        request.AddUserAgentFeature(Aws::Client::UserAgentFeature::PROTOCOL_RPC_V2_CBOR);
+    }
+
     // Pass along handlers for processing data sent/received in bytes
     httpRequest->SetHeadersReceivedEventHandler(request.GetHeadersReceivedEventHandler());
     httpRequest->SetDataReceivedEventHandler(request.GetDataReceivedEventHandler());

src/aws-cpp-sdk-core/source/http/HttpRequest.cpp

@@ -37,6 +37,7 @@ namespace Aws
         const char AWS_TRAILER_HEADER[] = "x-amz-trailer";
         const char SDK_INVOCATION_ID_HEADER[] = "amz-sdk-invocation-id";
         const char SDK_REQUEST_HEADER[] = "amz-sdk-request";
+        const char SMITHY_PROTOCOL_HEADER[] = "smithy-protocol";
         const char CHUNKED_VALUE[] = "chunked";
         const char AWS_CHUNKED_VALUE[] = "aws-chunked";
         const char X_AMZN_TRACE_ID_HEADER[] = "X-Amzn-Trace-Id";

tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/CborCppClientGenerator.java

@@ -122,15 +122,15 @@ protected SdkFileEntry generateModelSourceFile(ServiceModel serviceModel, Map.En
                     HashMap<String, String> headersMap = new HashMap<>(10);
                     headersMap.put("Aws::Http::CONTENT_TYPE_HEADER", "Aws::AMZN_EVENTSTREAM_CONTENT_TYPE");
                     headersMap.put("Aws::Http::ACCEPT_HEADER", "Aws::AMZN_EVENTSTREAM_CONTENT_TYPE");
-                    headersMap.put("\"smithy-protocol\"", "\"rpc-v2-cbor\"");
+                    headersMap.put("Aws::Http::SMITHY_PROTOCOL_HEADER", "Aws::RPC_V2_CBOR");
                     context.put("requestSpecificHeaders", headersMap);
                 }
                 template = velocityEngine.getTemplate("/com/amazonaws/util/awsclientgenerator/velocity/cpp/StreamRequestSource.vm", StandardCharsets.UTF_8.name());
             }
             else if (shape.isRequest()) {
                 Map<String, String> cborSpecificHeaders = new HashMap<>();
                 cborSpecificHeaders.put("Aws::Http::ACCEPT_HEADER", "Aws::CBOR_CONTENT_TYPE");
-                cborSpecificHeaders.put("\"smithy-protocol\"", "\"rpc-v2-cbor\"");
+                cborSpecificHeaders.put("Aws::Http::SMITHY_PROTOCOL_HEADER", "Aws::RPC_V2_CBOR");
                 if(shape.hasMembers()){
                     cborSpecificHeaders.put("Aws::Http::CONTENT_TYPE_HEADER", "Aws::CBOR_CONTENT_TYPE");
                 }