fix(codegen): pass through sha256 in non-AWS sigv4 generated client (#…

…6415)

codegen/generic-client-test-codegen/model/weather.smithy

@@ -3,16 +3,13 @@ $version: "2.0"
 namespace example.weather
 
 use aws.auth#sigv4
+use aws.protocols#restJson1
 
 @authDefinition
 @trait
 structure customAuth {}
 
-@trait
-@protocolDefinition
-structure fakeProtocol {}
-
-@fakeProtocol
+@restJson1
 @httpApiKeyAuth(name: "X-Api-Key", in: "header")
 @httpBearerAuth
 @sigv4(name: "weather")

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/auth/http/integration/SupportSigV4Auth.java

@@ -130,6 +130,7 @@ public Optional<HttpAuthScheme> getHttpAuthScheme() {
                              */
                             signingProperties: {
                               context,
+                              sha256: (config as any).sha256,
                             },
                           };
                         },"""))

private/aws-protocoltests-ec2/src/endpoints.ts

@@ -18,6 +18,7 @@ const partitionHash: PartitionHash = {
       "ap-southeast-2",
       "ap-southeast-3",
       "ap-southeast-4",
+      "ap-southeast-5",
       "ca-central-1",
       "ca-west-1",
       "eu-central-1",

private/aws-protocoltests-json-10/src/endpoints.ts

@@ -18,6 +18,7 @@ const partitionHash: PartitionHash = {
       "ap-southeast-2",
       "ap-southeast-3",
       "ap-southeast-4",
+      "ap-southeast-5",
       "ca-central-1",
       "ca-west-1",
       "eu-central-1",

private/aws-protocoltests-json-machinelearning/src/endpoints.ts

@@ -18,6 +18,7 @@ const partitionHash: PartitionHash = {
       "ap-southeast-2",
       "ap-southeast-3",
       "ap-southeast-4",
+      "ap-southeast-5",
       "ca-central-1",
       "ca-west-1",
       "eu-central-1",

private/aws-protocoltests-json/src/endpoints.ts

@@ -18,6 +18,7 @@ const partitionHash: PartitionHash = {
       "ap-southeast-2",
       "ap-southeast-3",
       "ap-southeast-4",
+      "ap-southeast-5",
       "ca-central-1",
       "ca-west-1",
       "eu-central-1",

private/aws-protocoltests-query/src/endpoints.ts

@@ -18,6 +18,7 @@ const partitionHash: PartitionHash = {
       "ap-southeast-2",
       "ap-southeast-3",
       "ap-southeast-4",
+      "ap-southeast-5",
       "ca-central-1",
       "ca-west-1",
       "eu-central-1",

private/aws-protocoltests-restjson-apigateway/src/endpoints.ts

@@ -67,6 +67,7 @@ const partitionHash: PartitionHash = {
       "ap-southeast-2",
       "ap-southeast-3",
       "ap-southeast-4",
+      "ap-southeast-5",
       "ca-central-1",
       "ca-west-1",
       "eu-central-1",

private/aws-protocoltests-restjson-glacier/src/endpoints.ts

@@ -75,6 +75,7 @@ const partitionHash: PartitionHash = {
       "ap-southeast-2",
       "ap-southeast-3",
       "ap-southeast-4",
+      "ap-southeast-5",
       "ca-central-1",
       "ca-west-1",
       "eu-central-1",

private/aws-protocoltests-restjson/src/endpoints.ts

@@ -18,6 +18,7 @@ const partitionHash: PartitionHash = {
       "ap-southeast-2",
       "ap-southeast-3",
       "ap-southeast-4",
+      "ap-southeast-5",
       "ca-central-1",
       "ca-west-1",
       "eu-central-1",

private/aws-protocoltests-restxml/src/endpoints.ts

@@ -18,6 +18,7 @@ const partitionHash: PartitionHash = {
       "ap-southeast-2",
       "ap-southeast-3",
       "ap-southeast-4",
+      "ap-southeast-5",
       "ca-central-1",
       "ca-west-1",
       "eu-central-1",

private/aws-util-test/src/clients/Weather.integ.spec.ts

@@ -0,0 +1,23 @@
+import { Weather } from "@aws-sdk/weather";
+
+import { requireRequestsFrom } from "../requests/test-http-handler";
+
+describe(Weather.name, () => {
+  it("should be able to make a request without errors", async () => {
+    const client = new Weather({
+      credentials: {
+        accessKeyId: "",
+        secretAccessKey: "",
+      },
+      endpoint: "https://localhost",
+    });
+
+    requireRequestsFrom(client).toMatch({
+      body: /./,
+    });
+
+    await client.onlySigv4Auth({});
+
+    expect.hasAssertions();
+  });
+});

private/weather-legacy-auth/package.json

@@ -20,6 +20,7 @@
     "@aws-crypto/sha256-js": "5.2.0",
     "@aws-sdk/client-sso-oidc": "*",
     "@aws-sdk/client-sts": "*",
+    "@aws-sdk/core": "*",
     "@aws-sdk/credential-provider-node": "*",
     "@aws-sdk/middleware-host-header": "*",
     "@aws-sdk/middleware-logger": "*",
@@ -32,6 +33,7 @@
     "@aws-sdk/util-user-agent-browser": "*",
     "@aws-sdk/util-user-agent-node": "*",
     "@smithy/config-resolver": "^3.0.5",
+    "@smithy/core": "^2.4.0",
     "@smithy/fetch-http-handler": "^3.2.4",
     "@smithy/hash-node": "^3.0.3",
     "@smithy/invalid-dependency": "^3.0.3",
@@ -53,11 +55,13 @@
     "@smithy/util-middleware": "^3.0.3",
     "@smithy/util-retry": "^3.0.3",
     "@smithy/util-utf8": "^3.0.0",
-    "tslib": "^2.6.2"
+    "tslib": "^2.6.2",
+    "uuid": "^9.0.1"
   },
   "devDependencies": {
     "@tsconfig/node16": "16.1.3",
     "@types/node": "^16.18.96",
+    "@types/uuid": "^9.0.4",
     "concurrently": "7.0.0",
     "downlevel-dts": "0.10.1",
     "rimraf": "3.0.2",

private/weather-legacy-auth/src/commands/OnlyCustomAuthCommand.ts

@@ -1,5 +1,6 @@
 // smithy-typescript generated code
 import { ServiceInputTypes, ServiceOutputTypes, WeatherClientResolvedConfig } from "../WeatherClient";
+import { de_OnlyCustomAuthCommand, se_OnlyCustomAuthCommand } from "../protocols/Aws_restJson1";
 import { getSigV4AuthPlugin } from "@aws-sdk/middleware-signing";
 import { getSerdePlugin } from "@smithy/middleware-serde";
 import { Command as $Command } from "@smithy/smithy-client";
@@ -63,10 +64,6 @@ export class OnlyCustomAuthCommand extends $Command
   .s("Weather", "OnlyCustomAuth", {})
   .n("WeatherClient", "OnlyCustomAuthCommand")
   .f(void 0, void 0)
-  .ser(() => {
-    throw new Error("No supported protocol was found");
-  })
-  .de(() => {
-    throw new Error("No supported protocol was found");
-  })
+  .ser(se_OnlyCustomAuthCommand)
+  .de(de_OnlyCustomAuthCommand)
   .build() {}

private/weather-legacy-auth/src/commands/OnlyCustomAuthOptionalCommand.ts

@@ -1,5 +1,6 @@
 // smithy-typescript generated code
 import { ServiceInputTypes, ServiceOutputTypes, WeatherClientResolvedConfig } from "../WeatherClient";
+import { de_OnlyCustomAuthOptionalCommand, se_OnlyCustomAuthOptionalCommand } from "../protocols/Aws_restJson1";
 import { getSerdePlugin } from "@smithy/middleware-serde";
 import { Command as $Command } from "@smithy/smithy-client";
 import { MetadataBearer as __MetadataBearer } from "@smithy/types";
@@ -62,10 +63,6 @@ export class OnlyCustomAuthOptionalCommand extends $Command
   .s("Weather", "OnlyCustomAuthOptional", {})
   .n("WeatherClient", "OnlyCustomAuthOptionalCommand")
   .f(void 0, void 0)
-  .ser(() => {
-    throw new Error("No supported protocol was found");
-  })
-  .de(() => {
-    throw new Error("No supported protocol was found");
-  })
+  .ser(se_OnlyCustomAuthOptionalCommand)
+  .de(de_OnlyCustomAuthOptionalCommand)
   .build() {}

private/weather-legacy-auth/src/commands/OnlyHttpApiKeyAndBearerAuthCommand.ts

@@ -1,6 +1,10 @@
 // smithy-typescript generated code
 import { ServiceInputTypes, ServiceOutputTypes, WeatherClientResolvedConfig } from "../WeatherClient";
 import { getHttpApiKeyAuthPlugin } from "../middleware/HttpApiKeyAuth";
+import {
+  de_OnlyHttpApiKeyAndBearerAuthCommand,
+  se_OnlyHttpApiKeyAndBearerAuthCommand,
+} from "../protocols/Aws_restJson1";
 import { getSigV4AuthPlugin } from "@aws-sdk/middleware-signing";
 import { getSerdePlugin } from "@smithy/middleware-serde";
 import { Command as $Command } from "@smithy/smithy-client";
@@ -71,10 +75,6 @@ export class OnlyHttpApiKeyAndBearerAuthCommand extends $Command
   .s("Weather", "OnlyHttpApiKeyAndBearerAuth", {})
   .n("WeatherClient", "OnlyHttpApiKeyAndBearerAuthCommand")
   .f(void 0, void 0)
-  .ser(() => {
-    throw new Error("No supported protocol was found");
-  })
-  .de(() => {
-    throw new Error("No supported protocol was found");
-  })
+  .ser(se_OnlyHttpApiKeyAndBearerAuthCommand)
+  .de(de_OnlyHttpApiKeyAndBearerAuthCommand)
   .build() {}

private/weather-legacy-auth/src/commands/OnlyHttpApiKeyAndBearerAuthReversedCommand.ts

@@ -1,6 +1,10 @@
 // smithy-typescript generated code
 import { ServiceInputTypes, ServiceOutputTypes, WeatherClientResolvedConfig } from "../WeatherClient";
 import { getHttpApiKeyAuthPlugin } from "../middleware/HttpApiKeyAuth";
+import {
+  de_OnlyHttpApiKeyAndBearerAuthReversedCommand,
+  se_OnlyHttpApiKeyAndBearerAuthReversedCommand,
+} from "../protocols/Aws_restJson1";
 import { getSigV4AuthPlugin } from "@aws-sdk/middleware-signing";
 import { getSerdePlugin } from "@smithy/middleware-serde";
 import { Command as $Command } from "@smithy/smithy-client";
@@ -71,10 +75,6 @@ export class OnlyHttpApiKeyAndBearerAuthReversedCommand extends $Command
   .s("Weather", "OnlyHttpApiKeyAndBearerAuthReversed", {})
   .n("WeatherClient", "OnlyHttpApiKeyAndBearerAuthReversedCommand")
   .f(void 0, void 0)
-  .ser(() => {
-    throw new Error("No supported protocol was found");
-  })
-  .de(() => {
-    throw new Error("No supported protocol was found");
-  })
+  .ser(se_OnlyHttpApiKeyAndBearerAuthReversedCommand)
+  .de(de_OnlyHttpApiKeyAndBearerAuthReversedCommand)
   .build() {}

private/weather-legacy-auth/src/commands/OnlyHttpApiKeyAuthCommand.ts

@@ -1,6 +1,7 @@
 // smithy-typescript generated code
 import { ServiceInputTypes, ServiceOutputTypes, WeatherClientResolvedConfig } from "../WeatherClient";
 import { getHttpApiKeyAuthPlugin } from "../middleware/HttpApiKeyAuth";
+import { de_OnlyHttpApiKeyAuthCommand, se_OnlyHttpApiKeyAuthCommand } from "../protocols/Aws_restJson1";
 import { getSigV4AuthPlugin } from "@aws-sdk/middleware-signing";
 import { getSerdePlugin } from "@smithy/middleware-serde";
 import { Command as $Command } from "@smithy/smithy-client";
@@ -71,10 +72,6 @@ export class OnlyHttpApiKeyAuthCommand extends $Command
   .s("Weather", "OnlyHttpApiKeyAuth", {})
   .n("WeatherClient", "OnlyHttpApiKeyAuthCommand")
   .f(void 0, void 0)
-  .ser(() => {
-    throw new Error("No supported protocol was found");
-  })
-  .de(() => {
-    throw new Error("No supported protocol was found");
-  })
+  .ser(se_OnlyHttpApiKeyAuthCommand)
+  .de(de_OnlyHttpApiKeyAuthCommand)
   .build() {}

private/weather-legacy-auth/src/commands/OnlyHttpApiKeyAuthOptionalCommand.ts

@@ -1,5 +1,6 @@
 // smithy-typescript generated code
 import { ServiceInputTypes, ServiceOutputTypes, WeatherClientResolvedConfig } from "../WeatherClient";
+import { de_OnlyHttpApiKeyAuthOptionalCommand, se_OnlyHttpApiKeyAuthOptionalCommand } from "../protocols/Aws_restJson1";
 import { getSerdePlugin } from "@smithy/middleware-serde";
 import { Command as $Command } from "@smithy/smithy-client";
 import { MetadataBearer as __MetadataBearer } from "@smithy/types";
@@ -62,10 +63,6 @@ export class OnlyHttpApiKeyAuthOptionalCommand extends $Command
   .s("Weather", "OnlyHttpApiKeyAuthOptional", {})
   .n("WeatherClient", "OnlyHttpApiKeyAuthOptionalCommand")
   .f(void 0, void 0)
-  .ser(() => {
-    throw new Error("No supported protocol was found");
-  })
-  .de(() => {
-    throw new Error("No supported protocol was found");
-  })
+  .ser(se_OnlyHttpApiKeyAuthOptionalCommand)
+  .de(de_OnlyHttpApiKeyAuthOptionalCommand)
   .build() {}

private/weather-legacy-auth/src/commands/OnlyHttpBearerAuthCommand.ts

@@ -1,5 +1,6 @@
 // smithy-typescript generated code
 import { ServiceInputTypes, ServiceOutputTypes, WeatherClientResolvedConfig } from "../WeatherClient";
+import { de_OnlyHttpBearerAuthCommand, se_OnlyHttpBearerAuthCommand } from "../protocols/Aws_restJson1";
 import { getSigV4AuthPlugin } from "@aws-sdk/middleware-signing";
 import { getSerdePlugin } from "@smithy/middleware-serde";
 import { Command as $Command } from "@smithy/smithy-client";
@@ -63,10 +64,6 @@ export class OnlyHttpBearerAuthCommand extends $Command
   .s("Weather", "OnlyHttpBearerAuth", {})
   .n("WeatherClient", "OnlyHttpBearerAuthCommand")
   .f(void 0, void 0)
-  .ser(() => {
-    throw new Error("No supported protocol was found");
-  })
-  .de(() => {
-    throw new Error("No supported protocol was found");
-  })
+  .ser(se_OnlyHttpBearerAuthCommand)
+  .de(de_OnlyHttpBearerAuthCommand)
   .build() {}

private/weather-legacy-auth/src/commands/OnlyHttpBearerAuthOptionalCommand.ts

@@ -1,5 +1,6 @@
 // smithy-typescript generated code
 import { ServiceInputTypes, ServiceOutputTypes, WeatherClientResolvedConfig } from "../WeatherClient";
+import { de_OnlyHttpBearerAuthOptionalCommand, se_OnlyHttpBearerAuthOptionalCommand } from "../protocols/Aws_restJson1";
 import { getSerdePlugin } from "@smithy/middleware-serde";
 import { Command as $Command } from "@smithy/smithy-client";
 import { MetadataBearer as __MetadataBearer } from "@smithy/types";
@@ -62,10 +63,6 @@ export class OnlyHttpBearerAuthOptionalCommand extends $Command
   .s("Weather", "OnlyHttpBearerAuthOptional", {})
   .n("WeatherClient", "OnlyHttpBearerAuthOptionalCommand")
   .f(void 0, void 0)
-  .ser(() => {
-    throw new Error("No supported protocol was found");
-  })
-  .de(() => {
-    throw new Error("No supported protocol was found");
-  })
+  .ser(se_OnlyHttpBearerAuthOptionalCommand)
+  .de(de_OnlyHttpBearerAuthOptionalCommand)
   .build() {}

private/weather-legacy-auth/src/commands/OnlySigv4AuthCommand.ts

@@ -1,5 +1,6 @@
 // smithy-typescript generated code
 import { ServiceInputTypes, ServiceOutputTypes, WeatherClientResolvedConfig } from "../WeatherClient";
+import { de_OnlySigv4AuthCommand, se_OnlySigv4AuthCommand } from "../protocols/Aws_restJson1";
 import { getSigV4AuthPlugin } from "@aws-sdk/middleware-signing";
 import { getSerdePlugin } from "@smithy/middleware-serde";
 import { Command as $Command } from "@smithy/smithy-client";
@@ -63,10 +64,6 @@ export class OnlySigv4AuthCommand extends $Command
   .s("Weather", "OnlySigv4Auth", {})
   .n("WeatherClient", "OnlySigv4AuthCommand")
   .f(void 0, void 0)
-  .ser(() => {
-    throw new Error("No supported protocol was found");
-  })
-  .de(() => {
-    throw new Error("No supported protocol was found");
-  })
+  .ser(se_OnlySigv4AuthCommand)
+  .de(de_OnlySigv4AuthCommand)
   .build() {}

private/weather-legacy-auth/src/commands/OnlySigv4AuthOptionalCommand.ts

@@ -1,5 +1,6 @@
 // smithy-typescript generated code
 import { ServiceInputTypes, ServiceOutputTypes, WeatherClientResolvedConfig } from "../WeatherClient";
+import { de_OnlySigv4AuthOptionalCommand, se_OnlySigv4AuthOptionalCommand } from "../protocols/Aws_restJson1";
 import { getSerdePlugin } from "@smithy/middleware-serde";
 import { Command as $Command } from "@smithy/smithy-client";
 import { MetadataBearer as __MetadataBearer } from "@smithy/types";
@@ -62,10 +63,6 @@ export class OnlySigv4AuthOptionalCommand extends $Command
   .s("Weather", "OnlySigv4AuthOptional", {})
   .n("WeatherClient", "OnlySigv4AuthOptionalCommand")
   .f(void 0, void 0)
-  .ser(() => {
-    throw new Error("No supported protocol was found");
-  })
-  .de(() => {
-    throw new Error("No supported protocol was found");
-  })
+  .ser(se_OnlySigv4AuthOptionalCommand)
+  .de(de_OnlySigv4AuthOptionalCommand)
   .build() {}

private/weather-legacy-auth/src/commands/SameAsServiceCommand.ts

@@ -1,6 +1,7 @@
 // smithy-typescript generated code
 import { ServiceInputTypes, ServiceOutputTypes, WeatherClientResolvedConfig } from "../WeatherClient";
 import { SameAsServiceOutput } from "../models/models_0";
+import { de_SameAsServiceCommand, se_SameAsServiceCommand } from "../protocols/Aws_restJson1";
 import { getSigV4AuthPlugin } from "@aws-sdk/middleware-signing";
 import { getSerdePlugin } from "@smithy/middleware-serde";
 import { Command as $Command } from "@smithy/smithy-client";
@@ -66,10 +67,6 @@ export class SameAsServiceCommand extends $Command
   .s("Weather", "SameAsService", {})
   .n("WeatherClient", "SameAsServiceCommand")
   .f(void 0, void 0)
-  .ser(() => {
-    throw new Error("No supported protocol was found");
-  })
-  .de(() => {
-    throw new Error("No supported protocol was found");
-  })
+  .ser(se_SameAsServiceCommand)
+  .de(de_SameAsServiceCommand)
   .build() {}