Skip to content

Commit bbf34c7

Browse files
rishabhraorishabhrao
committed
refactor: run prettier
1 parent 4c9b8cc commit bbf34c7

15 files changed

+329
-327
lines changed

‎.eslintrc.js‎

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,28 @@
11
module.exports = {
2-
env: {
3-
es6: true,
4-
node: true
5-
},
6-
extends: [
7-
"eslint:recommended",
8-
"plugin:@typescript-eslint/eslint-recommended",
9-
"prettier"
10-
],
11-
globals: {
12-
Atomics: "readonly",
13-
SharedArrayBuffer: "readonly"
14-
},
15-
parser: "@typescript-eslint/parser",
16-
parserOptions: {
17-
ecmaVersion: 2018,
18-
sourceType: "module"
19-
},
20-
plugins: ["@typescript-eslint"],
21-
rules: {
22-
quotes: [2, 'single', { avoidEscape: true }]
23-
},
24-
overrides: [
25-
{
26-
files: ['*.ts', '*.tsx'],
27-
rules: {
28-
'@typescript-eslint/no-unused-vars': [2, { args: 'none' }]
29-
}
30-
}
31-
]
32-
};
2+
env: {
3+
es6: true,
4+
node: true
5+
},
6+
extends: ['eslint:recommended', 'plugin:@typescript-eslint/eslint-recommended', 'prettier'],
7+
globals: {
8+
Atomics: 'readonly',
9+
SharedArrayBuffer: 'readonly'
10+
},
11+
parser: '@typescript-eslint/parser',
12+
parserOptions: {
13+
ecmaVersion: 2018,
14+
sourceType: 'module'
15+
},
16+
plugins: ['@typescript-eslint'],
17+
rules: {
18+
quotes: [2, 'single', { avoidEscape: true }]
19+
},
20+
overrides: [
21+
{
22+
files: ['*.ts', '*.tsx'],
23+
rules: {
24+
'@typescript-eslint/no-unused-vars': [2, { args: 'none' }]
25+
}
26+
}
27+
]
28+
}

‎.prettierrc.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
module.exports = {
2+
arrowParens: 'avoid',
3+
trailingComma: 'none',
4+
tabWidth: 4,
5+
printWidth: 100,
6+
semi: false,
7+
useTabs: true,
8+
bracketSpacing: true,
9+
bracketSameLine: true,
10+
singleQuote: true
11+
}

‎src/actions/prClosedAction.ts‎

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,44 @@
1-
import * as github from "@actions/github";
2-
import S3 from '../s3Client';
3-
import { DeleteObjectsRequest } from 'aws-sdk/clients/s3';
4-
import validateEnvVars from '../utils/validateEnvVars';
5-
import deactivateDeployments from '../utils/deactivateDeployments';
6-
import deleteDeployments from "../utils/deleteDeployments";
1+
import * as github from '@actions/github'
2+
import S3 from '../s3Client'
3+
import { DeleteObjectsRequest } from 'aws-sdk/clients/s3'
4+
import validateEnvVars from '../utils/validateEnvVars'
5+
import deactivateDeployments from '../utils/deactivateDeployments'
6+
import deleteDeployments from '../utils/deleteDeployments'
77

8-
export const requiredEnvVars = ['AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY'];
8+
export const requiredEnvVars = ['AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY']
99

1010
export default async (bucketName: string, environmentPrefix: string) => {
11-
const { repo } = github.context;
11+
const { repo } = github.context
1212

13-
validateEnvVars(requiredEnvVars);
13+
validateEnvVars(requiredEnvVars)
1414

15-
console.log('Emptying S3 bucket...');
15+
console.log('Emptying S3 bucket...')
1616

17-
console.log('Fetching objects...');
18-
const objects = await S3.listObjectsV2({ Bucket: bucketName }).promise();
17+
console.log('Fetching objects...')
18+
const objects = await S3.listObjectsV2({ Bucket: bucketName }).promise()
1919

20-
if (objects.Contents && objects.Contents.length >= 1) {
21-
const deleteParams: DeleteObjectsRequest = {
22-
Bucket: bucketName,
23-
Delete: {
24-
Objects: []
25-
}
26-
};
20+
if (objects.Contents && objects.Contents.length >= 1) {
21+
const deleteParams: DeleteObjectsRequest = {
22+
Bucket: bucketName,
23+
Delete: {
24+
Objects: []
25+
}
26+
}
2727

28-
for (const object of objects.Contents) {
29-
deleteParams.Delete.Objects.push({ Key: object.Key });
30-
}
28+
for (const object of objects.Contents) {
29+
deleteParams.Delete.Objects.push({ Key: object.Key })
30+
}
3131

32-
console.log('Deleting objects...');
33-
await S3.deleteObjects(deleteParams).promise();
34-
} else {
35-
console.log('S3 bucket already empty.');
36-
}
32+
console.log('Deleting objects...')
33+
await S3.deleteObjects(deleteParams).promise()
34+
} else {
35+
console.log('S3 bucket already empty.')
36+
}
3737

38-
await S3.deleteBucket({ Bucket: bucketName }).promise();
38+
await S3.deleteBucket({ Bucket: bucketName }).promise()
3939

40+
await deactivateDeployments(repo, environmentPrefix)
41+
await deleteDeployments(repo, environmentPrefix)
4042

41-
await deactivateDeployments(repo, environmentPrefix);
42-
await deleteDeployments(repo, environmentPrefix)
43-
44-
console.log('S3 bucket removed');
45-
};
43+
console.log('S3 bucket removed')
44+
}

