fix(core/protocols): x-amz-target in rpc protocols

Author: kuhe

clients/client-cloudwatch-logs/src/runtimeConfig.shared.ts

@@ -31,7 +31,9 @@ export const getRuntimeConfig = (config: CloudWatchLogsClientConfig) => {
       },
     ],
     logger: config?.logger ?? new NoOpLogger(),
-    protocol: config?.protocol ?? new AwsJson1_1Protocol({ defaultNamespace: "com.amazonaws.cloudwatchlogs" }),
+    protocol:
+      config?.protocol ??
+      new AwsJson1_1Protocol({ defaultNamespace: "com.amazonaws.cloudwatchlogs", serviceTarget: "Logs_20140328" }),
     serviceId: config?.serviceId ?? "CloudWatch Logs",
     urlParser: config?.urlParser ?? parseUrl,
     utf8Decoder: config?.utf8Decoder ?? fromUtf8,

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddProtocolConfig.java

@@ -70,6 +70,7 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
             return Collections.emptyMap();
         }
         String namespace = settings.getService().getNamespace();
+        String rpcTarget = settings.getService().getName();
         String xmlns = settings.getService(model)
             .getTrait(XmlNamespaceTrait.class)
             .map(XmlNamespaceTrait::getUri)
@@ -145,7 +146,11 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
                             writer.addImportSubmodule(
                                 "AwsJson1_0Protocol", null,
                                 AwsDependency.AWS_SDK_CORE, "/protocols");
-                            writer.write("new AwsJson1_0Protocol({ defaultNamespace: $S })", namespace);
+                            writer.write(
+                                "new AwsJson1_0Protocol({ defaultNamespace: $S, serviceTarget: $S })",
+                                namespace,
+                                rpcTarget
+                            );
                         }
                     );
                 } else if (Objects.equals(settings.getProtocol(), AwsJson1_1Trait.ID)) {
@@ -154,7 +159,11 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
                             writer.addImportSubmodule(
                                 "AwsJson1_1Protocol", null,
                                 AwsDependency.AWS_SDK_CORE, "/protocols");
-                            writer.write("new AwsJson1_1Protocol({ defaultNamespace: $S })", namespace);
+                            writer.write(
+                                "new AwsJson1_1Protocol({ defaultNamespace: $S, serviceTarget: $S })",
+                                namespace,
+                                rpcTarget
+                            );
                         }
                     );
                 }

packages/core/src/submodules/protocols/json/AwsJson1_0Protocol.ts

