fix(webhook): depcrated warning on ts-jest mocked (philips-labs#1615)

- order typsscript import - add prettier plugin to automatically format plugin order - replaces importing mocked from ts-jest/utils by jest-mock
enverus-cts · Jan 14, 2022 · 56c1ece · 56c1ece
1 parent f2ff2e6
commit 56c1ece
Show file tree

Hide file tree

Showing 11 changed files with 188 additions and 94 deletions.
diff --git a/modules/webhook/lambdas/webhook/.prettierrc b/modules/webhook/lambdas/webhook/.prettierrc
@@ -3,4 +3,10 @@
   "singleQuote": true,
   "trailingComma": "all",
   "semi": true,
-}
+  "importOrderSeparation": true,
+  "importOrderSortSpecifiers": true,
+  "importOrder": [
+    "<THIRD_PARTY_MODULES>",
+    "^[./]"
+  ]
+}
diff --git a/modules/webhook/lambdas/webhook/package.json b/modules/webhook/lambdas/webhook/package.json
@@ -17,6 +17,7 @@
   },
   "devDependencies": {
     "@octokit/webhooks-definitions": "^3.67.3",
+    "@trivago/prettier-plugin-sort-imports": "^3.1.1",
     "@types/aws-lambda": "^8.10.89",
     "@types/express": "^4.17.11",
     "@types/jest": "^27.4.0",
@@ -30,6 +31,7 @@
     "eslint-plugin-prettier": "4.0.0",
     "express": "^4.17.2",
     "jest": "^27.4.7",
+    "jest-mock": "^27.4.6",
     "nock": "^13.2.1",
     "prettier": "2.5.1",
     "ts-jest": "^27.1.2",
@@ -43,4 +45,4 @@
     "aws-lambda": "^1.0.7",
     "tslog": "^3.3.1"
   }
-}
+}
diff --git a/modules/webhook/lambdas/webhook/src/lambda.test.ts b/modules/webhook/lambdas/webhook/src/lambda.test.ts
@@ -1,5 +1,6 @@
 import { APIGatewayEvent, Context } from 'aws-lambda';
 import { mocked } from 'ts-jest/utils';
+
 import { githubWebhook } from './lambda';
 import { handle } from './webhook/handler';
 import { logger } from './webhook/logger';

diff --git a/modules/webhook/lambdas/webhook/src/lambda.ts b/modules/webhook/lambdas/webhook/src/lambda.ts
@@ -1,5 +1,6 @@
+import { APIGatewayEvent, Callback, Context } from 'aws-lambda';
+
 import { handle } from './webhook/handler';
-import { APIGatewayEvent, Context, Callback } from 'aws-lambda';
 import { logger } from './webhook/logger';
 
 export interface Response {

diff --git a/modules/webhook/lambdas/webhook/src/local.ts b/modules/webhook/lambdas/webhook/src/local.ts
@@ -1,5 +1,6 @@
-import express from 'express';
 import bodyParser from 'body-parser';
+import express from 'express';
+
 import { handle } from './webhook/handler';
 
 const app = express();

diff --git a/modules/webhook/lambdas/webhook/src/sqs/index.test.ts b/modules/webhook/lambdas/webhook/src/sqs/index.test.ts
@@ -1,5 +1,6 @@
 import { SQS } from 'aws-sdk';
-import { sendActionRequest, ActionRequestMessage } from '.';
+
+import { ActionRequestMessage, sendActionRequest } from '.';
 
 const mockSQS = {
   sendMessage: jest.fn(() => {

diff --git a/modules/webhook/lambdas/webhook/src/sqs/index.ts b/modules/webhook/lambdas/webhook/src/sqs/index.ts
@@ -1,5 +1,6 @@
 import { SQS } from 'aws-sdk';
-import { LogFields, logger as logger } from '../webhook/logger';
+
+import { LogFields, logger } from '../webhook/logger';
 
 export interface ActionRequestMessage {
   id: number;

diff --git a/modules/webhook/lambdas/webhook/src/ssm/index.test.ts b/modules/webhook/lambdas/webhook/src/ssm/index.test.ts
@@ -1,6 +1,7 @@
+import { GetParameterCommandOutput, SSM } from '@aws-sdk/client-ssm';
 import nock from 'nock';
+
 import { getParameterValue } from '.';
-import { SSM, GetParameterCommandOutput } from '@aws-sdk/client-ssm';
 
 jest.mock('@aws-sdk/client-ssm');
 

diff --git a/modules/webhook/lambdas/webhook/src/webhook/handler.test.ts b/modules/webhook/lambdas/webhook/src/webhook/handler.test.ts
@@ -1,12 +1,13 @@
-import { handle } from './handler';
-import { mocked } from 'ts-jest/utils';
 import { Webhooks } from '@octokit/webhooks';
-import { getParameterValue } from '../ssm';
-import { sendActionRequest } from '../sqs';
-import workflowjob_event from '../../test/resources/github_workflowjob_event.json';
-import checkrun_event from '../../test/resources/github_check_run_event.json';
+import { mocked } from 'jest-mock';
 import nock from 'nock';
 
+import checkrun_event from '../../test/resources/github_check_run_event.json';
+import workflowjob_event from '../../test/resources/github_workflowjob_event.json';
+import { sendActionRequest } from '../sqs';
+import { getParameterValue } from '../ssm';
+import { handle } from './handler';
+
 jest.mock('../sqs');
 jest.mock('../ssm');
 

diff --git a/modules/webhook/lambdas/webhook/src/webhook/handler.ts b/modules/webhook/lambdas/webhook/src/webhook/handler.ts
@@ -1,10 +1,11 @@
-import { IncomingHttpHeaders } from 'http';
 import { Webhooks } from '@octokit/webhooks';
-import { sendActionRequest } from '../sqs';
 import { CheckRunEvent, WorkflowJobEvent } from '@octokit/webhooks-types';
-import { getParameterValue } from '../ssm';
-import { logger as rootLogger, LogFields } from './logger';
+import { IncomingHttpHeaders } from 'http';
+
 import { Response } from '../lambda';
+import { sendActionRequest } from '../sqs';
+import { getParameterValue } from '../ssm';
+import { LogFields, logger as rootLogger } from './logger';
 
 const supportedEvents = ['check_run', 'workflow_job'];
 const logger = rootLogger.getChildLogger();