chore: wip 2 for reading hostname from variants

Author: trivikr

packages/config-resolver/src/regionInfo/getHostnameFromVariants.ts

@@ -6,8 +6,9 @@ export interface GetHostnameFromVariantsOptions {
 }
 
 export const getHostnameFromVariants = (
-  variants: EndpointVariant[],
+  variants: EndpointVariant[] = [],
   { isFipsEndpoint, isDualstackEndpoint }: GetHostnameFromVariantsOptions
-) => {
-  return variants.find(({ tags }) => isFipsEndpoint).hostname;
-};
+) =>
+  variants.find(
+    ({ tags }) => isFipsEndpoint === tags.includes("fips") && isDualstackEndpoint === tags.includes("dualstack")
+  )?.hostname;

packages/config-resolver/src/regionInfo/getRegionInfo.ts

@@ -1,5 +1,6 @@
 import { RegionInfo } from "@aws-sdk/types";
 
+import { getHostnameFromVariants } from "./getHostnameFromVariants";
 import { getResolvedHostname } from "./getResolvedHostname";
 import { getResolvedPartition } from "./getResolvedPartition";
 import { getResolvedSigningRegion } from "./getResolvedSigningRegion";
@@ -27,13 +28,11 @@ export const getRegionInfo = (
   const partition = getResolvedPartition(region, { partitionHash });
   const resolvedRegion = region in regionHash ? region : partitionHash[partition]?.endpoint ?? region;
 
-  const hostname = getResolvedHostname(resolvedRegion, {
-    isFipsEndpoint,
-    isDualstackEndpoint,
-    signingService,
-    regionVariants: regionHash[resolvedRegion]?.variants,
-    partitionVariants: partitionHash[partition]?.variants,
-  });
+  const hostnameOptions = { isFipsEndpoint, isDualstackEndpoint };
+  const regionHostname = getHostnameFromVariants(regionHash[resolvedRegion]?.variants, hostnameOptions);
+  const partitionHostname = getHostnameFromVariants(partitionHash[partition]?.variants, hostnameOptions);
+  const hostname = getResolvedHostname(resolvedRegion, { signingService, regionHostname, partitionHostname });
+
   const signingRegion = getResolvedSigningRegion(region, {
     hostname,
     signingRegion: regionHash[resolvedRegion]?.signingRegion,

packages/config-resolver/src/regionInfo/getResolvedHostname.ts

@@ -1,15 +1,12 @@
-import { EndpointVariant } from "./EndpointVariant";
 import { getHostnameTemplate } from "./getHostnameTemplate";
 
 export interface GetResolvedHostnameOptions {
-  isFipsEndpoint: boolean;
-  isDualstackEndpoint: boolean;
   signingService: string;
-  regionVariants: EndpointVariant[];
-  partitionVariants: EndpointVariant[];
+  regionHostname?: string;
+  partitionHostname?: string;
 }
 
 export const getResolvedHostname = (
   resolvedRegion: string,
-  { signingService, regionVariants, partitionVariants }: GetResolvedHostnameOptions
-) => regionHostname ?? getHostnameTemplate(signingService, { partitionVariants }).replace("{region}", resolvedRegion);
+  { signingService, regionHostname, partitionHostname }: GetResolvedHostnameOptions
+) => regionHostname ?? getHostnameTemplate(signingService, { partitionHostname }).replace("{region}", resolvedRegion);