fix migration middy

Author: npalm

lambdas/functions/control-plane/src/lambda.test.ts

@@ -1,14 +1,14 @@
-import { captureLambdaHandler, logger } from '@aws-github-runner/aws-powertools-util';
+import { logger } from '@aws-github-runner/aws-powertools-util';
 import { Context, SQSEvent, SQSRecord } from 'aws-lambda';
 
-import { addMiddleware, adjustPool, scaleDownHandler, scaleUpHandler, ssmHousekeeper, jobRetryCheck } from './lambda';
+import { adjustPool, scaleDownHandler, scaleUpHandler, ssmHousekeeper, jobRetryCheck } from './lambda';
 import { adjust } from './pool/pool';
 import ScaleError from './scale-runners/ScaleError';
 import { scaleDown } from './scale-runners/scale-down';
 import { ActionRequestMessage, scaleUp } from './scale-runners/scale-up';
 import { cleanSSMTokens } from './scale-runners/ssm-housekeeper';
 import { checkAndRetryJob } from './scale-runners/job-retry';
-import { describe, it, expect, vi, MockedFunction, beforeEach } from 'vitest';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
 
 const body: ActionRequestMessage = {
   eventType: 'workflow_job',
@@ -260,14 +260,6 @@ describe('Adjust pool.', () => {
   });
 });
 
-describe('Test middleware', () => {
-  it('Should have a working middleware', async () => {
-    const mockedLambdaHandler = captureLambdaHandler as MockedFunction<typeof captureLambdaHandler>;
-    mockedLambdaHandler.mockReturnValue({ before: vi.fn(), after: vi.fn(), onError: vi.fn() });
-    expect(addMiddleware).not.toThrowError();
-  });
-});
-
 describe('Test ssm housekeeper lambda wrapper.', () => {
   it('Invoke without errors.', async () => {
     vi.mocked(cleanSSMTokens).mockResolvedValue();

lambdas/functions/control-plane/src/lambda.ts

@@ -10,7 +10,7 @@ import { type ActionRequestMessage, type ActionRequestMessageSQS, scaleUp } from
 import { SSMCleanupOptions, cleanSSMTokens } from './scale-runners/ssm-housekeeper';
 import { checkAndRetryJob } from './scale-runners/job-retry';
 
-export async function scaleUpHandler(event: SQSEvent, context: Context): Promise<SQSBatchResponse> {
+async function scaleUpHandlerFn(event: SQSEvent, context: Context): Promise<SQSBatchResponse> {
   setContext(context, 'lambda.ts');
   logger.logEventIfEnabled(event);
 
@@ -64,7 +64,7 @@ export async function scaleUpHandler(event: SQSEvent, context: Context): Promise
   }
 }
 
-export async function scaleDownHandler(event: unknown, context: Context): Promise<void> {
+async function scaleDownHandlerFn(event: unknown, context: Context): Promise<void> {
   setContext(context, 'lambda.ts');
   logger.logEventIfEnabled(event);
 
@@ -75,7 +75,7 @@ export async function scaleDownHandler(event: unknown, context: Context): Promis
   }
 }
 
-export async function adjustPool(event: PoolEvent, context: Context): Promise<void> {
+async function adjustPoolFn(event: PoolEvent, context: Context): Promise<void> {
   setContext(context, 'lambda.ts');
   logger.logEventIfEnabled(event);
 
@@ -87,19 +87,7 @@ export async function adjustPool(event: PoolEvent, context: Context): Promise<vo
   return Promise.resolve();
 }
 
-export const addMiddleware = () => {
-  const handler = captureLambdaHandler(tracer);
-  if (!handler) {
-    return;
-  }
-  middy(scaleUpHandler).use(handler);
-  middy(scaleDownHandler).use(handler);
-  middy(adjustPool).use(handler);
-  middy(ssmHousekeeper).use(handler);
-};
-addMiddleware();
-
-export async function ssmHousekeeper(event: unknown, context: Context): Promise<void> {
+async function ssmHousekeeperFn(event: unknown, context: Context): Promise<void> {
   setContext(context, 'lambda.ts');
   logger.logEventIfEnabled(event);
   const config = JSON.parse(process.env.SSM_CLEANUP_CONFIG) as SSMCleanupOptions;
@@ -111,6 +99,17 @@ export async function ssmHousekeeper(event: unknown, context: Context): Promise<
   }
 }
 
+// Export wrapped handlers for middy v7
+const handler = captureLambdaHandler(tracer);
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const scaleUpHandler = handler ? middy(scaleUpHandlerFn).use(handler as any) : scaleUpHandlerFn;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const scaleDownHandler = handler ? middy(scaleDownHandlerFn).use(handler as any) : scaleDownHandlerFn;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const adjustPool = handler ? middy(adjustPoolFn).use(handler as any) : adjustPoolFn;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const ssmHousekeeper = handler ? middy(ssmHousekeeperFn).use(handler as any) : ssmHousekeeperFn;
+
 export async function jobRetryCheck(event: SQSEvent, context: Context): Promise<void> {
   setContext(context, 'lambda.ts');
   logger.logEventIfEnabled(event);

lambdas/functions/gh-agent-syncer/src/lambda.ts

@@ -5,10 +5,8 @@ import { Context } from 'aws-lambda';
 
 import { sync } from './syncer/syncer';
 
-middy(handler).use(captureLambdaHandler(tracer));
-
 // eslint-disable-next-line
-export async function handler(event: any, context: Context): Promise<void> {
+async function handlerFn(event: any, context: Context): Promise<void> {
   setContext(context, 'lambda.ts');
   logger.logEventIfEnabled(event);
 
@@ -21,3 +19,7 @@ export async function handler(event: any, context: Context): Promise<void> {
     logger.debug('Ignoring error', { error: e });
   }
 }
+
+// Export wrapped handler for middy v7
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const handler = middy(handlerFn).use(captureLambdaHandler(tracer) as any);

lambdas/functions/termination-watcher/src/lambda.ts

@@ -10,7 +10,7 @@ import { Config } from './ConfigResolver';
 
 const config = new Config();
 
-export async function interruptionWarning(
+async function interruptionWarningFn(
   event: SpotInterruptionWarning<SpotTerminationDetail>,
   context: Context,
 ): Promise<void> {
@@ -25,7 +25,7 @@ export async function interruptionWarning(
   }
 }
 
-export async function termination(event: BidEvictedEvent<BidEvictedDetail>, context: Context): Promise<void> {
+async function terminationFn(event: BidEvictedEvent<BidEvictedDetail>, context: Context): Promise<void> {
   setContext(context, 'lambda.ts');
   logger.logEventIfEnabled(event);
   logger.debug('Configuration of the lambda', { config });
@@ -37,20 +37,20 @@ export async function termination(event: BidEvictedEvent<BidEvictedDetail>, cont
   }
 }
 
-const addMiddleware = () => {
-  const middleware = middy(interruptionWarning);
+// Export wrapped handlers for middy v7
+const c = captureLambdaHandler(tracer);
+const l = logMetrics(metrics);
 
-  const c = captureLambdaHandler(tracer);
-  if (c) {
-    logger.debug('Adding captureLambdaHandler middleware');
-    middleware.use(c);
-  }
-
-  const l = logMetrics(metrics);
-  if (l) {
-    logger.debug('Adding logMetrics middleware');
-    middleware.use(l);
-  }
-};
+export const interruptionWarning = middy(interruptionWarningFn);
+if (c) {
+  logger.debug('Adding captureLambdaHandler middleware');
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  interruptionWarning.use(c as any);
+}
+if (l) {
+  logger.debug('Adding logMetrics middleware');
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  interruptionWarning.use(l as any);
+}
 
-addMiddleware();
+export const termination = terminationFn;

lambdas/functions/webhook/src/ConfigLoader.test.ts

@@ -165,7 +165,7 @@ describe('ConfigLoader Tests', () => {
       });
 
       await expect(ConfigWebhook.load()).rejects.toThrow(
-        'Failed to load config: Failed to load parameter for matcherConfig from path /path/to/matcher/config: Failed to load matcher config', // eslint-disable-line max-len
+        'Failed to load config: Failed to load parameter for matcherConfig from path /path/to/matcher/config: Failed to load matcher config',
       );
     });
 
@@ -213,7 +213,7 @@ describe('ConfigLoader Tests', () => {
       });
 
       await expect(ConfigWebhook.load()).rejects.toThrow(
-        "Failed to load config: Failed to parse combined matcher config: Expected ',' or ']' after array element in JSON at position 196", // eslint-disable-line max-len
+        "Failed to load config: Failed to parse combined matcher config: Expected ',' or ']' after array element in JSON at position 196",
       );
     });
   });
@@ -244,7 +244,7 @@ describe('ConfigLoader Tests', () => {
       });
 
       await expect(ConfigWebhookEventBridge.load()).rejects.toThrow(
-        'Failed to load config: Environment variable for eventBusName is not set and no default value provided., Failed to load parameter for webhookSecret from path undefined: Parameter undefined not found', // eslint-disable-line max-len
+        'Failed to load config: Environment variable for eventBusName is not set and no default value provided., Failed to load parameter for webhookSecret from path undefined: Parameter undefined not found',
       );
     });
   });
