chore(config-resolver): pass fips/dualstack config while resolving endpoints

Author: trivikr

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

@@ -57,13 +57,17 @@ export interface EndpointsResolvedConfig extends Required<EndpointsInputConfig>
 
 export const resolveEndpointsConfig = <T>(
   input: T & EndpointsInputConfig & PreviouslyResolved
-): T & EndpointsResolvedConfig => ({
-  ...input,
-  tls: input.tls ?? true,
-  endpoint: input.endpoint
-    ? normalizeEndpoint({ ...input, endpoint: input.endpoint })
-    : () => getEndpointFromRegion(input),
-  isCustomEndpoint: input.endpoint ? true : false,
-  useDualstackEndpoint: normalizeBoolean(input.useDualstackEndpoint!),
-  useFipsEndpoint: normalizeBoolean(input.useFipsEndpoint!),
-});
+): T & EndpointsResolvedConfig => {
+  const useDualstackEndpoint = normalizeBoolean(input.useDualstackEndpoint!);
+  const useFipsEndpoint = normalizeBoolean(input.useFipsEndpoint!);
+  return {
+    ...input,
+    tls: input.tls ?? true,
+    endpoint: input.endpoint
+      ? normalizeEndpoint({ ...input, endpoint: input.endpoint })
+      : () => getEndpointFromRegion({ ...input, useDualstackEndpoint, useFipsEndpoint }),
+    isCustomEndpoint: input.endpoint ? true : false,
+    useDualstackEndpoint,
+    useFipsEndpoint,
+  };
+};

packages/config-resolver/src/endpointsConfig/utils/getEndpointFromRegion.spec.ts

@@ -4,8 +4,16 @@ describe(getEndpointFromRegion.name, () => {
   const mockRegion = jest.fn();
   const mockUrlParser = jest.fn();
   const mockRegionInfoProvider = jest.fn();
+  const mockUseFipsEndpoint = jest.fn();
+  const mockUseDualstackEndpoint = jest.fn();
 
-  const mockInput = { region: mockRegion, urlParser: mockUrlParser, regionInfoProvider: mockRegionInfoProvider };
+  const mockInput = {
+    region: mockRegion,
+    urlParser: mockUrlParser,
+    regionInfoProvider: mockRegionInfoProvider,
+    useDualstackEndpoint: mockUseDualstackEndpoint,
+    useFipsEndpoint: mockUseFipsEndpoint,
+  };
 
   const mockRegionValue = "mockRegion";
   const mockEndpoint = {
@@ -19,6 +27,8 @@ describe(getEndpointFromRegion.name, () => {
     mockRegion.mockResolvedValue(mockRegionValue);
     mockUrlParser.mockResolvedValue(mockEndpoint);
     mockRegionInfoProvider.mockResolvedValue(mockRegionInfo);
+    mockUseFipsEndpoint.mockResolvedValue(false);
+    mockUseDualstackEndpoint.mockResolvedValue(false);
   });
 
   afterEach(() => {
@@ -28,7 +38,10 @@ describe(getEndpointFromRegion.name, () => {
 
   describe("tls", () => {
     afterEach(() => {
-      expect(mockRegionInfoProvider).toHaveBeenCalledWith(mockRegionValue);
+      expect(mockRegionInfoProvider).toHaveBeenCalledWith(mockRegionValue, {
+        useDualstackEndpoint: false,
+        useFipsEndpoint: false,
+      });
     });
 
     it("uses protocol https when not defined", async () => {
@@ -81,14 +94,20 @@ describe(getEndpointFromRegion.name, () => {
     } catch (error) {
       expect(error.message).toEqual(errorMsg);
     }
-    expect(mockRegionInfoProvider).toHaveBeenCalledWith(mockRegionValue);
+    expect(mockRegionInfoProvider).toHaveBeenCalledWith(mockRegionValue, {
+      useDualstackEndpoint: false,
+      useFipsEndpoint: false,
+    });
     expect(mockUrlParser).not.toHaveBeenCalled();
   });
 
   it("returns parsed endpoint", async () => {
     const endpoint = await getEndpointFromRegion(mockInput);
     expect(endpoint).toEqual(mockEndpoint);
-    expect(mockRegionInfoProvider).toHaveBeenCalledWith(mockRegionValue);
+    expect(mockRegionInfoProvider).toHaveBeenCalledWith(mockRegionValue, {
+      useDualstackEndpoint: false,
+      useFipsEndpoint: false,
+    });
     expect(mockUrlParser).toHaveBeenCalledWith(`https://${mockRegionInfo.hostname}`);
   });
 });

packages/config-resolver/src/endpointsConfig/utils/getEndpointFromRegion.ts

@@ -5,6 +5,8 @@ interface GetEndpointFromRegionOptions {
   tls?: boolean;
   regionInfoProvider: RegionInfoProvider;
   urlParser: UrlParser;
+  useDualstackEndpoint: Provider<boolean>;
+  useFipsEndpoint: Provider<boolean>;
 }
 
 export const getEndpointFromRegion = async (input: GetEndpointFromRegionOptions) => {
@@ -16,7 +18,9 @@ export const getEndpointFromRegion = async (input: GetEndpointFromRegionOptions)
     throw new Error("Invalid region in client config");
   }
 
-  const { hostname } = (await input.regionInfoProvider(region)) ?? {};
+  const useDualstackEndpoint = await input.useDualstackEndpoint();
+  const useFipsEndpoint = await input.useFipsEndpoint();
+  const { hostname } = (await input.regionInfoProvider(region, { useDualstackEndpoint, useFipsEndpoint })) ?? {};
   if (!hostname) {
     throw new Error("Cannot resolve hostname from client config");
   }