Skip to content

Refactoring #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
apierr wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Refactoring #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2cad389
adding tests/test.http
apierr Nov 29, 2020
2c982e5
removing uuseless dependency?
apierr Nov 29, 2020
7ecd38c
updating test.http
apierr Nov 29, 2020
e0c844c
refactoring the s3 and ddb method
apierr Nov 29, 2020
bf28463
refactoring names
apierr Nov 29, 2020
344f9e8
adding serverless-s3-local
apierr Nov 29, 2020
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
13 changes: 11 additions & 2 deletions lambdas/common/S3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
const AWS = require("aws-sdk");

const s3Client = new AWS.S3();
let options = {};
if (process.env.IS_OFFLINE || process.env.JEST_WORKER_ID) {
options = {
s3ForcePathStyle: true,
accessKeyId: "S3RVER",
secretAccessKey: "S3RVER",
endpoint: new AWS.Endpoint(`http://localhost:${process.env.S3Port}`),
};
}

const s3Client = new AWS.S3(options);

const S3 = {
async get(fileName, bucket) {
Expand Down
38 changes: 38 additions & 0 deletions lambdas/endpoints/ddb-endopoint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
const Responses = require("../common/API-responses");
const Dynamo = require("../common/Dynamo");

const readItem = async (event) => {
const { PK } = event.path;
const response = await Dynamo.get({ PK });
return response ? Responses._200(response) : Responses._500(response);
};

const addItem = async (event) => {
const { PK } = event.path;
const response = await Dynamo.write(PK, event.body);
return Responses._200(response);
};

const updateItem = async (event) => {
console.log("event.pathParameters", event.path);
const { PK } = event.path;
const { paramName, paramValue } = event.body;
const response = await Dynamo.update(PK, paramName, paramValue);
return Responses._200(response);
};

const deleteItem = async (event) => {
const { PK } = event.path;
const response = await Dynamo.delete(PK);
return Responses._200(response);
};

module.exports.handler = async (event) => {
console.log("module.exports.handler", event.method);
return {
GET: async (e) => await readItem(e),
POST: async (e) => await addItem(e),
PUT: async (e) => updateItem(e),
DELETE: async (e) => deleteItem(e),
}[event.method](event);
};
13 changes: 0 additions & 13 deletions lambdas/endpoints/delete-db.js
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions lambdas/endpoints/read-db.js
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions lambdas/endpoints/read-s3.js
View file
Open in desktop

This file was deleted.

48 changes: 48 additions & 0 deletions lambdas/endpoints/s3-endpoint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
const Responses = require("../common/API-responses");
const S3 = require("../common/S3");
const { bucketName } = process.env;

const readItem = async (event) => {
const { fName } = event.path;

if (!fName) {
return Responses._400(
`Missing fName key from: ${JSON.stringify(event)} `
);
}

const data = await S3.get(fName, bucketName).catch((err) => {
console.error("Error in S3 get", err);
return null;
});

if (!data) return Responses._400(`Failed to read data by ${fName}`);

return Responses._200(data);
};

const addItem = async (event) => {
const { fName } = event.path;
if (!fName) return Responses._400({ message: "missing fName" });

const { body } = event;

const data = await S3.write(fName, body, bucketName).catch((err) => {
console.error("Error in S3 write", err);
return null;
});

if (!data) {
return Responses._400({ message: `Failed to write data on ${fName}` });
}

return Responses._200(data);
};

module.exports.handler = async (event) => {
console.log("module.exports.handler", event.method);
return {
GET: async (e) => await readItem(e),
POST: async (e) => await addItem(e),
}[event.method](event);
};
20 changes: 0 additions & 20 deletions lambdas/endpoints/update-db.js
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions lambdas/endpoints/write-db.js
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions lambdas/endpoints/write-s3.js
View file
Open in desktop

This file was deleted.

Loading