fix(core/protocols): awsQuery error shape consistency and ec2 middleware content length

Author: kuhe

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

@@ -144,6 +144,11 @@ export class AwsQueryProtocol extends RpcProtocol {
     const errorData = this.loadQueryError(dataObject);
     const message = this.loadQueryErrorMessage(dataObject);
     errorData.message = message;
+    errorData.Error = {
+      Type: errorData.Type,
+      Code: errorData.Code,
+      Message: message,
+    };
 
     const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(
       errorIdentifier,
@@ -160,7 +165,9 @@ export class AwsQueryProtocol extends RpcProtocol {
     const ns = NormalizedSchema.of(errorSchema);
     const exception = new errorSchema.ctor(message);
 
-    const output = {} as any;
+    const output = {
+      Error: errorData.Error,
+    } as any;
 
     for (const [name, member] of ns.structIterator()) {
       const target = member.getMergedTraits().xmlName ?? name;

packages/middleware-sdk-ec2/src/index.ts

@@ -3,8 +3,9 @@ import { getEndpointFromInstructions, toEndpointV1 } from "@smithy/middleware-en
 import { HttpRequest } from "@smithy/protocol-http";
 import { SignatureV4 } from "@smithy/signature-v4";
 import { extendedEncodeURIComponent } from "@smithy/smithy-client";
-import {
+import type {
   AwsCredentialIdentity,
+  BodyLengthCalculator,
   ChecksumConstructor,
   Endpoint,
   HandlerExecutionContext,
@@ -29,6 +30,7 @@ interface PreviouslyResolved {
   sha256: ChecksumConstructor | HashConstructor;
   signingEscapePath: boolean;
   regionInfoProvider?: RegionInfoProvider;
+  bodyLengthChecker: BodyLengthCalculator;
 }
 
 const version = "2016-11-15";
@@ -113,8 +115,8 @@ export function copySnapshotPresignedUrlMiddleware(options: PreviouslyResolved):
           },
         };
 
-        // we also double-check the work of the serialzier here
-        // because this middleware may be placed after the regular serialzier.
+        // we also double-check the work of the serializer here
+        // because this middleware may be placed after the regular serializer.
         if (HttpRequest.isInstance(args.request)) {
           const { request } = args;
           if (!(request.body ?? "").includes("DestinationRegion=")) {
@@ -123,6 +125,9 @@ export function copySnapshotPresignedUrlMiddleware(options: PreviouslyResolved):
           if (!(request.body ?? "").includes("PresignedUrl=")) {
             request.body += `&PresignedUrl=${extendedEncodeURIComponent(args.input.PresignedUrl)}`;
           }
+          if (typeof options.bodyLengthChecker === "function") {
+            request.headers["content-length"] = String(options.bodyLengthChecker(request.body));
+          }
         }
       }