diff --git a/packages/import-service/.env b/packages/import-service/.env index 145a822..feea68c 100644 --- a/packages/import-service/.env +++ b/packages/import-service/.env @@ -1,4 +1,4 @@ IMPORT_S3_BUCKET=nodejs-aws-task5-csv -IMPORT_S3_PREFIX=uploaded/ IMPORT_S3_REGION=us-east-2 -PARSED_S3_PREFIX=parsed/ +IMPORT_S3_PARSED_PREFIX=parsed/ +IMPORT_S3_UPLOAD_PREFIX=uploaded/ diff --git a/packages/import-service/serverless.yml b/packages/import-service/serverless.yml index 55c03a1..5ee14b7 100644 --- a/packages/import-service/serverless.yml +++ b/packages/import-service/serverless.yml @@ -58,5 +58,5 @@ functions: bucket: "${env:IMPORT_S3_BUCKET}" event: "s3:ObjectCreated:*" rules: - - prefix: "${env:IMPORT_S3_PREFIX}" + - prefix: "${env:IMPORT_S3_UPLOAD_PREFIX}" existing: true \ No newline at end of file diff --git a/packages/import-service/src/handlers/importFileParser.js b/packages/import-service/src/handlers/importFileParser.js index 4659be3..89db7c8 100644 --- a/packages/import-service/src/handlers/importFileParser.js +++ b/packages/import-service/src/handlers/importFileParser.js @@ -9,9 +9,9 @@ const pipeline = promisify(_pipeline); const { IMPORT_S3_BUCKET, - IMPORT_S3_PREFIX, + IMPORT_S3_UPLOAD_PREFIX, IMPORT_S3_REGION, - PARSED_S3_PREFIX, + IMPORT_S3_PARSED_PREFIX, } = process.env; export const handler = middy(importFileParser).use([middyRequestLogger()]); @@ -21,7 +21,10 @@ export async function importFileParser(event, context, callback) { const tasks = event.Records.map(async (record) => { const srcKey = record.s3.object.key; - const destKey = srcKey.replace(IMPORT_S3_PREFIX, PARSED_S3_PREFIX); + const destKey = srcKey.replace( + IMPORT_S3_UPLOAD_PREFIX, + IMPORT_S3_PARSED_PREFIX + ); // parse CSV const uploadedObject = s3.getObject({ diff --git a/packages/import-service/src/handlers/importProductsFile.js b/packages/import-service/src/handlers/importProductsFile.js index e46e1e9..c76a314 100644 --- a/packages/import-service/src/handlers/importProductsFile.js +++ b/packages/import-service/src/handlers/importProductsFile.js @@ -5,7 +5,11 @@ import middyHttpCors from "@middy/http-cors"; import middyErrorHandler from "middy-error-handler"; import middyRequestLogger from "middy-request-logger"; -const { IMPORT_S3_BUCKET, IMPORT_S3_PREFIX, IMPORT_S3_REGION } = process.env; +const { + IMPORT_S3_BUCKET, + IMPORT_S3_UPLOAD_PREFIX, + IMPORT_S3_REGION, +} = process.env; const ALLOWED_CONTENT_TYPES = [ "text/csv", "application/vnd.ms-excel", @@ -29,7 +33,7 @@ export async function importProductsFile(event, context, callback) { } const s3 = new AWS.S3({ region: IMPORT_S3_REGION }); - const uploadPath = [IMPORT_S3_PREFIX, fileName].join(""); + const uploadPath = IMPORT_S3_UPLOAD_PREFIX + fileName; const url = await s3.getSignedUrlPromise("putObject", { Bucket: IMPORT_S3_BUCKET, Key: uploadPath,