Support query compatible trait only for json protocol (#3204)

.github/workflows/clang-format.yml

@@ -56,7 +56,7 @@ jobs:
         run: |
           clang-format --version
           if [ -s diff_output.patch ]; then
-            python3 clang-format-diff.py -p1 -style=file:.clang-format < diff_output.patch > formatted_differences.patch 2> error.log || true
+            python3 clang-format-diff.py -iregex '.*\.(cpp|cc|c\+\+|cxx|c|h|hh|hpp)' -p1 -style=file:.clang-format < diff_output.patch > formatted_differences.patch 2> error.log || true
             if [ -s error.log ]; then
               echo "Errors from clang-format-diff.py:"
               cat error.log
@@ -77,4 +77,4 @@ jobs:
             cat formatted_differences.patch
             rm formatted_differences.patch
             exit 1
-          fi
+          fi

generated/src/aws-cpp-sdk-sqs/include/aws/sqs/SQSErrorMarshaller.h

@@ -13,7 +13,7 @@ namespace Aws
 namespace Client
 {
 
-class AWS_SQS_API SQSErrorMarshaller : public Aws::Client::JsonErrorMarshaller
+class AWS_SQS_API SQSErrorMarshaller : public Aws::Client::JsonErrorMarshallerQueryCompatible
 {
 public:
   Aws::Client::AWSError<Aws::Client::CoreErrors> FindErrorByName(const char* exceptionName) const override;

generated/src/aws-cpp-sdk-sqs/include/aws/sqs/SQSRequest.h

@@ -31,6 +31,7 @@ namespace SQS
       if(headers.size() == 0 || (headers.size() > 0 && headers.count(Aws::Http::CONTENT_TYPE_HEADER) == 0))
       {
         headers.emplace(Aws::Http::HeaderValuePair(Aws::Http::CONTENT_TYPE_HEADER, Aws::AMZN_JSON_CONTENT_TYPE_1_0 ));
+        headers.emplace(Aws::Http::HeaderValuePair(Aws::Http::X_AMZN_QUERY_MODE,"true"));
       }
       headers.emplace(Aws::Http::HeaderValuePair(Aws::Http::API_VERSION_HEADER, "2012-11-05"));
       return headers;

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

@@ -43,6 +43,7 @@ namespace Aws
         // Allow ErrorMarshaller to set error payload.
         friend class XmlErrorMarshaller;
         friend class JsonErrorMarshaller;
+        friend class JsonErrorMarshallerQueryCompatible;
         template<typename T> friend class AWSError;
         public:
             /**

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

@@ -80,32 +80,43 @@ namespace Aws
         {
             using AWSErrorMarshaller::Marshall;
         public:
-            /**
-             * Converts an exceptionName and message into an Error object, if it can be parsed. Otherwise, it returns
-             * and AWSError with CoreErrors::UNKNOWN as the error type.
-             */
-            AWSError<CoreErrors> Marshall(const Aws::Http::HttpResponse& response) const override;
+         /**
+          * Converts an exceptionName and message into an Error object, if it
+          * can be parsed. Otherwise, it returns and AWSError with
+          * CoreErrors::UNKNOWN as the error type.
+          */
+         virtual AWSError<CoreErrors> Marshall(const Aws::Http::HttpResponse& response) const override;
 
-            AWSError<CoreErrors> BuildAWSError(const std::shared_ptr<Http::HttpResponse>& httpResponse) const override;
+         AWSError<CoreErrors> BuildAWSError(const std::shared_ptr<Http::HttpResponse>& httpResponse) const override;
 
         protected:
-            const Aws::Utils::Json::JsonValue& GetJsonPayloadFromError(const AWSError<CoreErrors>&) const;
+         const Aws::Utils::Json::JsonValue& GetJsonPayloadFromError(const AWSError<CoreErrors>&) const;
         };
 
-        class AWS_CORE_API XmlErrorMarshaller : public AWSErrorMarshaller
-        {
-            using AWSErrorMarshaller::Marshall;
-        public:
-            /**
-             * Converts an exceptionName and message into an Error object, if it can be parsed. Otherwise, it returns
-             * and AWSError with CoreErrors::UNKNOWN as the error type.
-             */
-            AWSError<CoreErrors> Marshall(const Aws::Http::HttpResponse& response) const override;
+        class AWS_CORE_API JsonErrorMarshallerQueryCompatible : public JsonErrorMarshaller {
+         public:
+          /**
+           * Converts an exceptionName and message into an Error object, if it
+           * can be parsed. Otherwise, it returns and AWSError with
+           * CoreErrors::UNKNOWN as the error type.
+           */
+          AWSError<CoreErrors> Marshall(const Aws::Http::HttpResponse& response) const override;
+        };
 
-            AWSError<CoreErrors> BuildAWSError(const std::shared_ptr<Http::HttpResponse>& httpResponse) const override;
+        class AWS_CORE_API XmlErrorMarshaller : public AWSErrorMarshaller {
+          using AWSErrorMarshaller::Marshall;
 
-        protected:
-            const Aws::Utils::Xml::XmlDocument& GetXmlPayloadFromError(const AWSError<CoreErrors>&) const;
+         public:
+          /**
+           * Converts an exceptionName and message into an Error object, if it can be parsed. Otherwise, it returns
+           * and AWSError with CoreErrors::UNKNOWN as the error type.
+           */
+          AWSError<CoreErrors> Marshall(const Aws::Http::HttpResponse& response) const override;
+
+          AWSError<CoreErrors> BuildAWSError(const std::shared_ptr<Http::HttpResponse>& httpResponse) const override;
+
+         protected:
+          const Aws::Utils::Xml::XmlDocument& GetXmlPayloadFromError(const AWSError<CoreErrors>&) const;
         };
 
     } // namespace Client

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

@@ -63,6 +63,7 @@ namespace Aws
         extern AWS_CORE_API const char CHUNKED_VALUE[];
         extern AWS_CORE_API const char AWS_CHUNKED_VALUE[];
         extern AWS_CORE_API const char X_AMZN_ERROR_TYPE[];
+        extern AWS_CORE_API const char X_AMZN_QUERY_MODE[];
 
         class HttpRequest;
         class HttpResponse;

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

@@ -1048,4 +1048,4 @@ void AWSClient::AppendRecursionDetectionHeader(std::shared_ptr<Aws::Http::HttpRe
     xAmznTraceIdVal = xAmznTraceIdValEncodedStr.str();
 
     ioRequest->SetHeaderValue(Aws::Http::X_AMZN_TRACE_ID_HEADER, xAmznTraceIdVal);
-}
+}