‎src/actions/prUpdatedAction.ts‎

Lines changed: 59 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,76 @@
1-
import * as github from "@actions/github";
2-
import * as githubCore from '@actions/core';
3-
import S3 from "../s3Client";
4-
import s3UploadDirectory from "../utils/s3UploadDirectory";
5-
import validateEnvVars from "../utils/validateEnvVars";
6-
import checkBucketExists from "../utils/checkBucketExists";
7-
import githubClient from "../githubClient";
8-
import deactivateDeployments from "../utils/deactivateDeployments";
9-
import { ReposCreateDeploymentResponseData } from "@octokit/types";
1+
import * as github from '@actions/github'
2+
import * as githubCore from '@actions/core'
3+
import S3 from '../s3Client'
4+
import s3UploadDirectory from '../utils/s3UploadDirectory'
5+
import validateEnvVars from '../utils/validateEnvVars'
6+
import checkBucketExists from '../utils/checkBucketExists'
7+
import githubClient from '../githubClient'
8+
import deactivateDeployments from '../utils/deactivateDeployments'
9+
import { ReposCreateDeploymentResponseData } from '@octokit/types'
1010

11-
export const requiredEnvVars = [
12-
"AWS_ACCESS_KEY_ID",
13-
"AWS_SECRET_ACCESS_KEY",
14-
"GITHUB_TOKEN",
15-
];
11+
export const requiredEnvVars = ['AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY', 'GITHUB_TOKEN']
1612

1713
export default async (bucketName: string, uploadDirectory: string, environmentPrefix: string) => {
18-
const websiteUrl = `https://s3.amazonaws.com/${bucketName}/index.html`;
19-
const { repo } = github.context;
20-
const branchName = github.context.payload.pull_request!.head.ref;
14+
const websiteUrl = `https://s3.amazonaws.com/${bucketName}/index.html`
15+
const { repo } = github.context
16+
const branchName = github.context.payload.pull_request!.head.ref
2117

22-
console.log("PR Updated");
18+
console.log('PR Updated')
2319

24-
validateEnvVars(requiredEnvVars);
20+
validateEnvVars(requiredEnvVars)
2521

26-
const bucketExists = await checkBucketExists(bucketName);
22+
const bucketExists = await checkBucketExists(bucketName)
2723

28-
if (!bucketExists) {
29-
console.log("S3 bucket does not exist. Creating...");
30-
await S3.createBucket({ Bucket: bucketName }).promise();
24+
if (!bucketExists) {
25+
console.log('S3 bucket does not exist. Creating...')
26+
await S3.createBucket({ Bucket: bucketName }).promise()
3127

32-
console.log("Configuring bucket website...");
33-
await S3.putBucketWebsite({
34-
Bucket: bucketName,
35-
WebsiteConfiguration: {
36-
IndexDocument: { Suffix: "index.html" },
37-
ErrorDocument: { Key: "index.html" },
38-
},
39-
}).promise();
40-
} else {
41-
console.log("S3 Bucket already exists. Skipping creation...");
42-
}
28+
console.log('Configuring bucket website...')
29+
await S3.putBucketWebsite({
30+
Bucket: bucketName,
31+
WebsiteConfiguration: {
32+
IndexDocument: { Suffix: 'index.html' },
33+
ErrorDocument: { Key: 'index.html' }
34+
}
35+
}).promise()
36+
} else {
37+
console.log('S3 Bucket already exists. Skipping creation...')
38+
}
4339

44-
await deactivateDeployments(repo, environmentPrefix);
40+
await deactivateDeployments(repo, environmentPrefix)
4541

46-
const deployment = await githubClient.repos.createDeployment({
47-
...repo,
48-
ref: `refs/heads/${branchName}`,
49-
environment: `${environmentPrefix || 'PR-'}${github.context.payload.pull_request!.number}`,
50-
auto_merge: false,
51-
transient_environment: true,
52-
required_contexts: [],
53-
});
42+
const deployment = await githubClient.repos.createDeployment({
43+
...repo,
44+
ref: `refs/heads/${branchName}`,
45+
environment: `${environmentPrefix || 'PR-'}${github.context.payload.pull_request!.number}`,
46+
auto_merge: false,
47+
transient_environment: true,
48+
required_contexts: []
49+
})
5450

55-
if (isSuccessResponse(deployment.data)) {
56-
await githubClient.repos.createDeploymentStatus({
57-
...repo,
58-
deployment_id: deployment.data.id,
59-
state: "in_progress",
60-
});
51+
if (isSuccessResponse(deployment.data)) {
52+
await githubClient.repos.createDeploymentStatus({
53+
...repo,
54+
deployment_id: deployment.data.id,
55+
state: 'in_progress'
56+
})
6157

62-
console.log("Uploading files...");
63-
await s3UploadDirectory(bucketName, uploadDirectory);
58+
console.log('Uploading files...')
59+
await s3UploadDirectory(bucketName, uploadDirectory)
6460

65-
await githubClient.repos.createDeploymentStatus({
66-
...repo,
67-
deployment_id: deployment.data.id,
68-
state: "success",
69-
environment_url: websiteUrl,
70-
});
61+
await githubClient.repos.createDeploymentStatus({
62+
...repo,
63+
deployment_id: deployment.data.id,
64+
state: 'success',
65+
environment_url: websiteUrl
66+
})
7167

72-
githubCore.setOutput('websiteUrl', websiteUrl);
68+
githubCore.setOutput('websiteUrl', websiteUrl)
7369

74-
console.log(`Website URL: ${websiteUrl}`);
75-
}
76-
};
70+
console.log(`Website URL: ${websiteUrl}`)
71+
}
72+
}
7773

