@dmptool/utils 1.0.36 → 1.0.38

package/dist/dynamo.d.ts

@@ -6,6 +6,7 @@ export interface DynamoConnectionParams {
     logger: Logger;
     region: string;
     tableName: string;
+    endpoint?: string;
     maxAttempts: number;
 }
 export interface DMPVersionType {

package/dist/dynamo.js

@@ -10,8 +10,13 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteDMP = exports.tombstoneDMP = exports.updateDMP = exports.createDMP = exports.getDMPs = exports.getDMPVersions = exports.getAllUniqueDMPIds = exports.DMPExists = exports.DMP_TOMBSTONE_VERSION = exports.DMP_LATEST_VERSION = void 0;
+const http_1 = __importDefault(require("http"));
+const node_http_handler_1 = require("@aws-sdk/node-http-handler");
 const util_dynamodb_1 = require("@aws-sdk/util-dynamodb");
 const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
 const general_1 = require("./general");
@@ -46,8 +51,18 @@ class DMPToolDynamoError extends Error {
 }
 // Initialize AWS SDK clients (outside the handler function)
 const getDynamoDBClient = (dynamoConfigParams) => {
-    const { region, maxAttempts } = dynamoConfigParams;
-    return new client_dynamodb_1.DynamoDBClient({ region, maxAttempts });
+    const { region, maxAttempts, endpoint } = dynamoConfigParams;
+    // If an endpoint was specified, we are running in a local environment
+    return endpoint === undefined
+        ? new client_dynamodb_1.DynamoDBClient({ region, maxAttempts })
+        : new client_dynamodb_1.DynamoDBClient({
+            region,
+            maxAttempts,
+            endpoint,
+            requestHandler: new node_http_handler_1.NodeHttpHandler({
+                httpAgent: new http_1.default.Agent({ keepAlive: true }),
+            }),
+        });
 };
 /**
  * Lightweight query just to check if the DMP exists.

package/dist/maDMP.js

@@ -236,7 +236,7 @@ const loadMemberInfo = async (rdsConnectionParams, planId) => {
       LEFT JOIN projectMembers pctr ON pc.projectMemberId = pctr.id
         LEFT JOIN affiliations a ON pctr.affiliationId = a.uri
     WHERE pc.planId = ?
-    GROUP BY a.uri, a.name, pctr.email, pctr.givenName, pctr.surName,
+    GROUP BY pc.id, a.uri, a.name, pctr.email, pctr.givenName, pctr.surName,
       pctr.orcid, pc.isPrimaryContact;
   `;
     rdsConnectionParams.logger.debug({ planId, sql }, 'Fetching plan member information');

package/dist/ssm.d.ts

@@ -16,4 +16,4 @@ export interface SsmConnectionParams {
  * @returns The value of the variable, or undefined if the variable could not be found.
  * @throws
  */
-export declare const getSSMParameter: (connectionParams: SsmConnectionParams, key: string, env?: EnvironmentEnum, endpoint?: string) => Promise<string | undefined>;
+export declare const getSSMParameter: (connectionParams: SsmConnectionParams, key: string, env?: EnvironmentEnum) => Promise<string | undefined>;

package/dist/ssm.js

@@ -13,7 +13,7 @@ const client_ssm_1 = require("@aws-sdk/client-ssm");
  * @returns The value of the variable, or undefined if the variable could not be found.
  * @throws
  */
-const getSSMParameter = async (connectionParams, key, env = general_1.EnvironmentEnum.DEV, endpoint) => {
+const getSSMParameter = async (connectionParams, key, env = general_1.EnvironmentEnum.DEV) => {
     var _a;
     if (connectionParams.logger && key && key.trim() !== '') {
         // Create an SSM client (use the endpoint if we are not using TLS - local dev)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dmptool/utils",
-  "version": "1.0.36",
+  "version": "1.0.38",
   "description": "Helper/Utility functions for use in the DMP Tool services. Particularly AWS tooling and maDMP serialization",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -43,10 +43,11 @@
   "peerDependencies": {
     "@aws-sdk/client-cloudformation": "^3.980.0",
     "@aws-sdk/client-dynamodb": "^3.980.0",
-    "@aws-sdk/client-sqs": "^3.980.0",
     "@aws-sdk/client-s3": "^3.980.0",
     "@aws-sdk/client-sns": "^3.980.0",
+    "@aws-sdk/client-sqs": "^3.980.0",
     "@aws-sdk/client-ssm": "^3.980.0",
+    "@aws-sdk/node-http-handler": "^3.370.0",
     "@aws-sdk/s3-request-presigner": "^3.980.0",
     "@aws-sdk/util-dynamodb": "^3.980.0"
   },