fix(middleware-endpoint): fix for resolving file/env endpoint

Author: kuhe

.changeset/fifty-news-serve.md

@@ -0,0 +1,5 @@
+---
+"@smithy/middleware-endpoint": patch
+---
+
+fix resolving file/env configured endpoint

packages/middleware-endpoint/src/adaptors/getEndpointFromInstructions.spec.ts

@@ -0,0 +1,49 @@
+import { describe, expect, test as it, vi } from "vitest";
+import { getEndpointFromInstructions } from "./getEndpointFromInstructions";
+
+describe(getEndpointFromInstructions.name, () => {
+  it("should set the isCustomEndpoint flag after resolving an externally configured endpoint", async () => {
+    process.env.AWS_ENDPOINT_URL = "https://localhost";
+
+    const config = {
+      serviceId: "service id",
+      isCustomEndpoint: false,
+      endpointProvider: vi.fn(),
+    };
+
+    await getEndpointFromInstructions(
+      {},
+      {
+        getEndpointParameterInstructions() {
+          return {};
+        },
+      },
+      config
+    );
+
+    expect(config.isCustomEndpoint).toBe(true);
+  });
+
+  it("should not use externally configured endpoint if code-level endpoint was set", async () => {
+    process.env.AWS_ENDPOINT_URL = "https://localhost";
+
+    const config = {
+      serviceId: "service id",
+      isCustomEndpoint: true,
+      endpointProvider: vi.fn().mockReturnValue(Symbol.for("endpoint")),
+    };
+
+    const endpoint = await getEndpointFromInstructions(
+      {},
+      {
+        getEndpointParameterInstructions() {
+          return {};
+        },
+      },
+      config
+    );
+
+    expect(config.isCustomEndpoint).toBe(true);
+    expect(endpoint).toBe(Symbol.for("endpoint"));
+  });
+});

packages/middleware-endpoint/src/adaptors/getEndpointFromInstructions.ts

@@ -31,7 +31,7 @@ export type EndpointParameterInstructionsSupplier = Partial<{
 export const getEndpointFromInstructions = async <
   T extends EndpointParameters,
   CommandInput extends Record<string, unknown>,
-  Config extends Record<string, unknown>,
+  Config extends Record<string, unknown>
 >(
   commandInput: CommandInput,
   instructionsSupplier: EndpointParameterInstructionsSupplier,
@@ -52,6 +52,7 @@ export const getEndpointFromInstructions = async <
 
     if (endpointFromConfig) {
       clientConfig.endpoint = () => Promise.resolve(toEndpointV1(endpointFromConfig!));
+      clientConfig.isCustomEndpoint = true;
     }
   }
 
@@ -71,7 +72,7 @@ export const getEndpointFromInstructions = async <
 export const resolveParams = async <
   T extends EndpointParameters,
   CommandInput extends Record<string, unknown>,
-  Config extends Record<string, unknown>,
+  Config extends Record<string, unknown>
 >(
   commandInput: CommandInput,
   instructionsSupplier: EndpointParameterInstructionsSupplier,