fix(signature-v4-multi-region): report available sigv4a dependency (#7113)

* fix(signature-v4-multi-region): report available sigv4a dependency

* fix(codegen): check sigv4a available for fallback

* chore: typo

* test(signature-v4-multi-region): add sigV4aDependency test

* fix(codegen): codegen run for sigv4aDependency

* test(signature-v4-multi-region): minimal browser deps check

---------

Co-authored-by: siddsriv <[email protected]>

Author: kuhe

clients/client-cloudfront-keyvaluestore/src/auth/httpAuthSchemeProvider.ts

@@ -9,7 +9,7 @@ import {
   resolveAwsSdkSigV4AConfig,
   resolveAwsSdkSigV4Config,
 } from "@aws-sdk/core";
-import { signatureV4CrtContainer } from "@aws-sdk/signature-v4-multi-region";
+import { SignatureV4MultiRegion } from "@aws-sdk/signature-v4-multi-region";
 import { EndpointParameterInstructions, resolveParams } from "@smithy/middleware-endpoint";
 import {
   EndpointV2,
@@ -248,7 +248,7 @@ const createEndpointRuleSetHttpAuthSchemeProvider = <
           const name = s.name.toLowerCase();
           return name !== "sigv4a" && name.startsWith("sigv4");
         });
-        if (!signatureV4CrtContainer.CrtSignerV4 && sigv4Present) {
+        if (SignatureV4MultiRegion.sigv4aDependency() === "none" && sigv4Present) {
           // sigv4a -> sigv4 fallback.
           continue;
         }

clients/client-eventbridge/src/auth/httpAuthSchemeProvider.ts

@@ -9,7 +9,7 @@ import {
   resolveAwsSdkSigV4AConfig,
   resolveAwsSdkSigV4Config,
 } from "@aws-sdk/core";
-import { signatureV4CrtContainer } from "@aws-sdk/signature-v4-multi-region";
+import { SignatureV4MultiRegion } from "@aws-sdk/signature-v4-multi-region";
 import { EndpointParameterInstructions, resolveParams } from "@smithy/middleware-endpoint";
 import {
   EndpointV2,
@@ -236,7 +236,7 @@ const createEndpointRuleSetHttpAuthSchemeProvider = <
           const name = s.name.toLowerCase();
           return name !== "sigv4a" && name.startsWith("sigv4");
         });
-        if (!signatureV4CrtContainer.CrtSignerV4 && sigv4Present) {
+        if (SignatureV4MultiRegion.sigv4aDependency() === "none" && sigv4Present) {
           // sigv4a -> sigv4 fallback.
           continue;
         }

clients/client-s3/src/auth/httpAuthSchemeProvider.ts

@@ -9,7 +9,7 @@ import {
   resolveAwsSdkSigV4AConfig,
   resolveAwsSdkSigV4Config,
 } from "@aws-sdk/core";
-import { signatureV4CrtContainer } from "@aws-sdk/signature-v4-multi-region";
+import { SignatureV4MultiRegion } from "@aws-sdk/signature-v4-multi-region";
 import { EndpointParameterInstructions, resolveParams } from "@smithy/middleware-endpoint";
 import {
   EndpointV2,
@@ -235,7 +235,7 @@ const createEndpointRuleSetHttpAuthSchemeProvider = <
           const name = s.name.toLowerCase();
           return name !== "sigv4a" && name.startsWith("sigv4");
         });
-        if (!signatureV4CrtContainer.CrtSignerV4 && sigv4Present) {
+        if (SignatureV4MultiRegion.sigv4aDependency() === "none" && sigv4Present) {
           // sigv4a -> sigv4 fallback.
           continue;
         }

clients/client-sesv2/src/auth/httpAuthSchemeProvider.ts

@@ -9,7 +9,7 @@ import {
   resolveAwsSdkSigV4AConfig,
   resolveAwsSdkSigV4Config,
 } from "@aws-sdk/core";
-import { signatureV4CrtContainer } from "@aws-sdk/signature-v4-multi-region";
+import { SignatureV4MultiRegion } from "@aws-sdk/signature-v4-multi-region";
 import { EndpointParameterInstructions, resolveParams } from "@smithy/middleware-endpoint";
 import {
   EndpointV2,
@@ -235,7 +235,7 @@ const createEndpointRuleSetHttpAuthSchemeProvider = <
           const name = s.name.toLowerCase();
           return name !== "sigv4a" && name.startsWith("sigv4");
         });
