feat(experimentalIdentityAndAuth): add different `httpAuthSchemeMiddl…

…eware` plugins depending on `@endpointRuleSet` (#1004)
smithy-lang · Oct 10, 2023 · 6c53a93 · 6c53a93
1 parent 58824d8
commit 6c53a93
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 5 deletions.
diff --git a/.changeset/plenty-cycles-boil.md b/.changeset/plenty-cycles-boil.md
@@ -0,0 +1,5 @@
+---
+"@smithy/experimental-identity-and-auth": patch
+---
+
+Add different `httpAuthSchemeMiddleware` plugins depending on `@endpointRuleSet`
diff --git a/packages/experimental-identity-and-auth/package.json b/packages/experimental-identity-and-auth/package.json
@@ -26,6 +26,7 @@
   "dependencies": {
     "@smithy/middleware-endpoint": "workspace:^",
     "@smithy/middleware-retry": "workspace:^",
+    "@smithy/middleware-serde": "workspace:^",
     "@smithy/protocol-http": "workspace:^",
     "@smithy/signature-v4": "workspace:^",
     "@smithy/types": "workspace:^",

diff --git a/...entity-and-auth/src/middleware-http-auth-scheme/getHttpAuthSchemeEndpointRuleSetPlugin.ts b/...entity-and-auth/src/middleware-http-auth-scheme/getHttpAuthSchemeEndpointRuleSetPlugin.ts
@@ -0,0 +1,33 @@
+import { endpointMiddlewareOptions } from "@smithy/middleware-endpoint";
+import { HandlerExecutionContext, Pluggable, RelativeMiddlewareOptions, SerializeHandlerOptions } from "@smithy/types";
+
+import { HttpAuthSchemeParameters } from "../HttpAuthSchemeProvider";
+import { httpAuthSchemeMiddleware, PreviouslyResolved } from "./httpAuthSchemeMiddleware";
+
+/**
+ * @internal
+ */
+export const httpAuthSchemeEndpointRuleSetMiddlewareOptions: SerializeHandlerOptions & RelativeMiddlewareOptions = {
+  step: "serialize",
+  tags: ["HTTP_AUTH_SCHEME"],
+  name: "httpAuthSchemeMiddleware",
+  override: true,
+  relation: "before",
+  toMiddleware: endpointMiddlewareOptions.name!,
+};
+
+/**
+ * @internal
+ */
+export const getHttpAuthSchemeEndpointRuleSetPlugin = <
+  TConfig extends object,
+  TContext extends HandlerExecutionContext,
+  TParameters extends HttpAuthSchemeParameters,
+  TInput extends object
+>(
+  config: TConfig & PreviouslyResolved<TConfig, TContext, TParameters, TInput>
+): Pluggable<any, any> => ({
+  applyToStack: (clientStack) => {
+    clientStack.addRelativeTo(httpAuthSchemeMiddleware(config), httpAuthSchemeEndpointRuleSetMiddlewareOptions);
+  },
+});
diff --git a/...experimental-identity-and-auth/src/middleware-http-auth-scheme/getHttpAuthSchemePlugin.ts b/...experimental-identity-and-auth/src/middleware-http-auth-scheme/getHttpAuthSchemePlugin.ts
@@ -1,4 +1,4 @@
-import { endpointMiddlewareOptions } from "@smithy/middleware-endpoint";
+import { serializerMiddlewareOption } from "@smithy/middleware-serde";
 import { HandlerExecutionContext, Pluggable, RelativeMiddlewareOptions, SerializeHandlerOptions } from "@smithy/types";
 
 import { HttpAuthSchemeParameters } from "../HttpAuthSchemeProvider";
@@ -13,7 +13,7 @@ export const httpAuthSchemeMiddlewareOptions: SerializeHandlerOptions & Relative
   name: "httpAuthSchemeMiddleware",
   override: true,
   relation: "before",
-  toMiddleware: endpointMiddlewareOptions.name!,
+  toMiddleware: serializerMiddlewareOption.name!,
 };
 
 /**

diff --git a/packages/experimental-identity-and-auth/src/middleware-http-auth-scheme/index.ts b/packages/experimental-identity-and-auth/src/middleware-http-auth-scheme/index.ts
@@ -1,2 +1,3 @@
 export * from "./httpAuthSchemeMiddleware";
+export * from "./getHttpAuthSchemeEndpointRuleSetPlugin";
 export * from "./getHttpAuthSchemePlugin";
diff --git a/...e/amazon/smithy/typescript/codegen/auth/http/integration/AddHttpAuthSchemeMiddleware.java b/...e/amazon/smithy/typescript/codegen/auth/http/integration/AddHttpAuthSchemeMiddleware.java
@@ -5,8 +5,6 @@
 
 package software.amazon.smithy.typescript.codegen.auth.http.integration;
 
-import static software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin.Convention.HAS_MIDDLEWARE;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -17,6 +15,7 @@
 import software.amazon.smithy.model.knowledge.ServiceIndex;
 import software.amazon.smithy.model.shapes.ServiceShape;
 import software.amazon.smithy.model.shapes.ShapeId;
+import software.amazon.smithy.rulesengine.traits.EndpointRuleSetTrait;
 import software.amazon.smithy.typescript.codegen.CodegenUtils;
 import software.amazon.smithy.typescript.codegen.ConfigField;
 import software.amazon.smithy.typescript.codegen.TypeScriptCodegenContext;
@@ -27,6 +26,7 @@
 import software.amazon.smithy.typescript.codegen.auth.http.HttpAuthScheme;
 import software.amazon.smithy.typescript.codegen.auth.http.SupportedHttpAuthSchemesIndex;
 import software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin;
+import software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin.Convention;
 import software.amazon.smithy.utils.SmithyInternalApi;
 
 /**
@@ -46,10 +46,18 @@ public boolean matchesSettings(TypeScriptSettings settings) {
     public List<RuntimeClientPlugin> getClientPlugins() {
         return List.of(
             RuntimeClientPlugin.builder()
+                .servicePredicate((m, s) -> s.hasTrait(EndpointRuleSetTrait.ID))
+                .withConventions(
+                    TypeScriptDependency.EXPERIMENTAL_IDENTITY_AND_AUTH.dependency,
+                    "HttpAuthSchemeEndpointRuleSet",
+                    Convention.HAS_MIDDLEWARE)
+                .build(),
+            RuntimeClientPlugin.builder()
+                .servicePredicate((m, s) -> !s.hasTrait(EndpointRuleSetTrait.ID))
                 .withConventions(
                     TypeScriptDependency.EXPERIMENTAL_IDENTITY_AND_AUTH.dependency,
                     "HttpAuthScheme",
-                    HAS_MIDDLEWARE)
+                    Convention.HAS_MIDDLEWARE)
                 .build(),
             RuntimeClientPlugin.builder()
                 .inputConfig(Symbol.builder()

diff --git a/yarn.lock b/yarn.lock
@@ -1871,6 +1871,7 @@ __metadata:
   dependencies:
     "@smithy/middleware-endpoint": "workspace:^"
     "@smithy/middleware-retry": "workspace:^"
+    "@smithy/middleware-serde": "workspace:^"
     "@smithy/protocol-http": "workspace:^"
     "@smithy/signature-v4": "workspace:^"
     "@smithy/types": "workspace:^"