chore: store endpointDiscoveryId in an optional param instead of function

Author: trivikr

packages/middleware-endpoint-discovery/src/getCacheKey.ts

@@ -7,15 +7,17 @@ import { AwsAuthResolvedConfig } from "@aws-sdk/middleware-signing";
 export const getCacheKey = async (
   commandName: string,
   config: AwsAuthResolvedConfig & RegionResolvedConfig,
-  getEndpointDiscoveryId: () => string | undefined
+  options: {
+    endpointDiscoveryId?: string;
+  }
 ) => {
   const region = await config.region();
   const { accessKeyId } = await config.credentials();
-  const identifiers = getEndpointDiscoveryId ? getEndpointDiscoveryId() : undefined;
+  const { endpointDiscoveryId } = options;
   return {
     commandName,
     ...(region && { region }),
     ...(accessKeyId && { accessKeyId }),
-    ...(identifiers && { identifiers }),
+    ...(endpointDiscoveryId && { endpointDiscoveryId }),
   }.toString();
 };

packages/middleware-endpoint-discovery/src/getEndpointDiscoveryCommandPlugin.ts

@@ -23,7 +23,7 @@ export const endpointDiscoveryMiddlewareOptions: FinalizeRequestHandlerOptions =
 
 export type EndpointDiscoveryMiddlewareConfig = {
   isDiscoveredEndpointRequired: boolean;
-  getEndpointDiscoveryId: () => string | undefined;
+  endpointDiscoveryId?: string;
 };
 
 export const endpointDiscoveryMiddleware = (
@@ -37,7 +37,7 @@ export const endpointDiscoveryMiddleware = (
 ): Promise<FinalizeHandlerOutput<Output>> => {
   const { client } = config;
   const { endpointDiscoveryCommandCtor } = client?.config;
-  const { isDiscoveredEndpointRequired, getEndpointDiscoveryId } = middlewareConfig;
+  const { isDiscoveredEndpointRequired, endpointDiscoveryId } = middlewareConfig;
   const { commandName } = context;
 
   if (isDiscoveredEndpointRequired === true) {
@@ -46,20 +46,20 @@ export const endpointDiscoveryMiddleware = (
     await updateDiscoveredEndpointInCache(config, {
       commandName,
       endpointDiscoveryCommandCtor,
-      getEndpointDiscoveryId,
+      endpointDiscoveryId,
     });
   } else if (isDiscoveredEndpointRequired === false) {
     // Do not call await await on Endpoint Discovery API utility so that function
     // does not block, the command will use discovered endpoint, if available.
     updateDiscoveredEndpointInCache(config, {
       commandName,
       endpointDiscoveryCommandCtor,
-      getEndpointDiscoveryId,
+      endpointDiscoveryId,
     });
   }
 
   const { request } = args;
-  const cacheKey = await getCacheKey(commandName, client?.config, getEndpointDiscoveryId);
+  const cacheKey = await getCacheKey(commandName, client?.config, { endpointDiscoveryId });
   if (cacheKey && HttpRequest.isInstance(request)) {
     const endpoints = client?.config.endpointCache.get(cacheKey);
     if (endpoints && endpoints.length > 0) {

packages/middleware-endpoint-discovery/src/updateDiscoveredEndpointInCache.ts

@@ -6,7 +6,7 @@ import { EndpointDiscoveryClientResolvedConfig } from "./resolveEndpointDiscover
 export type updateDiscoveredEndpointInCacheOptions = {
   commandName: string;
   endpointDiscoveryCommandCtor: new (comandConfig: any) => Command<any, any, any, any, any>;
-  getEndpointDiscoveryId: () => string | undefined;
+  endpointDiscoveryId?: string;
 };
 
 export const updateDiscoveredEndpointInCache = async (
@@ -16,8 +16,8 @@ export const updateDiscoveredEndpointInCache = async (
   const { client } = config;
   const { endpointCache } = client?.config;
 
-  const { commandName, getEndpointDiscoveryId } = options;
-  const cacheKey = await getCacheKey(commandName, client?.config, getEndpointDiscoveryId);
+  const { commandName, endpointDiscoveryId } = options;
+  const cacheKey = await getCacheKey(commandName, client?.config, { endpointDiscoveryId });
 
   const endpoints = endpointCache.get(cacheKey);
   if (endpoints && endpoints.length === 1 && endpoints[0].Address === "") {
@@ -40,7 +40,7 @@ export const updateDiscoveredEndpointInCache = async (
     try {
       const command = new options.endpointDiscoveryCommandCtor({
         Operation: commandName.substr(0, commandName.length - 7), // strip "Command"
-        Identifiers: getEndpointDiscoveryId ? getEndpointDiscoveryId() : undefined,
+        Identifiers: endpointDiscoveryId,
       });
       const { Endpoints } = await client?.send(command);
       endpointCache.set(cacheKey, Endpoints);