fix(core/protocols): construction of x-amz-target header

kuhe · kuhe · commit efaf71dd8623 · 2025-08-07T14:28:36.000-04:00
diff --git a/packages/core/src/submodules/protocols/json/AwsJson1_0Protocol.spec.ts b/packages/core/src/submodules/protocols/json/AwsJson1_0Protocol.spec.ts
@@ -30,6 +30,7 @@ describe(AwsJson1_0Protocol.name, () => {
     it("serializes blobs and timestamps", () => {
       const protocol = new AwsJson1_0Protocol({
         defaultNamespace: "namespace",
+        serviceTarget: "JsonRpc10",
       });
       protocol.setSerdeContext(serdeContext);
       const codec = protocol.getPayloadCodec();
@@ -55,6 +56,7 @@ describe(AwsJson1_0Protocol.name, () => {
     it("deserializes blobs and timestamps", async () => {
       const protocol = new AwsJson1_0Protocol({
         defaultNamespace: "namespace",
+        serviceTarget: "JsonRpc10",
       });
       protocol.setSerdeContext(serdeContext);
       const codec = protocol.getPayloadCodec();
@@ -73,6 +75,7 @@ describe(AwsJson1_0Protocol.name, () => {
     it("ignores JSON name and HTTP bindings", async () => {
       const protocol = new AwsJson1_0Protocol({
         defaultNamespace: "namespace",
+        serviceTarget: "JsonRpc10",
       });
       protocol.setSerdeContext(serdeContext);
 
diff --git a/packages/core/src/submodules/protocols/json/AwsJson1_0Protocol.ts b/packages/core/src/submodules/protocols/json/AwsJson1_0Protocol.ts
@@ -20,7 +20,10 @@ export class AwsJson1_0Protocol extends AwsJsonRpcProtocol {
     return "1.0" as const;
   }
 
+  /**
+   * @override
+   */
   protected getDefaultContentType(): string {
-    return "application/x-amz-json-1.1";
+    return "application/x-amz-json-1.0";
   }
 }
diff --git a/packages/core/src/submodules/protocols/json/AwsJson1_1Protocol.spec.ts b/packages/core/src/submodules/protocols/json/AwsJson1_1Protocol.spec.ts
@@ -2,22 +2,24 @@ import { HttpResponse } from "@smithy/protocol-http";
 import { describe, expect, test as it } from "vitest";
 
 import { context, deleteObjects } from "../test-schema.spec";
-import { AwsJson1_0Protocol } from "./AwsJson1_0Protocol";
+import { AwsJson1_1Protocol } from "./AwsJson1_1Protocol";
 
 /**
  * These tests are cursory since most coverage is provided by protocol tests.
  */
-describe(AwsJson1_0Protocol, () => {
+describe(AwsJson1_1Protocol, () => {
   it("is 1.0", async () => {
-    const protocol = new AwsJson1_0Protocol({
+    const protocol = new AwsJson1_1Protocol({
       defaultNamespace: "",
+      serviceTarget: "JsonRpc11",
     });
     expect(protocol.getShapeId()).toEqual("aws.protocols#awsJson1_0");
   });
 
   it("serializes a request", async () => {
-    const protocol = new AwsJson1_0Protocol({
+    const protocol = new AwsJson1_1Protocol({
       defaultNamespace: "",
+      serviceTarget: "JsonRpc11",
     });
     const httpRequest = await protocol.serializeRequest(
       deleteObjects,
@@ -59,8 +61,9 @@ describe(AwsJson1_0Protocol, () => {
       headers: {},
     });
 
-    const protocol = new AwsJson1_0Protocol({
+    const protocol = new AwsJson1_1Protocol({
       defaultNamespace: "",
+      serviceTarget: "JsonRpc11",
     });
 
     const output = await protocol.deserializeResponse(deleteObjects, context, httpResponse);
diff --git a/packages/core/src/submodules/protocols/json/AwsJson1_1Protocol.ts b/packages/core/src/submodules/protocols/json/AwsJson1_1Protocol.ts
@@ -20,6 +20,9 @@ export class AwsJson1_1Protocol extends AwsJsonRpcProtocol {
     return "1.1" as const;
   }
 
+  /**
+   * @override
+   */
   protected getDefaultContentType(): string {
     return "application/x-amz-json-1.1";
   }
diff --git a/packages/core/src/submodules/protocols/json/AwsJsonRpcProtocol.spec.ts b/packages/core/src/submodules/protocols/json/AwsJsonRpcProtocol.spec.ts
@@ -7,7 +7,7 @@ describe(AwsJsonRpcProtocol.name, () => {
   it("has expected codec settings", async () => {
     const protocol = new (class extends AwsJsonRpcProtocol {
       constructor() {
-        super({ defaultNamespace: "" });
+        super({ defaultNamespace: "", serviceTarget: "" });
       }
 
       getShapeId(): string {
diff --git a/packages/core/src/submodules/protocols/json/AwsRestJsonProtocol.ts b/packages/core/src/submodules/protocols/json/AwsRestJsonProtocol.ts
@@ -158,6 +158,9 @@ export class AwsRestJsonProtocol extends HttpBindingProtocol {
     throw exception;
   }
 
+  /**
+   * @override
+   */
   protected getDefaultContentType(): string {
     return "application/json";
   }
diff --git a/packages/core/src/submodules/protocols/query/AwsQueryProtocol.ts b/packages/core/src/submodules/protocols/query/AwsQueryProtocol.ts
@@ -213,6 +213,9 @@ export class AwsQueryProtocol extends RpcProtocol {
     return errorData?.message ?? errorData?.Message ?? data.message ?? data.Message ?? "Unknown";
   }
 
+  /**
+   * @override
+   */
   protected getDefaultContentType(): string {
     return "application/x-www-form-urlencoded";
   }
diff --git a/packages/core/src/submodules/protocols/xml/AwsRestXmlProtocol.ts b/packages/core/src/submodules/protocols/xml/AwsRestXmlProtocol.ts
@@ -173,6 +173,9 @@ export class AwsRestXmlProtocol extends HttpBindingProtocol {
     throw exception;
   }
 
+  /**
+   * @override
+   */
   protected getDefaultContentType(): string {
     return "application/xml";
   }
diff --git a/private/aws-protocoltests-json-10-schema/src/runtimeConfig.shared.ts b/private/aws-protocoltests-json-10-schema/src/runtimeConfig.shared.ts
@@ -31,7 +31,9 @@ export const getRuntimeConfig = (config: JSONRPC10ClientConfig) => {
       },
     ],
     logger: config?.logger ?? new NoOpLogger(),
-    protocol: config?.protocol ?? new AwsJson1_0Protocol({ defaultNamespace: "aws.protocoltests.json10" }),
+    protocol:
+      config?.protocol ??
+      new AwsJson1_0Protocol({ defaultNamespace: "aws.protocoltests.json10", serviceTarget: "JsonRpc10" }),
     serviceId: config?.serviceId ?? "JSON RPC 10",
     urlParser: config?.urlParser ?? parseUrl,
     utf8Decoder: config?.utf8Decoder ?? fromUtf8,
diff --git a/private/aws-protocoltests-json-schema/src/runtimeConfig.shared.ts b/private/aws-protocoltests-json-schema/src/runtimeConfig.shared.ts
@@ -31,7 +31,9 @@ export const getRuntimeConfig = (config: JsonProtocolClientConfig) => {
       },
     ],
     logger: config?.logger ?? new NoOpLogger(),
-    protocol: config?.protocol ?? new AwsJson1_1Protocol({ defaultNamespace: "aws.protocoltests.json" }),
+    protocol:
+      config?.protocol ??
+      new AwsJson1_1Protocol({ defaultNamespace: "aws.protocoltests.json", serviceTarget: "JsonProtocol" }),
     serviceId: config?.serviceId ?? "Json Protocol",
     urlParser: config?.urlParser ?? parseUrl,
     utf8Decoder: config?.utf8Decoder ?? fromUtf8,
diff --git a/private/aws-protocoltests-restjson-schema/src/schemas/schemas.ts b/private/aws-protocoltests-restjson-schema/src/schemas/schemas.ts
@@ -2046,8 +2046,8 @@ export var TimestampFormatHeadersIO = struct(
 );
 export var TopLevel = struct(n0, _TLo, 0, [_di, _dLi, _dMi], [() => Dialog, () => DialogList, () => DialogMap]);
 export var UnionInputOutput = struct(n0, _UIO, 0, [_con], [() => MyUnion]);
-export var GreetingStruct = struct(n2, _GS, 0, [_sa], [0]);
-export var GreetingStruct_n1 = struct(n1, _GS, 0, [_hi], [0]);
+export var GreetingStruct_n2 = struct(n2, _GS, 0, [_sa], [0]);
+export var GreetingStruct = struct(n1, _GS, 0, [_hi], [0]);
 export var Unit = "unit" as const;
 
 export var RestJsonProtocolServiceException = error(
@@ -2110,7 +2110,7 @@ export var DenseNumberMap = 128 | 1;
 export var DenseSetMap = map(n0, _DSM, 0, 0, 64 | 0);
 export var DenseStringMap = 128 | 0;
 
-export var DenseStructMap = map(n0, _DSMe, 0, 0, () => GreetingStruct_n1);
+export var DenseStructMap = map(n0, _DSMe, 0, 0, () => GreetingStruct);
 export var DialogMap = map(n0, _DM, 0, 0, () => Dialog);
 export var DocumentValuedMap = 128 | 15;
 
@@ -2150,7 +2150,7 @@ export var SparseStructMap = map(
     [_sp]: 1,
   },
   0,
-  () => GreetingStruct_n1
+  () => GreetingStruct
 );
 export var TestStringMap = 128 | 0;
 
@@ -2175,7 +2175,7 @@ export var MyUnion = uni(
   _MU,
   0,
   [_sV, _bVo, _nVu, _bVl, _tV, _eV, _lVi, _mV, _sVt, _rSV],
-  [0, 2, 1, 21, 4, 0, 64 | 0, 128 | 0, () => GreetingStruct_n1, () => GreetingStruct]
+  [0, 2, 1, 21, 4, 0, 64 | 0, 128 | 0, () => GreetingStruct, () => GreetingStruct_n2]
 );
 export var PlayerAction = uni(n0, _PA, 0, [_qu], [() => Unit]);
 export var SimpleUnion = uni(n0, _SU, 0, [_int, _st], [1, 0]);
@@ -2570,7 +2570,7 @@ export var MalformedAcceptWithBody = op(
     [_ht]: ["POST", "/MalformedAcceptWithBody", 200],
   },
   () => Unit,
-  () => GreetingStruct_n1
+  () => GreetingStruct
 );
 export var MalformedAcceptWithGenericString = op(
   n0,
@@ -2623,7 +2623,7 @@ export var MalformedContentTypeWithBody = op(
   {
     [_ht]: ["POST", "/MalformedContentTypeWithBody", 200],
   },
-  () => GreetingStruct_n1,
+  () => GreetingStruct,
   () => Unit
 );
 export var MalformedContentTypeWithGenericString = op(

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,10 @@ export class AwsJson1_0Protocol extends AwsJsonRpcProtocol {`
`20`	`20`	`return "1.0" as const;`
`21`	`21`	`}`
`22`	`22`
	`23`	`+ /**`
	`24`	`+ * @override`
	`25`	`+ */`
`23`	`26`	`protected getDefaultContentType(): string {`
`24`		`- return "application/x-amz-json-1.1";`
	`27`	`+ return "application/x-amz-json-1.0";`
`25`	`28`	`}`
`26`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,9 @@ export class AwsJson1_1Protocol extends AwsJsonRpcProtocol {`
`20`	`20`	`return "1.1" as const;`
`21`	`21`	`}`
`22`	`22`
	`23`	`+ /**`
	`24`	`+ * @override`
	`25`	`+ */`
`23`	`26`	`protected getDefaultContentType(): string {`
`24`	`27`	`return "application/x-amz-json-1.1";`
`25`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ describe(AwsJsonRpcProtocol.name, () => {`
`7`	`7`	`it("has expected codec settings", async () => {`
`8`	`8`	`const protocol = new (class extends AwsJsonRpcProtocol {`
`9`	`9`	`constructor() {`
`10`		`- super({ defaultNamespace: "" });`
	`10`	`+ super({ defaultNamespace: "", serviceTarget: "" });`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`getShapeId(): string {`
Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,9 @@ export class AwsRestJsonProtocol extends HttpBindingProtocol {`
`158`	`158`	`throw exception;`
`159`	`159`	`}`
`160`	`160`
	`161`	`+ /**`
	`162`	`+ * @override`
	`163`	`+ */`
`161`	`164`	`protected getDefaultContentType(): string {`
`162`	`165`	`return "application/json";`
`163`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -213,6 +213,9 @@ export class AwsQueryProtocol extends RpcProtocol {`
`213`	`213`	`return errorData?.message ?? errorData?.Message ?? data.message ?? data.Message ?? "Unknown";`
`214`	`214`	`}`
`215`	`215`
	`216`	`+ /**`
	`217`	`+ * @override`
	`218`	`+ */`
`216`	`219`	`protected getDefaultContentType(): string {`
`217`	`220`	`return "application/x-www-form-urlencoded";`
`218`	`221`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,9 @@ export class AwsRestXmlProtocol extends HttpBindingProtocol {`
`173`	`173`	`throw exception;`
`174`	`174`	`}`
`175`	`175`
	`176`	`+ /**`
	`177`	`+ * @override`
	`178`	`+ */`
`176`	`179`	`protected getDefaultContentType(): string {`
`177`	`180`	`return "application/xml";`
`178`	`181`	`}`