Check method before calling external middlewareStack instance (#954)

smithy-lang · Sep 21, 2023 · 20fc148 · 20fc148
1 parent b9b29cc
commit 20fc148
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/.changeset/few-crews-brake.md b/.changeset/few-crews-brake.md
@@ -0,0 +1,5 @@
+---
+"@smithy/middleware-stack": patch
+---
+
+check calls to external instances of middlewareStack
diff --git a/packages/middleware-stack/src/MiddlewareStack.spec.ts b/packages/middleware-stack/src/MiddlewareStack.spec.ts
@@ -370,6 +370,22 @@ describe("MiddlewareStack", () => {
     });
   });
 
+  it("checks identifyOnResolve calls to external instances due to version mismatching", () => {
+    const newStack = constructStack<input, output>();
+    const oldStack = constructStack<input, output>();
+
+    delete (oldStack as any).identifyOnResolve;
+    oldStack.clone = () => oldStack;
+    oldStack.concat = <S>(stack: S) => oldStack as S;
+    oldStack.applyToStack = () => void 0;
+
+    expect(oldStack.identifyOnResolve).toBeUndefined();
+    expect(() => {
+      newStack.concat(oldStack);
+      newStack.clone();
+    }).not.toThrow();
+  });
+
   describe("use", () => {
     it("should apply customizations from pluggables", async () => {
       const stack = constructStack<input, output>();

diff --git a/packages/middleware-stack/src/MiddlewareStack.ts b/packages/middleware-stack/src/MiddlewareStack.ts
@@ -69,7 +69,7 @@ export const constructStack = <Input extends object, Output extends object>(): M
       //@ts-ignore
       toStack.addRelativeTo(entry.middleware, { ...entry });
     });
-    toStack.identifyOnResolve(stack.identifyOnResolve());
+    toStack.identifyOnResolve?.(stack.identifyOnResolve());
     return toStack;
   };
 
@@ -239,7 +239,9 @@ export const constructStack = <Input extends object, Output extends object>(): M
     ): MiddlewareStack<InputType, OutputType> => {
       const cloned = cloneTo(constructStack<InputType, OutputType>());
       cloned.use(from);
-      cloned.identifyOnResolve(identifyOnResolve || cloned.identifyOnResolve() || from.identifyOnResolve());
+      cloned.identifyOnResolve(
+        identifyOnResolve || cloned.identifyOnResolve() || (from.identifyOnResolve?.() ?? false)
+      );
       return cloned;
     },