Add cbor cloudwatch customization & query compat codegen fix

Author: sbaluja

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

@@ -26,8 +26,8 @@ class AWS_SQS_API SQSRequest : public Aws::AmazonSerializableWebServiceRequest {
 
     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::X_AMZN_QUERY_MODE, "true"));
     headers.emplace(Aws::Http::HeaderValuePair(Aws::Http::API_VERSION_HEADER, "2012-11-05"));
     return headers;
   }

tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/config/ServiceGeneratorConfig.java

@@ -21,6 +21,7 @@
 import com.amazonaws.util.awsclientgenerator.generators.cpp.glacier.GlacierRestJsonCppClientGenerator;
 import com.amazonaws.util.awsclientgenerator.generators.cpp.lambda.LambdaRestJsonCppClientGenerator;
 import com.amazonaws.util.awsclientgenerator.generators.cpp.machinelearning.MachineLearningJsonCppClientGenerator;
+import com.amazonaws.util.awsclientgenerator.generators.cpp.monitoring.CloudwatchMonitoringCborCppClientGenerator;
 import com.amazonaws.util.awsclientgenerator.generators.cpp.monitoring.CloudwatchMonitoringJsonCppClientGenerator;
 import com.amazonaws.util.awsclientgenerator.generators.cpp.neptune.NeptuneCppClientGenerator;
 import com.amazonaws.util.awsclientgenerator.generators.cpp.polly.PollyCppClientGenerator;
@@ -73,6 +74,7 @@ public class ServiceGeneratorConfig {
             SPEC_OVERRIDE_MAPPING.put("cpp-eventbridge-json", new EventBridgeCppClientGenerator());
             SPEC_OVERRIDE_MAPPING.put("cpp-dsql-rest-json", new DsqlCppClientGenerator());
             SPEC_OVERRIDE_MAPPING.put("cpp-monitoring-json", new CloudwatchMonitoringJsonCppClientGenerator());
+            SPEC_OVERRIDE_MAPPING.put("cpp-monitoring-smithy-rpc-v2-cbor", new CloudwatchMonitoringCborCppClientGenerator());
 
             // protocol tests clients
             SPEC_OVERRIDE_MAPPING.put("cpp-ec2-protocol-ec2", new Ec2CppClientGenerator());

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

@@ -0,0 +1,21 @@
+package com.amazonaws.util.awsclientgenerator.generators.cpp.monitoring;
+
+import com.amazonaws.util.awsclientgenerator.domainmodels.SdkFileEntry;
+import com.amazonaws.util.awsclientgenerator.domainmodels.codegeneration.ServiceModel;
+import com.amazonaws.util.awsclientgenerator.generators.cpp.CborCppClientGenerator;
+import com.google.common.collect.ImmutableMap;
+
+public class CloudwatchMonitoringCborCppClientGenerator extends CborCppClientGenerator {
+    public CloudwatchMonitoringCborCppClientGenerator() throws Exception {
+        super();
+    }
+
+    @Override
+    protected SdkFileEntry generateErrorSourceFile(ServiceModel serviceModel) throws Exception {
+        serviceModel.setQueryCompatibleErrorMappings(ImmutableMap.of(
+                "DASHBOARD_NOT_FOUND", "DashboardNotFoundError"
+        ));
+
+        return super.generateErrorSourceFile(serviceModel);
+    }
+}

tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/transform/C2jModelToGeneratorModelTransformer.java

@@ -186,7 +186,7 @@ public ServiceModel convert() {
         // add protocol check. only for json, query protocols
         final String protocol = serviceModel.getMetadata().findFirstSupportedProtocol();
 
-        if ("json".equals(protocol)) {
+        if ("json".equals(protocol) || "smithy-rpc-v2-cbor".equals(protocol)) {
             serviceModel.getMetadata().setAwsQueryCompatible(
                     c2jServiceModel.getMetadata().getAwsQueryCompatible() != null);
         } else {

tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/AbstractServiceRequestHeader.vm

@@ -42,10 +42,10 @@ namespace ${serviceNamespace}
 #if($metadata.acceptHeader)
         headers.emplace(Aws::Http::HeaderValuePair(Aws::Http::ACCEPT_HEADER, "${metadata.acceptHeader}"));
 #end
+        }
 #if ($metadata.awsQueryCompatible)
         headers.emplace(Aws::Http::HeaderValuePair(Aws::Http::X_AMZN_QUERY_MODE,"true"));
 #end
-      }
 #if($metadata.apiVersion)
       headers.emplace(Aws::Http::HeaderValuePair(Aws::Http::API_VERSION_HEADER, "${metadata.apiVersion}"));
 #end