@@ -309,7 +309,7 @@ describe('ConfigLoader Tests', () => {
       });
 
       await expect(ConfigDispatcher.load()).rejects.toThrow(
-        'Failed to load config: Failed to load parameter for matcherConfig from path undefined: Parameter undefined not found', // eslint-disable-line max-len
+        'Failed to load config: Failed to load parameter for matcherConfig from path undefined: Parameter undefined not found',
       );
     });
 

lambdas/functions/webhook/src/ConfigLoader.ts

@@ -61,7 +61,7 @@ abstract class BaseConfig {
         this.loadProperty(propertyName, value);
       })
       .catch((error) => {
-        const errorMessage = `Failed to load parameter for ${String(propertyName)} from path ${paramPath}: ${(error as Error).message}`; // eslint-disable-line max-len
+        const errorMessage = `Failed to load parameter for ${String(propertyName)} from path ${paramPath}: ${(error as Error).message}`;
         this.configLoadingErrors.push(errorMessage);
       });
   }

lambdas/functions/webhook/src/lambda.ts

@@ -15,9 +15,7 @@ export interface Response {
   body: string;
 }
 
-middy(directWebhook).use(captureLambdaHandler(tracer));
-
-export async function directWebhook(event: APIGatewayEvent, context: Context): Promise<Response> {
+async function directWebhookHandler(event: APIGatewayEvent, context: Context): Promise<Response> {
   setContext(context, 'lambda.ts');
   logger.logEventIfEnabled(event);
 
@@ -93,3 +91,7 @@ function headersToLowerCase(headers: IncomingHttpHeaders): IncomingHttpHeaders {
   }
   return headers;
 }
+
+// Export wrapped handlers for middy v7
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const directWebhook = middy(directWebhookHandler).use(captureLambdaHandler(tracer) as any);