chore(config-resolver): reuse code in CustomEndpointsConfig (#2720)

Co-authored-by: Jaykumar Gosar <[email protected]>

Author: trivikr

packages/config-resolver/src/CustomEndpointsConfig.spec.ts

@@ -1 +1,2 @@
+export * from "./resolveCustomEndpointsConfig";
 export * from "./resolveEndpointsConfig";

packages/config-resolver/src/CustomEndpointsConfig.ts

@@ -0,0 +1,43 @@
+import { resolveCustomEndpointsConfig } from "./resolveCustomEndpointsConfig";
+import { normalizeEndpoint } from "./utils/normalizeEndpoint";
+
+jest.mock("./utils/normalizeEndpoint");
+
+describe(resolveCustomEndpointsConfig.name, () => {
+  const mockEndpoint = {
+    protocol: "http:",
+    hostname: "localhost",
+    path: "/",
+  };
+
+  const mockInput = { endpoint: mockEndpoint } as any;
+
+  beforeEach(() => {
+    (normalizeEndpoint as jest.Mock).mockReturnValueOnce(() => Promise.resolve(mockEndpoint));
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe("tls", () => {
+    it.each([true, false])("returns %s when it's %s", (tls) => {
+      expect(resolveCustomEndpointsConfig({ ...mockInput, tls }).tls).toStrictEqual(tls);
+    });
+
+    it("returns true if input.tls is undefined", () => {
+      expect(resolveCustomEndpointsConfig({ ...mockInput }).tls).toStrictEqual(true);
+    });
+  });
+
+  it("returns true for isCustomEndpoint", () => {
+    expect(resolveCustomEndpointsConfig(mockInput).isCustomEndpoint).toStrictEqual(true);
+  });
+
+  it("returns normalized endpoint", async () => {
+    const endpoint = await resolveCustomEndpointsConfig(mockInput).endpoint();
+    expect(endpoint).toStrictEqual(mockEndpoint);
+    expect(normalizeEndpoint).toHaveBeenCalledTimes(1);
+    expect(normalizeEndpoint).toHaveBeenCalledWith(mockInput);
+  });
+});

packages/config-resolver/src/endpointsConfig/index.ts

@@ -0,0 +1,32 @@
+import { Endpoint, Provider, UrlParser } from "@aws-sdk/types";
+
+import { EndpointsInputConfig, EndpointsResolvedConfig } from "./resolveEndpointsConfig";
+import { normalizeEndpoint } from "./utils/normalizeEndpoint";
+
+export interface CustomEndpointsInputConfig extends EndpointsInputConfig {
+  /**
+   * The fully qualified endpoint of the webservice.
+   */
+  endpoint: string | Endpoint | Provider<Endpoint>;
+}
+
+interface PreviouslyResolved {
+  urlParser: UrlParser;
+}
+
+export interface CustomEndpointsResolvedConfig extends EndpointsResolvedConfig {
+  /**
+   * Whether the endpoint is specified by caller.
+   * @internal
+   */
+  isCustomEndpoint: true;
+}
+
+export const resolveCustomEndpointsConfig = <T>(
+  input: T & CustomEndpointsInputConfig & PreviouslyResolved
+): T & CustomEndpointsResolvedConfig => ({
+  ...input,
+  tls: input.tls ?? true,
+  endpoint: normalizeEndpoint(input),
+  isCustomEndpoint: true,
+});

packages/config-resolver/src/endpointsConfig/resolveCustomEndpointsConfig.spec.ts

@@ -1,9 +1,9 @@
-import { getEndpointFromRegion } from "./getEndpointFromRegion";
-import { normalizeEndpoint } from "./normalizeEndpoint";
 import { resolveEndpointsConfig } from "./resolveEndpointsConfig";
+import { getEndpointFromRegion } from "./utils/getEndpointFromRegion";
+import { normalizeEndpoint } from "./utils/normalizeEndpoint";
 
-jest.mock("./getEndpointFromRegion");
-jest.mock("./normalizeEndpoint");
+jest.mock("./utils/getEndpointFromRegion");
+jest.mock("./utils/normalizeEndpoint");
 
 describe(resolveEndpointsConfig.name, () => {
   const mockEndpoint = {

packages/config-resolver/src/endpointsConfig/resolveCustomEndpointsConfig.ts

@@ -1,7 +1,7 @@
 import { Endpoint, Provider, RegionInfoProvider, UrlParser } from "@aws-sdk/types";
 
-import { getEndpointFromRegion } from "./getEndpointFromRegion";
-import { normalizeEndpoint } from "./normalizeEndpoint";
+import { getEndpointFromRegion } from "./utils/getEndpointFromRegion";
+import { normalizeEndpoint } from "./utils/normalizeEndpoint";
 
 export interface EndpointsInputConfig {
   /**

packages/config-resolver/src/endpointsConfig/resolveEndpointsConfig.spec.ts

@@ -1,4 +1,3 @@
-export * from "./CustomEndpointsConfig";
 export * from "./endpointsConfig";
 export * from "./RegionConfig";
 export * from "./regionInfo";