diff --git a/src/db-wrapper.js b/src/db-wrapper.js index 65f4e9bab..c51de1e48 100644 --- a/src/db-wrapper.js +++ b/src/db-wrapper.js @@ -13,9 +13,10 @@ import createDynamoDBService from './db.js'; import serviceWrap from './service-wrap.js'; function wrapper(func) { - return (params) => serviceWrap( + return (request, context) => serviceWrap( func, - params, + request, + context, '__ow_dynamodb', createDynamoDBService, ); diff --git a/src/db.js b/src/db.js index a189f7ebc..71dca708f 100644 --- a/src/db.js +++ b/src/db.js @@ -16,8 +16,8 @@ import { log } from './util.js'; const TABLE_SITES = 'spacecat-site'; const TABLE_AUDITS = 'spacecat-audit-index'; -function DB(params) { - const client = new DynamoDBClient({ region: params.region }); +function DB() { + const client = new DynamoDBClient({ region: process.env.REGION }); const docClient = DynamoDBDocumentClient.from(client); /** @@ -136,8 +136,8 @@ function DB(params) { }; } -const createDynamoDBService = (params) => Object.freeze({ - getInstance: () => DB(params), +const createDynamoDBService = () => Object.freeze({ + getInstance: () => DB(), }); export default { createDynamoDBService }; diff --git a/src/service-wrap.js b/src/service-wrap.js index 1ea3f44b4..241d35455 100644 --- a/src/service-wrap.js +++ b/src/service-wrap.js @@ -11,19 +11,20 @@ */ const serviceWrap = ( lambdaFn, - lambdaParams, + lambdaRequest, + lambdaContext, paramName, factoryFn, ) => { - if (!lambdaParams[paramName]) { - const service = factoryFn(lambdaParams); + if (!lambdaContext[paramName]) { + const service = factoryFn(lambdaContext); // pass params by reference and not value so later modifications // of the params are accessible to the wrap // eslint-disable-next-line no-param-reassign - lambdaParams[paramName] = service.getInstance(lambdaParams); + lambdaContext[paramName] = service.getInstance(lambdaContext); } - return lambdaFn(lambdaParams); + return lambdaFn(lambdaContext); }; module.exports = serviceWrap;