-        if (!signatureV4CrtContainer.CrtSignerV4 && sigv4Present) {
+        if (SignatureV4MultiRegion.sigv4aDependency() === "none" && sigv4Present) {
           // sigv4a -> sigv4 fallback.
           continue;
         }

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

@@ -373,7 +373,7 @@ interface EndpointRuleSetHttpAuthSchemeProvider<
                           HttpAuthSchemeParametersT extends HttpAuthSchemeParameters
                         > extends HttpAuthSchemeProvider<EndpointParametersT & HttpAuthSchemeParametersT> { }""");
                     w.addDependency(TypeScriptDependency.SMITHY_TYPES);
-                    w.addImport("signatureV4CrtContainer", null, AwsDependency.SIGNATURE_V4_MULTIREGION);
+                    w.addImport("SignatureV4MultiRegion", null, AwsDependency.SIGNATURE_V4_MULTIREGION);
                     w.addImport("Logger", null, TypeScriptDependency.SMITHY_TYPES);
                     w.addImport("EndpointV2", null, TypeScriptDependency.SMITHY_TYPES);
                     w.writeDocs("@internal");
@@ -419,7 +419,7 @@ interface DefaultEndpointResolver<EndpointParametersT extends EndpointParameters
                                   const name = s.name.toLowerCase();
                                   return name !== "sigv4a" && name.startsWith("sigv4");
                                 });
-                                if (!signatureV4CrtContainer.CrtSignerV4 && sigv4Present) {
+                                if (SignatureV4MultiRegion.sigv4aDependency() === "none" && sigv4Present) {
                                   // sigv4a -> sigv4 fallback.
                                   continue;
                                 }

packages/signature-v4-multi-region/src/SignatureV4MultiRegion.browser.spec.ts

@@ -75,4 +75,8 @@ describe("SignatureV4MultiRegion (Browser Bundle SigV4a Test)", () => {
         "This scenario is covered in source unit tests."
     );
   });
+
+  it("should correctly identify JS SigV4a implementation in browser environment", () => {
+    expect(SignatureV4MultiRegion.sigv4aDependency()).toBe("js");
+  });
 });

packages/signature-v4-multi-region/src/SignatureV4MultiRegion.spec.ts

@@ -51,6 +51,32 @@ describe("SignatureV4MultiRegion", () => {
     vi.clearAllMocks();
   });
 
+  describe("sigv4aDependency", () => {
+    it("should return 'crt' when CrtSignerV4 is available", () => {
+      signatureV4CrtContainer.CrtSignerV4 = CrtSignerV4 as any;
+      signatureV4aContainer.SignatureV4a = null;
+      expect(SignatureV4MultiRegion.sigv4aDependency()).toBe("crt");
+    });
+
+    it("should return 'crt' when CrtSignerV4 and SignatureV4a are available", () => {
+      signatureV4CrtContainer.CrtSignerV4 = CrtSignerV4 as any;
+      signatureV4aContainer.SignatureV4a = SignatureV4a as any;
+      expect(SignatureV4MultiRegion.sigv4aDependency()).toBe("crt");
+    });
+
+    it("should return 'js' when only SignatureV4a is available", () => {
+      signatureV4CrtContainer.CrtSignerV4 = null;
+      signatureV4aContainer.SignatureV4a = SignatureV4a as any;
+      expect(SignatureV4MultiRegion.sigv4aDependency()).toBe("js");
+    });
+
+    it("should return 'none' when neither implementation is available", () => {
+      signatureV4CrtContainer.CrtSignerV4 = null;
+      signatureV4aContainer.SignatureV4a = null;
+      expect(SignatureV4MultiRegion.sigv4aDependency()).toBe("none");
+    });
+  });
+
   it("should sign with SigV4 signer", async () => {
     const signer = new SignatureV4MultiRegion(params);
     await signer.sign(minimalRequest);

packages/signature-v4-multi-region/src/SignatureV4MultiRegion.ts

@@ -36,6 +36,15 @@ export class SignatureV4MultiRegion implements RequestPresigner, RequestSigner {
   private readonly sigv4Signer: SignatureV4S3Express;
   private readonly signerOptions: SignatureV4MultiRegionInit;
 
+  public static sigv4aDependency(): "none" | "js" | "crt" {
+    if (typeof signatureV4CrtContainer.CrtSignerV4 === "function") {
+      return "crt";
+    } else if (typeof signatureV4aContainer.SignatureV4a === "function") {
+      return "js";
+    }
+    return "none";
+  }
+  
   constructor(options: SignatureV4MultiRegionInit) {
     this.sigv4Signer = new SignatureV4S3Express(options);
     this.signerOptions = options;