test: schema-compatible assertions

Author: kuhe

packages/core/src/submodules/protocols/ProtocolLib.ts

@@ -108,9 +108,7 @@ export class ProtocolLib {
       const errorSchema = getErrorSchema?.(registry, errorName) ?? (registry.getSchema(errorIdentifier) as ErrorSchema);
       return { errorSchema, errorMetadata };
     } catch (e) {
-      if (dataObject.Message) {
-        dataObject.message = dataObject.Message;
-      }
+      dataObject.message = dataObject.message ?? dataObject.Message ?? "UnknownError";
       const baseExceptionSchema = TypeRegistry.for("smithy.ts.sdk.synthetic." + namespace).getBaseException();
       if (baseExceptionSchema) {
         const ErrorCtor = baseExceptionSchema.ctor;

private/aws-client-retry-test/src/ClientRetryTest.spec.ts

@@ -1,4 +1,4 @@
-import { ListFunctionsCommand, Lambda, LambdaClient, LambdaServiceException } from "@aws-sdk/client-lambda";
+import { Lambda, LambdaClient, LambdaServiceException, ListFunctionsCommand } from "@aws-sdk/client-lambda";
 import { HttpHandler, HttpResponse } from "@smithy/protocol-http";
 import { AwsCredentialIdentity, RequestHandlerOutput } from "@smithy/types";
 import { ConfiguredRetryStrategy, StandardRetryStrategy } from "@smithy/util-retry";

private/aws-middleware-test/src/middleware-content-length.spec.ts

@@ -1,10 +1,9 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { AccessAnalyzer } from "@aws-sdk/client-accessanalyzer";
 import { S3 } from "@aws-sdk/client-s3";
 import { XRay } from "@aws-sdk/client-xray";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
-
 describe("middleware-content-length", () => {
   describe(AccessAnalyzer.name, () => {
     it("should not add content-length if no body", async () => {
@@ -40,14 +39,15 @@ describe("middleware-content-length", () => {
         headers: {
           "content-length": /106/,
         },
+        body: /clientToken/, // must include idempotencyToken.
       });
 
       await client.createAccessPreview({
         configurations: {},
         analyzerArn: "my-analyzer-arn",
       });
 
-      expect.assertions(1);
+      expect.assertions(2);
     });
   });
 

private/aws-middleware-test/src/middleware-serde.spec.ts

@@ -1,11 +1,10 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { EC2 } from "@aws-sdk/client-ec2";
 import { S3 } from "@aws-sdk/client-s3";
 import { SageMaker } from "@aws-sdk/client-sagemaker";
 import { SageMakerRuntime } from "@aws-sdk/client-sagemaker-runtime";
 import { describe, test as it } from "vitest";
 
-import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
-
 describe("middleware-serde", () => {
   describe(S3.name, () => {
     it("should serialize xml", async () => {
@@ -75,7 +74,15 @@ describe("middleware-serde", () => {
           "content-type": "application/x-www-form-urlencoded",
           host: "ec2.us-west-2.amazonaws.com",
         },
-        body: /ClientCidrBlock=ClientCidrBlock&ServerCertificateArn=ServerCertificateArn(.*?)&Action=CreateClientVpnEndpoint&Version=2016-11-15/,
+        body(body: any) {
+          const params = Object.fromEntries(new URLSearchParams(body).entries());
+          expect(params).toMatchObject({
+            Action: "CreateClientVpnEndpoint",
+            Version: "2016-11-15",
+            ClientCidrBlock: "ClientCidrBlock",
+            ServerCertificateArn: "ServerCertificateArn",
+          });
+        },
         protocol: "https:",
         path: "/",
       });