78-
function isSuccessResponse(
79-
object: any
80-
): object is ReposCreateDeploymentResponseData {
81-
return "id" in object;
74+
function isSuccessResponse(object: any): object is ReposCreateDeploymentResponseData {
75+
return 'id' in object
8276
}

‎src/githubClient.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import * as github from '@actions/github';
1+
import * as github from '@actions/github'
22

3-
const { GITHUB_TOKEN } = process.env;
3+
const { GITHUB_TOKEN } = process.env
44

5-
export default github.getOctokit(GITHUB_TOKEN, { previews: ['ant-man-preview', 'flash-preview'] });
5+
export default github.getOctokit(GITHUB_TOKEN, { previews: ['ant-man-preview', 'flash-preview'] })

‎src/index.ts‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
1-
import * as core from '@actions/core';
2-
import * as github from '@actions/github';
3-
import prClosedAction from './actions/prClosedAction';
4-
import prUpdatedAction from './actions/prUpdatedAction';
1+
import * as core from '@actions/core'
2+
import * as github from '@actions/github'
3+
import prClosedAction from './actions/prClosedAction'
4+
import prUpdatedAction from './actions/prUpdatedAction'
55

66
const main = async () => {
7-
try {
8-
const bucketPrefix = core.getInput('bucket-prefix');
9-
const folderToCopy = core.getInput('folder-to-copy');
10-
const environmentPrefix = core.getInput('environment-prefix');
11-
12-
const prNumber = github.context.payload.pull_request!.number;
13-
const bucketName = `${bucketPrefix}-pr${prNumber}`;
14-
15-
console.log(`Bucket Name: ${bucketName}`);
16-
17-
const githubActionType = github.context.payload.action;
18-
19-
if (github.context.eventName === 'pull_request') {
20-
switch (githubActionType) {
21-
case 'opened':
22-
case 'reopened':
23-
case 'synchronize':
24-
await prUpdatedAction(bucketName, folderToCopy, environmentPrefix);
25-
break;
26-
27-
case 'closed':
28-
await prClosedAction(bucketName, environmentPrefix);
29-
break;
30-
31-
default:
32-
console.log('PR not created, modified or deleted. Skiping...');
33-
break;
34-
}
35-
} else {
36-
console.log('Not a PR. Skipping...');
37-
}
38-
} catch (error) {
39-
console.log(error);
40-
core.setFailed(error);
41-
}
42-
};
43-
44-
main();
7+
try {
8+
const bucketPrefix = core.getInput('bucket-prefix')
9+
const folderToCopy = core.getInput('folder-to-copy')
10+
const environmentPrefix = core.getInput('environment-prefix')
11+
12+
const prNumber = github.context.payload.pull_request!.number
13+
const bucketName = `${bucketPrefix}-pr${prNumber}`
14+
15+
console.log(`Bucket Name: ${bucketName}`)
16+
17+
const githubActionType = github.context.payload.action
18+
19+
if (github.context.eventName === 'pull_request') {
20+
switch (githubActionType) {
21+
case 'opened':
22+
case 'reopened':
23+
case 'synchronize':
24+
await prUpdatedAction(bucketName, folderToCopy, environmentPrefix)
25+
break
26+
27+
case 'closed':
28+
await prClosedAction(bucketName, environmentPrefix)
29+
break
30+
31+
default:
32+
console.log('PR not created, modified or deleted. Skiping...')
33+
break
34+
}
35+
} else {
36+
console.log('Not a PR. Skipping...')
37+
}
38+
} catch (error) {
39+
console.log(error)
40+
core.setFailed(error)
41+
}
42+
}
43+
44+
main()

‎src/s3Client.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import S3 from 'aws-sdk/clients/s3';
1+
import S3 from 'aws-sdk/clients/s3'
22

3-
export default new S3();
3+
export default new S3()

0 commit comments

Comments
 (0)