Add tests for services that have AwsQueryCompatible trait. Add x-amzn-query-mode header (#3861)

peterrsongg · web-flow · commit b784c1049fd8 · 2025-06-04T10:51:54.000-07:00
* first commit

* non generated changes to support x-amzn-query-mode and x-amzn-query-error test cases

* generated changes

* Add query compatible tests, remove generated change in acm csproj and remove implicit usings
diff --git a/generator/.DevConfigs/00d72ac5-72f9-4bfa-a341-85958d476672.json b/generator/.DevConfigs/00d72ac5-72f9-4bfa-a341-85958d476672.json
@@ -0,0 +1,9 @@
+{
+  "core": {
+    "changeLogMessages": [
+      "Add x-amzn-query-mode header and query compatible tests. The sdk will send a new header x-amzn-query-mode, if the service has the awsQueryCompatibleTrait applied to it. This is to inform the service that the client is running in query compatible mode."
+    ],
+    "type": "patch",
+    "updateMinimum": true
+  }
+}
diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCRequestMarshaller.cs b/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCRequestMarshaller.cs
diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCRequestMarshaller.tt b/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCRequestMarshaller.tt
@@ -102,6 +102,12 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
             request.HttpMethod = "<#=this.Operation.HttpMethod #>";
 
 <#
+	if (this.Config.ServiceModel.IsAwsQueryCompatible)
+	{
+#>
+			request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
+<#
+	}
 	var requestStructure = this.Operation.RequestStructure;
 	
     // Generates code to add members of the request to the request being created by the marshaller
diff --git a/sdk/AWSSDK.CoreAndCustomUnitTests.NetFramework.sln b/sdk/AWSSDK.CoreAndCustomUnitTests.NetFramework.sln
@@ -50,6 +50,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SSO.NetFramework", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.KeyManagementService.NetFramework", "src\Services\KeyManagementService\AWSSDK.KeyManagementService.NetFramework.csproj", "{F0397317-53D7-4B42-8D15-9E02083BF5D3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AWSSDK.SQS.NetFramework", "src\Services\SQS\AWSSDK.SQS.NetFramework.csproj", "{0329EB93-BFEA-2ED1-DFB4-2EEA803B8902}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -140,6 +142,10 @@ Global
 		{F0397317-53D7-4B42-8D15-9E02083BF5D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F0397317-53D7-4B42-8D15-9E02083BF5D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F0397317-53D7-4B42-8D15-9E02083BF5D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0329EB93-BFEA-2ED1-DFB4-2EEA803B8902}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0329EB93-BFEA-2ED1-DFB4-2EEA803B8902}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0329EB93-BFEA-2ED1-DFB4-2EEA803B8902}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0329EB93-BFEA-2ED1-DFB4-2EEA803B8902}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -166,6 +172,7 @@ Global
 		{4608625B-B089-49B0-A3C3-F18DC5FFCEA5} = {4CD78D56-2ABB-4F58-A0CB-08CED1B06370}
 		{685155AC-D4AE-41ED-A76E-388D0F66D6F8} = {4CD78D56-2ABB-4F58-A0CB-08CED1B06370}
 		{F0397317-53D7-4B42-8D15-9E02083BF5D3} = {4CD78D56-2ABB-4F58-A0CB-08CED1B06370}
+		{0329EB93-BFEA-2ED1-DFB4-2EEA803B8902} = {4CD78D56-2ABB-4F58-A0CB-08CED1B06370}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BBAD3467-3B24-41C1-898E-1B34BB9931DE}
diff --git a/sdk/src/Core/Amazon.Util/HeaderKeys.cs b/sdk/src/Core/Amazon.Util/HeaderKeys.cs
@@ -112,5 +112,6 @@ public abstract class HeaderKeys
         public const string AmzSdkRequest = "amz-sdk-request";
         public const string XAmzQueryError = "x-amzn-query-error";
         public const string XAmzS3ExpressSessionTokenQueryParam = "X-Amz-S3session-Token";
