Skip to content
This repository was archived by the owner on Jan 28, 2025. It is now read-only.

Commit 4027898

Browse files
dphangdphang
committed
fixes
1 parent f50549e commit 4027898

File tree

4 files changed

+38
-66
lines changed

4 files changed

+38
-66
lines changed

‎packages/serverless-components/aws-lambda/__mocks__/aws-sdk.mock.ts

Lines changed: 33 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -7,93 +7,66 @@ const promisifyMock = (mockFn) => {
77
return promise;
88
};
99

10-
const mockCreateFunction = jest.fn();
11-
const mockCreateFunctionPromise = promisifyMock(mockCreateFunction);
10+
export const mockCreateFunction = jest.fn();
11+
export const mockCreateFunctionPromise = promisifyMock(mockCreateFunction);
1212

13-
const mockPublishVersion = jest.fn();
14-
const mockPublishVersionPromise = promisifyMock(mockPublishVersion);
13+
export const mockPublishVersion = jest.fn();
14+
export const mockPublishVersionPromise = promisifyMock(mockPublishVersion);
1515

16-
const mockGetFunctionConfiguration = jest.fn();
17-
const mockGetFunctionConfigurationPromise = promisifyMock(
16+
export const mockGetFunctionConfiguration = jest.fn();
17+
export const mockGetFunctionConfigurationPromise = promisifyMock(
1818
mockGetFunctionConfiguration
1919
);
2020

21-
const mockUpdateFunctionCode = jest.fn();
22-
const mockUpdateFunctionCodePromise = promisifyMock(mockUpdateFunctionCode);
21+
export const mockUpdateFunctionCode = jest.fn();
22+
export const mockUpdateFunctionCodePromise = promisifyMock(
23+
mockUpdateFunctionCode
24+
);
2325

24-
const mockUpdateFunctionConfiguration = jest.fn();
25-
const mockUpdateFunctionConfigurationPromise = promisifyMock(
26+
export const mockUpdateFunctionConfiguration = jest.fn();
27+
export const mockUpdateFunctionConfigurationPromise = promisifyMock(
2628
mockUpdateFunctionConfiguration
2729
);
2830

29-
const mockCreateQueue = jest.fn();
30-
const mockCreateQueuePromise = promisifyMock(mockCreateQueue);
31+
export const mockCreateQueue = jest.fn();
32+
export const mockCreateQueuePromise = promisifyMock(mockCreateQueue);
3133

32-
const mockGetQueueAttributes = jest.fn();
33-
const mockGetQueueAttributesPromise = promisifyMock(mockGetQueueAttributes);
34+
export const mockGetQueueAttributes = jest.fn();
35+
export const mockGetQueueAttributesPromise = promisifyMock(
36+
mockGetQueueAttributes
37+
);
3438

35-
const mockDeleteQueue = jest.fn();
36-
const mockDeleteQueuePromise = promisifyMock(mockDeleteQueue);
39+
export const mockDeleteQueue = jest.fn();
40+
export const mockDeleteQueuePromise = promisifyMock(mockDeleteQueue);
3741

38-
const mockListEventSourceMappings = jest.fn();
39-
const mockListEventSourceMappingsPromise = promisifyMock(
42+
export const mockListEventSourceMappings = jest.fn();
43+
export const mockListEventSourceMappingsPromise = promisifyMock(
4044
mockListEventSourceMappings
4145
);
4246

43-
const mockCreateEventSourceMapping = jest.fn();
44-
const mockCreateEventSourceMappingPromise = promisifyMock(
47+
export const mockCreateEventSourceMapping = jest.fn();
48+
export const mockCreateEventSourceMappingPromise = promisifyMock(
4549
mockCreateEventSourceMapping
4650
);
4751

48-
const mockGetCallerIdentityMapping = jest.fn();
49-
const mockGetCallerIdentityMappingPromise = promisifyMock(
52+
export const mockGetCallerIdentityMapping = jest.fn();
53+
export const mockGetCallerIdentityMappingPromise = promisifyMock(
5054
mockGetCallerIdentityMapping
5155
);
5256

53-
const mockListTags = jest.fn();
54-
const mockListTagsPromise = promisifyMock(mockListTags);
55-
const mockTagResource = jest.fn();
56-
const mockTagResourcePromise = promisifyMock(mockTagResource);
57-
const mockUntagResource = jest.fn();
58-
const mockUntagResourcePromise = promisifyMock(mockUntagResource);
59-
60-
module.exports = {
61-
mockCreateQueuePromise,
62-
mockGetQueueAttributesPromise,
63-
mockDeleteQueuePromise,
64-
mockListEventSourceMappingsPromise,
65-
mockCreateEventSourceMappingPromise,
66-
mockCreateQueue,
67-
mockGetQueueAttributes,
68-
mockDeleteQueue,
69-
mockListEventSourceMappings,
70-
mockCreateEventSourceMapping,
71-
mockGetCallerIdentityMappingPromise,
72-
mockGetCallerIdentityMapping,
57+
export const mockListTags = jest.fn();
58+
export const mockListTagsPromise = promisifyMock(mockListTags);
59+
export const mockTagResource = jest.fn();
60+
export const mockTagResourcePromise = promisifyMock(mockTagResource);
61+
export const mockUntagResource = jest.fn();
62+
export const mockUntagResourcePromise = promisifyMock(mockUntagResource);
7363

64+
export default {
7465
SQS: jest.fn(() => ({
7566
createQueue: mockCreateQueue,
7667
getQueueAttributes: mockGetQueueAttributes,
7768
deleteQueue: mockDeleteQueue
7869
})),
79-
80-
mockCreateFunction,
81-
mockCreateFunctionPromise,
82-
mockPublishVersion,
83-
mockPublishVersionPromise,
84-
mockGetFunctionConfiguration,
85-
mockGetFunctionConfigurationPromise,
86-
mockUpdateFunctionCode,
87-
mockUpdateFunctionCodePromise,
88-
mockUpdateFunctionConfiguration,
89-
mockUpdateFunctionConfigurationPromise,
90-
mockListTags,
91-
mockListTagsPromise,
92-
mockTagResource,
93-
mockTagResourcePromise,
94-
mockUntagResource,
95-
mockUntagResourcePromise,
96-
9770
Lambda: jest.fn(() => ({
9871
listEventSourceMappings: mockListEventSourceMappings,
9972
createEventSourceMapping: mockCreateEventSourceMapping,

‎packages/serverless-components/aws-lambda/__tests__/publishVersion.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { createComponent, createTmpDir } from "../test-utils";
22

3-
const {
3+
import {
44
mockCreateFunction,
55
mockCreateFunctionPromise,
66
mockPublishVersion,
@@ -12,7 +12,7 @@ const {
1212
mockListTagsPromise,
1313
mockTagResource,
1414
mockUntagResource
15-
} = require("aws-sdk");
15+
} from "../__mocks__/aws-sdk.mock";
1616

1717
jest.mock("aws-sdk", () => require("../__mocks__/aws-sdk.mock"));
1818

‎packages/serverless-components/aws-lambda/src/component.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ import AWS from "aws-sdk";
22
const AwsSdkLambda = AWS.Lambda;
33
import { mergeDeepRight, pick } from "ramda";
44
import { Component, utils } from "@serverless/core";
5-
const {
5+
import {
66
createLambda,
77
updateLambdaCode,
88
updateLambdaConfig,
99
getLambda,
1010
deleteLambda,
1111
configChanged,
1212
pack
13-
} = require("./utils");
13+
} from "./utils";
1414

1515
const outputsList = [
1616
"name",
@@ -49,7 +49,6 @@ class AwsLambda extends Component {
4949
state: any;
5050
save: () => void;
5151
load: (name: string) => any;
52-
init: () => void;
5352

5453
async default(inputs: Record<string, unknown> = {}) {
5554
this.context.status(`Deploying`);

‎packages/serverless-components/aws-lambda/src/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ const pack = (code, shims = [], packDeps = true) => {
306306
return packDir(code, outputFilePath, shims, exclude);
307307
};
308308

309-
module.exports = {
309+
export {
310310
createLambda,
311311
updateLambdaCode,
312312
updateLambdaConfig,

0 commit comments

Comments
 (0)