add tests

Author: npalm

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

@@ -2,7 +2,7 @@ import { getParameter } from '@aws-github-runner/aws-ssm-util';
 import { ConfigWebhook, ConfigWebhookEventBridge, ConfigDispatcher } from './ConfigLoader';
 import { mocked } from 'jest-mock';
 import { logger } from '@aws-github-runner/aws-powertools-util';
-import { MatcherConfig, RunnerMatcherConfig } from './sqs';
+import { RunnerMatcherConfig } from './sqs';
 
 jest.mock('@aws-github-runner/aws-ssm-util');
 
@@ -78,7 +78,7 @@ describe('ConfigLoader Tests', () => {
       setupConfiguration();
       const spy = jest.spyOn(logger, 'debug');
 
-      const config = await ConfigWebhook.load();
+      await ConfigWebhook.load();
 
       expect(spy).toHaveBeenCalledWith(
         'Config loaded',
@@ -169,7 +169,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',
+        '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
       );
     });
   });
@@ -200,7 +200,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',
+        '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
       );
     });
   });
@@ -240,7 +240,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',
+        'Failed to load config: Failed to load parameter for matcherConfig from path undefined: Parameter undefined not found', // eslint-disable-line max-len
       );
     });
 
@@ -256,7 +256,6 @@ describe('ConfigLoader Tests', () => {
       });
 
       await expect(ConfigDispatcher.load()).rejects.toThrow('ailed to load config: Matcher config is empty');
-
     });
   });
 });

lambdas/functions/webhook/src/ConfigLoader.ts

@@ -1,5 +1,5 @@
 import { getParameter } from '@aws-github-runner/aws-ssm-util';
-import { MatcherConfig, RunnerMatcherConfig } from './sqs';
+import { RunnerMatcherConfig } from './sqs';
 import { logger } from '@aws-github-runner/aws-powertools-util';
 
 abstract class BaseConfig {
@@ -36,7 +36,7 @@ abstract class BaseConfig {
   protected loadEnvVar<T>(envVar: string, propertyName: keyof this, defaultValue?: T): void {
     logger.debug(`Loading env var for ${String(propertyName)}`, { envVar });
     if (envVar !== undefined) {
-      this.loadProperty<T>(propertyName, envVar);
+      this.loadProperty(propertyName, envVar);
     } else if (defaultValue !== undefined) {
       this[propertyName] = defaultValue as unknown as this[keyof this];
     } else {
@@ -45,22 +45,22 @@ abstract class BaseConfig {
     }
   }
 
-  protected async loadParameter<T>(paramPath: string, propertyName: keyof this): Promise<void> {
+  protected async loadParameter(paramPath: string, propertyName: keyof this): Promise<void> {
     logger.debug(`Loading parameter for ${String(propertyName)} from path ${paramPath}`);
     await getParameter(paramPath)
       .then((value) => {
-        this.loadProperty<T>(propertyName, value);
+        this.loadProperty(propertyName, value);
       })
       .catch((error) => {
-        const errorMessage = `Failed to load parameter for ${String(propertyName)} from path ${paramPath}: ${(error as Error).message}`;
+        const errorMessage = `Failed to load parameter for ${String(propertyName)} from path ${paramPath}: ${(error as Error).message}`; // eslint-disable-line max-len
         this.configLoadingErrors.push(errorMessage);
       });
   }
 
-  private loadProperty<T>(propertyName: keyof this, value: string) {
+  private loadProperty(propertyName: keyof this, value: string) {
     try {
       this[propertyName] = JSON.parse(value) as unknown as this[keyof this];
-    } catch (error) {
+    } catch {
       this[propertyName] = value as unknown as this[keyof this];
     }
   }
@@ -89,7 +89,7 @@ export class ConfigWebhook extends BaseConfig {
     this.loadEnvVar(process.env.SQS_WORKFLOW_JOB_QUEUE, 'workflowJobEventSecondaryQueue', '');
 
     await Promise.all([
-      this.loadParameter<MatcherConfig[]>(process.env.PARAMETER_RUNNER_MATCHER_CONFIG_PATH, 'matcherConfig'),
+      this.loadParameter(process.env.PARAMETER_RUNNER_MATCHER_CONFIG_PATH, 'matcherConfig'),
       this.loadParameter(process.env.PARAMETER_GITHUB_APP_WEBHOOK_SECRET, 'webhookSecret'),
     ]);
   }
@@ -114,7 +114,7 @@ export class ConfigDispatcher extends BaseConfig {
 
   async loadConfig(): Promise<void> {
     this.loadEnvVar(process.env.REPOSITORY_ALLOW_LIST, 'repositoryAllowList', []);
-    await this.loadParameter<MatcherConfig[]>(process.env.PARAMETER_RUNNER_MATCHER_CONFIG_PATH, 'matcherConfig');
+    await this.loadParameter(process.env.PARAMETER_RUNNER_MATCHER_CONFIG_PATH, 'matcherConfig');
 
     // check matcherConfig object is not empty
     if (this.matcherConfig.length === 0) {

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

@@ -9,7 +9,6 @@ import ValidationError from './ValidationError';
 import { getParameter } from '@aws-github-runner/aws-ssm-util';
 import { dispatch } from './runners/dispatch';
 import { EventWrapper } from './types';
-import { rejects } from 'assert';
 
 const event: APIGatewayEvent = {
   body: JSON.stringify(''),
@@ -77,7 +76,6 @@ const context: Context = {
   },
 };
 
-
 jest.mock('./runners/dispatch');
 jest.mock('./webhook');
 jest.mock('@aws-github-runner/aws-ssm-util');
@@ -122,8 +120,6 @@ describe('Test webhook lambda wrapper.', () => {
     });
   });
 
-
-
   describe('Lmmbda eventBridgeWebhook.', () => {
     beforeEach(() => {
       process.env.EVENT_BUS_NAME = 'test';
@@ -141,7 +137,6 @@ describe('Test webhook lambda wrapper.', () => {
       expect(result).toEqual({ body: 'test', statusCode: 200 });
     });
 
-
     it('Reject events .', async () => {
       const mock = mocked(publishOnEventBridge);
       mock.mockRejectedValue(new Error('some error'));
@@ -190,10 +185,11 @@ describe('Test webhook lambda wrapper.', () => {
         'detail-type': 'non_workflow_job',
       } as unknown as EventWrapper<WorkflowJobEvent>;
 
-      await expect(dispatchToRunners(testEvent, context)).rejects.toThrow('Incorrect Event detail-type only workflow_job is accepted');
+      await expect(dispatchToRunners(testEvent, context)).rejects.toThrow(
+        'Incorrect Event detail-type only workflow_job is accepted',
+      );
     });
 
-
     it('Rejects any event causing an error.', async () => {
       const mock = mocked(dispatch);
       mock.mockRejectedValue(new Error('some error'));