fix: allow authscheme resolver to access client ref (#1548)

Author: kuhe

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/auth/http/ResolveConfigFunction.java

@@ -5,6 +5,8 @@
 
 package software.amazon.smithy.typescript.codegen.auth.http;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 import software.amazon.smithy.codegen.core.Symbol;
 import software.amazon.smithy.utils.SmithyBuilder;
@@ -19,6 +21,7 @@ public final record ResolveConfigFunction(
     Symbol resolveConfigFunction,
     Symbol inputConfig,
     Symbol resolvedConfig,
+    List<String> addArgs,
     Optional<Symbol> previouslyResolved
 ) implements ToSmithyBuilder<ResolveConfigFunction> {
 
@@ -32,13 +35,15 @@ public Builder toBuilder() {
             .resolveConfigFunction(resolveConfigFunction)
             .inputConfig(inputConfig)
             .resolvedConfig(resolvedConfig)
+            .addArgs(addArgs)
             .previouslyResolved(previouslyResolved.orElse(null));
     }
 
     public static final class Builder implements SmithyBuilder<ResolveConfigFunction> {
         private Symbol resolveConfigFunction;
         private Symbol inputConfig;
         private Symbol resolvedConfig;
+        private List<String> addArgs = new ArrayList<>();
         private Symbol previouslyResolved;
 
         @Override
@@ -47,6 +52,7 @@ public ResolveConfigFunction build() {
                 SmithyBuilder.requiredState("resolveConfigFunction", resolveConfigFunction),
                 SmithyBuilder.requiredState("inputConfig", inputConfig),
                 SmithyBuilder.requiredState("resolvedConfig", resolvedConfig),
+                SmithyBuilder.requiredState("addArgs", addArgs),
                 Optional.ofNullable(previouslyResolved));
         }
 
@@ -65,6 +71,11 @@ public Builder resolvedConfig(Symbol resolvedConfig) {
             return this;
         }
 
+        public Builder addArgs(List<String> args) {
+            this.addArgs = args;
+            return this;
+        }
+
         public Builder previouslyResolved(Symbol previouslyResolved) {
             this.previouslyResolved = previouslyResolved;
             return this;

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

@@ -85,6 +85,9 @@ public List<RuntimeClientPlugin> getClientPlugins() {
                         .namespace(AuthUtils.HTTP_AUTH_SCHEME_PROVIDER_MODULE, "/")
                         .name("resolveHttpAuthSchemeConfig")
                         .build())
+                .additionalResolveFunctionParamsSupplier((m, s, o) -> Map.of(
+                    "client", Symbol.builder().name("() => this").build()
+                ))
                 .build()
         );
     }
@@ -364,7 +367,8 @@ private void generateResolveHttpAuthSchemeConfigFunction(
             .filter(e -> e.getValue().previouslyResolved().isPresent())
             .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
         w.writeDocs("@internal");
-        w.writeInline("export const resolveHttpAuthSchemeConfig = <T>(config: T & HttpAuthSchemeInputConfig");
+        w.writeInline("""
+            export const resolveHttpAuthSchemeConfig = <T>(config: T & HttpAuthSchemeInputConfig""");
         if (!previousResolvedFunctions.isEmpty()) {
             w.writeInline(" & ");
             Iterator<ResolveConfigFunction> iter = previousResolvedFunctions.values().iterator();
@@ -376,7 +380,9 @@ private void generateResolveHttpAuthSchemeConfigFunction(
                 }
             }
         }
-        w.write("): T & HttpAuthSchemeResolvedConfig => {");
+        w.write("""
+            , { client }: { client: () => { config: AwsSdkSigV4AuthResolvedConfig } }
+            ): T & HttpAuthSchemeResolvedConfig => {""");
         w.indent();
         w.pushState(ResolveHttpAuthSchemeConfigFunctionConfigFieldsCodeSection.builder()
             .service(s.getService())
@@ -402,7 +408,18 @@ private void generateResolveHttpAuthSchemeConfigFunction(
         Integer i = 0;
         String configName = "config";
         for (ResolveConfigFunction resolveConfigFunction : resolveConfigFunctions.values()) {
-            w.write("const config_$L = $T($L);", i, resolveConfigFunction.resolveConfigFunction(), configName);
+            w.openBlock(
+                "const config_$L = $T($L",
+                ");",
+                i,
+                resolveConfigFunction.resolveConfigFunction(),
+                configName,
+                () -> {
+                    for (String addArg : resolveConfigFunction.addArgs()) {
+                        w.writeInline(", $L", addArg);
+                    }
+                }
+            );
             configName = "config_" + i;
             i++;
         }