From 73896b792a10ca2ebbc5f8889d9d16d265e5e948 Mon Sep 17 00:00:00 2001 From: Kallyan Singha Date: Sat, 10 Feb 2024 22:51:39 +0530 Subject: [PATCH 1/3] chore: added env file on request-handler --- vercel-request-handler/.gitignore | 1 + vercel-request-handler/package-lock.json | 12 ++++++++++++ vercel-request-handler/package.json | 1 + vercel-request-handler/src/index.ts | 13 +++++++++---- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/vercel-request-handler/.gitignore b/vercel-request-handler/.gitignore index f06235c..a0d218e 100644 --- a/vercel-request-handler/.gitignore +++ b/vercel-request-handler/.gitignore @@ -1,2 +1,3 @@ node_modules dist +.env \ No newline at end of file diff --git a/vercel-request-handler/package-lock.json b/vercel-request-handler/package-lock.json index 0b7b653..d18f7a8 100644 --- a/vercel-request-handler/package-lock.json +++ b/vercel-request-handler/package-lock.json @@ -11,6 +11,7 @@ "dependencies": { "@types/express": "^4.17.21", "aws-sdk": "^2.1553.0", + "dotenv": "^16.4.1", "express": "^4.18.2" } }, @@ -296,6 +297,17 @@ "npm": "1.2.8000 || >= 1.4.16" } }, + "node_modules/dotenv": { + "version": "16.4.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.1.tgz", + "integrity": "sha512-CjA3y+Dr3FyFDOAMnxZEGtnW9KBR2M0JvvUtXNW+dYJL5ROWxP9DUHCwgFqpMk0OXCc0ljhaNTr2w/kutYIcHQ==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/motdotla/dotenv?sponsor=1" + } + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", diff --git a/vercel-request-handler/package.json b/vercel-request-handler/package.json index db91291..fcdd5dd 100644 --- a/vercel-request-handler/package.json +++ b/vercel-request-handler/package.json @@ -12,6 +12,7 @@ "dependencies": { "@types/express": "^4.17.21", "aws-sdk": "^2.1553.0", + "dotenv": "^16.4.1", "express": "^4.18.2" } } diff --git a/vercel-request-handler/src/index.ts b/vercel-request-handler/src/index.ts index de53c24..dbec2ff 100644 --- a/vercel-request-handler/src/index.ts +++ b/vercel-request-handler/src/index.ts @@ -1,10 +1,13 @@ import express from "express"; import { S3 } from "aws-sdk"; +require("dotenv").config() + +const {AWS_ACCESS_KEY,AWS_SECRET_ACCESS_KEY,CLOUDFLARE_STORAGE_ENDPOINT,PORT} = process.env const s3 = new S3({ - accessKeyId: "7ea9c3f8c7f0f26f0d21c5ce99d1ad6a", - secretAccessKey: "b4df203781dd711223ce931a2d7ca269cdbf81bb530de4548474584951b798be", - endpoint: "https://e21220f4758c0870ba9c388712d42ef2.r2.cloudflarestorage.com" + accessKeyId: AWS_ACCESS_KEY, + secretAccessKey: AWS_SECRET_ACCESS_KEY, + endpoint: CLOUDFLARE_STORAGE_ENDPOINT }) const app = express(); @@ -27,4 +30,6 @@ app.get("/*", async (req, res) => { res.send(contents.Body); }) -app.listen(3001); \ No newline at end of file +app.listen(PORT, () => { + console.log(`Server listening on PORT : ${PORT}`); + }); \ No newline at end of file From 37469da072fa87491faed43fcc9354fdac6a8701 Mon Sep 17 00:00:00 2001 From: Kallyan Singha Date: Sun, 11 Feb 2024 00:21:03 +0530 Subject: [PATCH 2/3] chore: moved creds to .env file on upload and deploy-service --- vercel-deploy-service/.gitignore | 1 + vercel-deploy-service/package-lock.json | 12 ++++++++++++ vercel-deploy-service/package.json | 1 + vercel-deploy-service/src/aws.ts | 9 ++++++--- vercel-upload-service/.gitignore | 1 + vercel-upload-service/package-lock.json | 12 ++++++++++++ vercel-upload-service/package.json | 1 + vercel-upload-service/src/aws.ts | 9 ++++++--- vercel-upload-service/src/index.ts | 4 +++- 9 files changed, 43 insertions(+), 7 deletions(-) diff --git a/vercel-deploy-service/.gitignore b/vercel-deploy-service/.gitignore index f06235c..a0d218e 100644 --- a/vercel-deploy-service/.gitignore +++ b/vercel-deploy-service/.gitignore @@ -1,2 +1,3 @@ node_modules dist +.env \ No newline at end of file diff --git a/vercel-deploy-service/package-lock.json b/vercel-deploy-service/package-lock.json index 838d137..2593933 100644 --- a/vercel-deploy-service/package-lock.json +++ b/vercel-deploy-service/package-lock.json @@ -12,6 +12,7 @@ "@types/node": "^20.11.16", "@types/redis": "^4.0.11", "aws-sdk": "^2.1553.0", + "dotenv": "^16.4.1", "fs": "^0.0.1-security", "path": "^0.12.7", "redis": "^4.6.13" @@ -186,6 +187,17 @@ "node": ">= 0.4" } }, + "node_modules/dotenv": { + "version": "16.4.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.1.tgz", + "integrity": "sha512-CjA3y+Dr3FyFDOAMnxZEGtnW9KBR2M0JvvUtXNW+dYJL5ROWxP9DUHCwgFqpMk0OXCc0ljhaNTr2w/kutYIcHQ==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/motdotla/dotenv?sponsor=1" + } + }, "node_modules/es-errors": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", diff --git a/vercel-deploy-service/package.json b/vercel-deploy-service/package.json index b625adc..f62990d 100644 --- a/vercel-deploy-service/package.json +++ b/vercel-deploy-service/package.json @@ -13,6 +13,7 @@ "@types/node": "^20.11.16", "@types/redis": "^4.0.11", "aws-sdk": "^2.1553.0", + "dotenv": "^16.4.1", "fs": "^0.0.1-security", "path": "^0.12.7", "redis": "^4.6.13" diff --git a/vercel-deploy-service/src/aws.ts b/vercel-deploy-service/src/aws.ts index ba62c42..4166162 100644 --- a/vercel-deploy-service/src/aws.ts +++ b/vercel-deploy-service/src/aws.ts @@ -1,11 +1,14 @@ import { S3 } from "aws-sdk"; import fs from "fs"; import path from "path"; +require("dotenv").config() + +const {AWS_ACCESS_KEY,AWS_SECRET_ACCESS_KEY,CLOUDFLARE_STORAGE_ENDPOINT,PORT} = process.env const s3 = new S3({ - accessKeyId: "7ea9c3f8c7f0f26f0d21c5ce99d1ad6a", - secretAccessKey: "b4df203781dd711223ce931a2d7ca269cdbf81bb530de4548474584951b798be", - endpoint: "https://e21220f4758c0870ba9c388712d42ef2.r2.cloudflarestorage.com" + accessKeyId: AWS_ACCESS_KEY, + secretAccessKey: AWS_SECRET_ACCESS_KEY, + endpoint: CLOUDFLARE_STORAGE_ENDPOINT }) // output/asdasd diff --git a/vercel-upload-service/.gitignore b/vercel-upload-service/.gitignore index f06235c..a0d218e 100644 --- a/vercel-upload-service/.gitignore +++ b/vercel-upload-service/.gitignore @@ -1,2 +1,3 @@ node_modules dist +.env \ No newline at end of file diff --git a/vercel-upload-service/package-lock.json b/vercel-upload-service/package-lock.json index 43072ca..ed24784 100644 --- a/vercel-upload-service/package-lock.json +++ b/vercel-upload-service/package-lock.json @@ -13,6 +13,7 @@ "@types/express": "^4.17.21", "aws-sdk": "^2.1553.0", "cors": "^2.8.5", + "dotenv": "^16.4.1", "express": "^4.18.2", "redis": "^4.6.13", "simple-git": "^3.22.0" @@ -415,6 +416,17 @@ "npm": "1.2.8000 || >= 1.4.16" } }, + "node_modules/dotenv": { + "version": "16.4.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.1.tgz", + "integrity": "sha512-CjA3y+Dr3FyFDOAMnxZEGtnW9KBR2M0JvvUtXNW+dYJL5ROWxP9DUHCwgFqpMk0OXCc0ljhaNTr2w/kutYIcHQ==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/motdotla/dotenv?sponsor=1" + } + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", diff --git a/vercel-upload-service/package.json b/vercel-upload-service/package.json index c7ffb82..37eb127 100644 --- a/vercel-upload-service/package.json +++ b/vercel-upload-service/package.json @@ -14,6 +14,7 @@ "@types/express": "^4.17.21", "aws-sdk": "^2.1553.0", "cors": "^2.8.5", + "dotenv": "^16.4.1", "express": "^4.18.2", "redis": "^4.6.13", "simple-git": "^3.22.0" diff --git a/vercel-upload-service/src/aws.ts b/vercel-upload-service/src/aws.ts index 4b856a0..78d5c16 100644 --- a/vercel-upload-service/src/aws.ts +++ b/vercel-upload-service/src/aws.ts @@ -1,10 +1,13 @@ import { S3 } from "aws-sdk"; import fs from "fs"; +require("dotenv").config() + +const {AWS_ACCESS_KEY,AWS_SECRET_ACCESS_KEY,CLOUDFLARE_STORAGE_ENDPOINT,PORT} = process.env const s3 = new S3({ - accessKeyId: "7ea9c3f8c7f0f26f0d21c5ce99d1ad6a", - secretAccessKey: "b4df203781dd711223ce931a2d7ca269cdbf81bb530de4548474584951b798be", - endpoint: "https://e21220f4758c0870ba9c388712d42ef2.r2.cloudflarestorage.com" + accessKeyId: AWS_ACCESS_KEY, + secretAccessKey: AWS_SECRET_ACCESS_KEY, + endpoint: CLOUDFLARE_STORAGE_ENDPOINT }) // fileName => output/12312/src/App.jsx diff --git a/vercel-upload-service/src/index.ts b/vercel-upload-service/src/index.ts index d58df01..516f784 100644 --- a/vercel-upload-service/src/index.ts +++ b/vercel-upload-service/src/index.ts @@ -7,6 +7,8 @@ import { getAllFiles } from "./file"; import path from "path"; import { uploadFile } from "./aws"; import { createClient } from "redis"; +require("dotenv").config() +const {PORT} = process.env; const publisher = createClient(); publisher.connect(); @@ -48,4 +50,4 @@ app.get("/status", async (req, res) => { }) }) -app.listen(3000); +app.listen(PORT); From 0a4149b824383e00aad5032a8692df53e5e091dd Mon Sep 17 00:00:00 2001 From: Kallyan Singha Date: Sun, 11 Feb 2024 00:37:36 +0530 Subject: [PATCH 3/3] docs: added readme.md --- README.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..9f5e8e3 --- /dev/null +++ b/README.md @@ -0,0 +1,29 @@ +# Vercel Deployment Service + + + +## ```.env``` setup + +Before running the services locally make sure to add this ```.env``` file and content init . + +```/vercel-deploy-service``` +```bash +AWS_ACCESS_KEY=YOUR_ACCESS_KEY + +AWS_SECRET_ACCESS_KEY=YOUR_ACCESS_KEY + +CLOUDFLARE_STORAGE_ENDPOINT=YOUR_ENDPOINT_URL +``` + +```/vercel-upload-service``` & ```/vercel-request-handler``` +```bash +AWS_ACCESS_KEY=YOUR_ACCESS_KEY + +AWS_SECRET_ACCESS_KEY=YOUR_ACCESS_KEY + +CLOUDFLARE_STORAGE_ENDPOINT=YOUR_ENDPOINT_URL + +PORT=YOUR_PREFFERED_PORT_NO +``` + +