+        public const string XAmzQueryMode = "x-amzn-query-mode";
     }
 }
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/AddPermissionRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/AddPermissionRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(AddPermissionRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/CancelMessageMoveTaskRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/CancelMessageMoveTaskRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(CancelMessageMoveTaskRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ChangeMessageVisibilityBatchRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ChangeMessageVisibilityBatchRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(ChangeMessageVisibilityBatchRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ChangeMessageVisibilityRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ChangeMessageVisibilityRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(ChangeMessageVisibilityRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/CreateQueueRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/CreateQueueRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(CreateQueueRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/DeleteMessageBatchRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/DeleteMessageBatchRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(DeleteMessageBatchRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/DeleteMessageRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/DeleteMessageRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(DeleteMessageRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/DeleteQueueRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/DeleteQueueRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(DeleteQueueRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/GetQueueAttributesRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/GetQueueAttributesRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(GetQueueAttributesRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/GetQueueUrlRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/GetQueueUrlRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(GetQueueUrlRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListDeadLetterSourceQueuesRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListDeadLetterSourceQueuesRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(ListDeadLetterSourceQueuesRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListMessageMoveTasksRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListMessageMoveTasksRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(ListMessageMoveTasksRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListQueueTagsRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListQueueTagsRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(ListQueueTagsRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListQueuesRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListQueuesRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(ListQueuesRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/PurgeQueueRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/PurgeQueueRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(PurgeQueueRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ReceiveMessageRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ReceiveMessageRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(ReceiveMessageRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/RemovePermissionRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/RemovePermissionRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(RemovePermissionRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/SendMessageBatchRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/SendMessageBatchRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(SendMessageBatchRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/SendMessageRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/SendMessageRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(SendMessageRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/SetQueueAttributesRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/SetQueueAttributesRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(SetQueueAttributesRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/StartMessageMoveTaskRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/StartMessageMoveTaskRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(StartMessageMoveTaskRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/TagQueueRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/TagQueueRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(TagQueueRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/UntagQueueRequestMarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/UntagQueueRequestMarshaller.cs
@@ -65,6 +65,7 @@ public IRequest Marshall(UntagQueueRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2012-11-05";
             request.HttpMethod = "POST";
 
+            request.Headers[Amazon.Util.HeaderKeys.XAmzQueryMode] = "true";
             request.ResourcePath = "/";
 #if !NETFRAMEWORK
             using ArrayPoolBufferWriter<byte> arrayPoolBufferWriter = new ArrayPoolBufferWriter<byte>();
diff --git a/sdk/test/Services/CertificateManager/UnitTests/Custom/CustomTests.cs b/sdk/test/Services/CertificateManager/UnitTests/Custom/CustomTests.cs
@@ -0,0 +1,26 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Amazon.CertificateManager.Model;
+using Amazon.CertificateManager.Model.Internal.MarshallTransformations;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Amazon.Util;
+namespace AWSSDK.UnitTests
+{
+
+    [TestClass]
+    public class CustomTests
+    {
+        //since ACM is a aws json service without the query compatible trait we create this custom test here
+        [TestMethod]
+        public void ValidateSdkDoesNotSendXamznQueryModeHeaderIfServiceHasNoAwsQueryCompatibleTrait()
+        {
+            //Any RequestMarshaller
+            var request = new GetAccountConfigurationRequest { };
+            var actualRequest = GetAccountConfigurationRequestMarshaller.Instance.Marshall(request);
+            Assert.IsFalse(actualRequest.Headers.TryGetValue(HeaderKeys.XAmzQueryMode, out _));
+        }
+    }
+}
diff --git a/sdk/test/UnitTests/AWSSDK.UnitTests.Custom.NetFramework.csproj b/sdk/test/UnitTests/AWSSDK.UnitTests.Custom.NetFramework.csproj
@@ -1,4 +1,4 @@
-<!--
+﻿<!--
 This is a convenience .csproj file.  It is meant to be used in conjunction with AWSSDK.CoreAndCustomUnitTests.NetFramework.sln to 
 facilitate developing changes to AWSSDK.Core and AWSSDK.UnitTests.Custom without needing to load all Services projects.
 
@@ -12,7 +12,6 @@ This project file should not be used as part of a release pipeline.
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <AssemblyName>AWSSDK.UnitTests.NetFramework</AssemblyName>
         <PackageId>AWSSDK.UnitTests.NetFramework</PackageId>
-
         <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
         <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
         <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
@@ -52,6 +51,7 @@ This project file should not be used as part of a release pipeline.
         <ProjectReference Include="..\..\src\Services\CloudWatch\AWSSDK.CloudWatch.NetFramework.csproj" />
         <ProjectReference Include="..\..\src\Services\IotData\AWSSDK.IotData.NetFramework.csproj" />
         <ProjectReference Include="..\..\src\Services\KeyManagementService\AWSSDK.KeyManagementService.NetFramework.csproj" />
+        <ProjectReference Include="..\..\src\Services\SQS\AWSSDK.SQS.NetFramework.csproj" />
         <ProjectReference Include="..\..\src\Services\SSOOIDC\AWSSDK.SSOOIDC.NetFramework.csproj" />
         <ProjectReference Include="..\..\src\Services\SSO\AWSSDK.SSO.NetFramework.csproj" />
         <ProjectReference Include="..\Common\AWSSDK.CommonTest.csproj" />
diff --git a/sdk/test/UnitTests/Custom/Runtime/QueryCompatibleTests.cs b/sdk/test/UnitTests/Custom/Runtime/QueryCompatibleTests.cs
diff --git a/sdk/test/UnitTests/Custom/Runtime/TestResponses/QueryCompatibleTC1.txt b/sdk/test/UnitTests/Custom/Runtime/TestResponses/QueryCompatibleTC1.txt
diff --git a/sdk/test/UnitTests/Custom/Runtime/TestResponses/QueryCompatibleTC2.txt b/sdk/test/UnitTests/Custom/Runtime/TestResponses/QueryCompatibleTC2.txt
diff --git a/sdk/test/UnitTests/Custom/Runtime/TestResponses/QueryCompatibleTC3.txt b/sdk/test/UnitTests/Custom/Runtime/TestResponses/QueryCompatibleTC3.txt
diff --git a/sdk/test/UnitTests/Custom/Runtime/TestResponses/QueryCompatibleTC4.txt b/sdk/test/UnitTests/Custom/Runtime/TestResponses/QueryCompatibleTC4.txt
diff --git a/sdk/test/UnitTests/Custom/Runtime/TestResponses/QueryCompatibleTC5.txt b/sdk/test/UnitTests/Custom/Runtime/TestResponses/QueryCompatibleTC5.txt
diff --git a/sdk/test/UnitTests/Custom/TestTools/MockWebResponse.cs b/sdk/test/UnitTests/Custom/TestTools/MockWebResponse.cs

Original file line number	Diff line number	Diff line change
`@@ -112,5 +112,6 @@ public abstract class HeaderKeys`
`112`	`112`	`public const string AmzSdkRequest = "amz-sdk-request";`
`113`	`113`	`public const string XAmzQueryError = "x-amzn-query-error";`
`114`	`114`	`public const string XAmzS3ExpressSessionTokenQueryParam = "X-Amz-S3session-Token";`
	`115`	`+ public const string XAmzQueryMode = "x-amzn-query-mode";`
`115`	`116`	`}`
`116`	`117`	`}`