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

chore(aws-cloudfront): convert package to typescript #1303

Merged
merged 3 commits into from
Jun 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,9 @@
"/examples/",
"/dist/",
"/e2e-tests/",
"/tests/"
"/tests/",
"babel.config.js",
"jest.config.js"
],
"watchPathIgnorePatterns": [
"/fixture/",
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
const promisifyMock = (mockFn: jest.Mock) => {
const promise = jest.fn();
mockFn.mockImplementation(() => ({
promise
}));

return promise;
};

export const mockCreateDistribution = jest.fn();
export const mockCreateDistributionPromise = promisifyMock(
mockCreateDistribution
);

export const mockUpdateDistribution = jest.fn();
export const mockUpdateDistributionPromise = promisifyMock(
mockUpdateDistribution
);

export const mockGetDistributionConfig = jest.fn();
export const mockGetDistributionConfigPromise = promisifyMock(
mockGetDistributionConfig
);

export const mockDeleteDistribution = jest.fn();
export const mockDeleteDistributionPromise = promisifyMock(
mockDeleteDistribution
);

export const mockCreateCloudFrontOriginAccessIdentity = jest.fn();
export const mockCreateCloudFrontOriginAccessIdentityPromise = promisifyMock(
mockCreateCloudFrontOriginAccessIdentity
);

export const mockGetCloudFrontOriginAccessIdentity = jest.fn();
export const mockGetCloudFrontOriginAccessIdentityPromise = promisifyMock(
mockGetCloudFrontOriginAccessIdentity
);

export const mockPutBucketPolicy = jest.fn();
export const mockPutBucketPolicyPromise = promisifyMock(mockPutBucketPolicy);

export default {
CloudFront: jest.fn(() => ({
createDistribution: mockCreateDistribution,
updateDistribution: mockUpdateDistribution,
getDistributionConfig: mockGetDistributionConfig,
deleteDistribution: mockDeleteDistribution,
createCloudFrontOriginAccessIdentity:
mockCreateCloudFrontOriginAccessIdentity,
getCloudFrontOriginAccessIdentity: mockGetCloudFrontOriginAccessIdentity
})),

S3: jest.fn(() => ({
putBucketPolicy: mockPutBucketPolicy
}))
};
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { createComponent } = require("../test-utils");
import { createComponent } from "../test-utils";

const {
mockCreateDistribution,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const { createComponent } = require("../test-utils");
import { createComponent } from "../test-utils";

const {
import {
mockCreateDistribution,
mockCreateDistributionPromise
} = require("aws-sdk");
} from "../__mocks__/aws-sdk.mock";

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

Expand Down Expand Up @@ -83,7 +83,7 @@ describe("Configures custom error responses", () => {
]
});
};
await expect(failing(401)).rejects.toThrow(
await expect(failing(401, undefined)).rejects.toThrow(
'CloudFront error code "401" is not supported'
);
await expect(failing(400, 401)).rejects.toThrow(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
const { createComponent, assertHasOrigin } = require("../test-utils");

const {
import {
mockCreateDistribution,
mockUpdateDistribution,
mockCreateDistributionPromise,
mockGetDistributionConfigPromise,
mockUpdateDistributionPromise
} = require("aws-sdk");
} from "../__mocks__/aws-sdk.mock";

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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
const {
import {
createComponent,
assertHasOrigin,
assertHasOriginCount,
assertHasCacheBehavior
} = require("../test-utils");
} from "../test-utils";

const {
import {
mockCreateDistribution,
mockUpdateDistribution,
mockGetDistributionConfigPromise,
mockUpdateDistributionPromise
} = require("aws-sdk");
} from "../__mocks__/aws-sdk.mock";

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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
const { createComponent } = require("../test-utils");
import { createComponent } from "../test-utils";

const {
import {
mockCreateDistribution,
mockUpdateDistribution,
mockCreateDistributionPromise,
mockGetDistributionConfigPromise,
mockUpdateDistributionPromise
} = require("aws-sdk");
} from "../__mocks__/aws-sdk.mock";

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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const { createComponent, assertHasCacheBehavior } = require("../test-utils");
import { createComponent, assertHasCacheBehavior } from "../test-utils";

const {
import {
mockCreateDistribution,
mockCreateDistributionPromise
} = require("aws-sdk");
} from "../__mocks__/aws-sdk.mock";

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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
const {
createComponent,
assertHasCustomOriginConfig
} = require("../test-utils");
import { createComponent, assertHasCustomOriginConfig } from "../test-utils";

const {
import {
mockCreateDistribution,
mockUpdateDistribution,
mockCreateDistributionPromise,
mockGetDistributionConfigPromise,
mockUpdateDistributionPromise
} = require("aws-sdk");
} from "../__mocks__/aws-sdk.mock";

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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
const {
import {
createComponent,
assertHasCacheBehavior,
assertHasOrigin
} = require("../test-utils");
} from "../test-utils";

const {
import {
mockCreateDistribution,
mockUpdateDistribution,
mockCreateDistributionPromise,
mockGetDistributionConfigPromise,
mockUpdateDistributionPromise
} = require("aws-sdk");
} from "../__mocks__/aws-sdk.mock";

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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const {
import {
mockCreateDistribution,
mockUpdateDistribution,
mockCreateDistributionPromise,
Expand All @@ -7,7 +7,7 @@ const {
mockCreateCloudFrontOriginAccessIdentityPromise,
mockGetCloudFrontOriginAccessIdentityPromise,
mockPutBucketPolicy
} = require("aws-sdk");
} from "../__mocks__/aws-sdk.mock";

const { createComponent, assertHasOrigin } = require("../test-utils");

Expand Down
6 changes: 6 additions & 0 deletions packages/serverless-components/aws-cloudfront/babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
presets: [
["@babel/preset-env", { targets: { node: "current" } }],
"@babel/preset-typescript"
]
};

This file was deleted.

26 changes: 21 additions & 5 deletions packages/serverless-components/aws-cloudfront/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,46 @@
"name": "@sls-next/aws-cloudfront",
"version": "3.1.0",
"main": "./serverless.js",
"types": "dist/component.d.ts",
"publishConfig": {
"access": "public"
},
"scripts": {
"test": "jest",
"lint": "eslint . --fix --cache"
"lint": "eslint . --fix --cache",
"clean": "yarn rimraf dist",
"build": "tsc -p tsconfig.build.json",
"prepare": "yarn clean && yarn build"
},
"author": "Daniel Conde <[email protected]>",
"license": "MIT",
"dependencies": {
"ramda": "^0.27.1"
"ramda": "^0.27.1",
"aws-sdk": "^2.935.0",
"@serverless/core": "^1.1.2"
},
"peerDependencies": {
"@serverless/core": "^1.0.0",
"aws-sdk": "^2.499.0"
"@serverless/core": "^1.1.2",
"aws-sdk": "^2.935.0"
},
"devDependencies": {
"@babel/preset-typescript": "^7.14.5",
"@types/fs-extra": "^9.0.11",
"@types/node": "^15.12.4",
"@types/ramda": "^0.27.41",
"babel-eslint": "10.1.0",
"eslint": "7.29.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-prettier": "^3.0.1",
"fs-extra": "^9.1.0",
"jest": "^27.0.5",
"prettier": "^2.3.1"
"prettier": "^2.3.1",
"rimraf": "^3.0.2",
"typescript": "^4.3.4"
},
"jest": {
"preset": "ts-jest",
"testEnvironment": "node"
}
}
Loading