@@ -5,9 +5,10 @@ import { AwsJsonRpcProtocol } from "./AwsJsonRpcProtocol";
  * @see https://smithy.io/2.0/aws/protocols/aws-json-1_1-protocol.html#differences-between-awsjson1-0-and-awsjson1-1
  */
 export class AwsJson1_0Protocol extends AwsJsonRpcProtocol {
-  public constructor({ defaultNamespace }: { defaultNamespace: string }) {
+  public constructor({ defaultNamespace, serviceTarget }: { defaultNamespace: string; serviceTarget: string }) {
     super({
       defaultNamespace,
+      serviceTarget,
     });
   }
 
@@ -18,4 +19,8 @@ export class AwsJson1_0Protocol extends AwsJsonRpcProtocol {
   protected getJsonRpcVersion() {
     return "1.0" as const;
   }
+
+  protected getDefaultContentType(): string {
+    return "application/x-amz-json-1.1";
+  }
 }

packages/core/src/submodules/protocols/json/AwsJson1_1Protocol.ts

@@ -5,9 +5,10 @@ import { AwsJsonRpcProtocol } from "./AwsJsonRpcProtocol";
  * @see https://smithy.io/2.0/aws/protocols/aws-json-1_1-protocol.html#differences-between-awsjson1-0-and-awsjson1-1
  */
 export class AwsJson1_1Protocol extends AwsJsonRpcProtocol {
-  public constructor({ defaultNamespace }: { defaultNamespace: string }) {
+  public constructor({ defaultNamespace, serviceTarget }: { defaultNamespace: string; serviceTarget: string }) {
     super({
       defaultNamespace,
+      serviceTarget,
     });
   }
 
@@ -18,4 +19,8 @@ export class AwsJson1_1Protocol extends AwsJsonRpcProtocol {
   protected getJsonRpcVersion() {
     return "1.1" as const;
   }
+
+  protected getDefaultContentType(): string {
+    return "application/x-amz-json-1.1";
+  }
 }

packages/core/src/submodules/protocols/json/AwsJsonRpcProtocol.ts

@@ -22,12 +22,14 @@ import { loadRestJsonErrorCode } from "./parseJsonBody";
 export abstract class AwsJsonRpcProtocol extends RpcProtocol {
   protected serializer: ShapeSerializer<string | Uint8Array>;
   protected deserializer: ShapeDeserializer<string | Uint8Array>;
+  protected serviceTarget: string;
   private codec: JsonCodec;
 
-  protected constructor({ defaultNamespace }: { defaultNamespace: string }) {
+  protected constructor({ defaultNamespace, serviceTarget }: { defaultNamespace: string; serviceTarget: string }) {
     super({
       defaultNamespace,
     });
+    this.serviceTarget = serviceTarget;
     this.codec = new JsonCodec({
       timestampFormat: {
         useTrait: true,
@@ -50,9 +52,7 @@ export abstract class AwsJsonRpcProtocol extends RpcProtocol {
     }
     Object.assign(request.headers, {
       "content-type": `application/x-amz-json-${this.getJsonRpcVersion()}`,
-      "x-amz-target":
-        (this.getJsonRpcVersion() === "1.0" ? `JsonRpc10.` : `JsonProtocol.`) +
-        NormalizedSchema.of(operationSchema).getName(),
+      "x-amz-target": `${this.serviceTarget}.${NormalizedSchema.of(operationSchema).getName()}`,
     });
     if (deref(operationSchema.input) === "unit" || !request.body) {
       request.body = "{}";

packages/core/src/submodules/protocols/json/AwsRestJsonProtocol.ts

@@ -81,15 +81,15 @@ export class AwsRestJsonProtocol extends HttpBindingProtocol {
         } else if (httpPayloadMember.isBlobSchema()) {
           request.headers["content-type"] = "application/octet-stream";
         } else {
-          request.headers["content-type"] = "application/json";
+          request.headers["content-type"] = this.getDefaultContentType();
         }
       } else if (!inputSchema.isUnitSchema()) {
         const hasBody = Object.values(members).find((m) => {
           const { httpQuery, httpQueryParams, httpHeader, httpLabel, httpPrefixHeaders } = m.getMergedTraits();
           return !httpQuery && !httpQueryParams && !httpHeader && !httpLabel && httpPrefixHeaders === void 0;
         });
         if (hasBody) {
-          request.headers["content-type"] = "application/json";
+          request.headers["content-type"] = this.getDefaultContentType();
         }
       }
     }
@@ -157,4 +157,8 @@ export class AwsRestJsonProtocol extends HttpBindingProtocol {
 
     throw exception;
   }
+
+  protected getDefaultContentType(): string {
+    return "application/json";
+  }
 }

packages/core/src/submodules/protocols/query/AwsQueryProtocol.ts

@@ -212,4 +212,8 @@ export class AwsQueryProtocol extends RpcProtocol {
     const errorData = this.loadQueryError(data);
     return errorData?.message ?? errorData?.Message ?? data.message ?? data.Message ?? "Unknown";
   }
+
+  protected getDefaultContentType(): string {
+    return "application/x-www-form-urlencoded";
+  }
 }

packages/core/src/submodules/protocols/xml/AwsRestXmlProtocol.ts

@@ -85,20 +85,20 @@ export class AwsRestXmlProtocol extends HttpBindingProtocol {
         } else if (httpPayloadMember.isBlobSchema()) {
           request.headers["content-type"] = "application/octet-stream";
         } else {
-          request.headers["content-type"] = "application/xml";
+          request.headers["content-type"] = this.getDefaultContentType();
         }
       } else if (!ns.isUnitSchema()) {
         const hasBody = Object.values(members).find((m) => {
           const { httpQuery, httpQueryParams, httpHeader, httpLabel, httpPrefixHeaders } = m.getMergedTraits();
           return !httpQuery && !httpQueryParams && !httpHeader && !httpLabel && httpPrefixHeaders === void 0;
         });
         if (hasBody) {
-          request.headers["content-type"] = "application/xml";
+          request.headers["content-type"] = this.getDefaultContentType();
         }
       }
     }
 
-    if (request.headers["content-type"] === "application/xml") {
+    if (request.headers["content-type"] === this.getDefaultContentType()) {
       if (typeof request.body === "string") {
         request.body = '<?xml version="1.0" encoding="UTF-8"?>' + request.body;
       }
@@ -172,4 +172,8 @@ export class AwsRestXmlProtocol extends HttpBindingProtocol {
 
     throw exception;
   }
+
+  protected getDefaultContentType(): string {
+    return "application/xml";
+  }
 }