CCSI-Toolset · ksbeattie · Nov 8, 2022 · Jun 24, 2022 · Jul 5, 2022 · Jul 5, 2022
diff --git a/cloud/aws/node/delete-simulation/index.js b/cloud/aws/node/delete-simulation/index.js
@@ -11,7 +11,7 @@
 'use AWS.DynamoDB'
 console.log('Loading function');
 const AWS = require('aws-sdk');
-const uuidv4 = require('uuid/v4');
+const { v4: uuidv4 } = require('uuid');
 var validate = require('uuid-validate');
 
 /*

diff --git a/cloud/aws/node/delete-simulation/package.json b/cloud/aws/node/delete-simulation/package.json
@@ -1,12 +1,12 @@
 {
   "name": "delete-simulation",
-  "version": "1.0.0",
-  "description": "Returns array of simulations",
+  "version": "2.0.0",
+  "description": "Delete simulation",
   "main": "index.js",
   "dependencies": {
-    "aws-sdk": "^2.606.0",
-    "uuid": "^3.2.1",
-    "uuid-validate": ""
+    "aws-sdk": "",
+    "uuid": "^8.3.2",
+    "uuid-validate": ">=0.0.3"
   },
   "scripts": {
     "setup": "./node_modules/.bin/node-lambda setup",

diff --git a/cloud/aws/node/dynamo-stream-trigger/index.js b/cloud/aws/node/dynamo-stream-trigger/index.js
@@ -14,7 +14,6 @@
 'use strict';
 'use AWS.S3'
 'use AWS.DynamoDB'
-'use uuid'
 const assert = require('assert');
 const log = require("debug")("dynamo-stream-trigger")
 const AWS = require('aws-sdk');

diff --git a/cloud/aws/node/dynamo-stream-trigger/package.json b/cloud/aws/node/dynamo-stream-trigger/package.json
@@ -1,13 +1,11 @@
 {
   "name": "dynamo-stream-trigger",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "",
   "main": "index.js",
   "dependencies": {
-    "aws-sdk": "^2.606.0",
-    "debug": ">=4.1.1",
-    "node-lambda": "^0.16.0",
-    "uuid": "^3.2.1"
+    "aws-sdk": "",
+    "debug": ">=4.3.4"
   },
   "scripts": {
     "setup": "./node_modules/.bin/node-lambda setup",

diff --git a/cloud/aws/node/foqus-fake-job-runner/index.js b/cloud/aws/node/foqus-fake-job-runner/index.js
@@ -9,7 +9,6 @@
  * @see https://github.com/motdotla/node-lambda-template
  */
 'use strict';
-'use uuid'
 const AWS = require('aws-sdk');
 const sqs = new AWS.SQS();
 const sns = new AWS.SNS();

diff --git a/cloud/aws/node/foqus-fake-job-runner/package.json b/cloud/aws/node/foqus-fake-job-runner/package.json
@@ -1,12 +1,11 @@
 {
   "name": "foqus-fake-job-runner",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "for testing, Grabs job off SQS, sends job update notifications",
   "main": "index.js",
   "dependencies": {
-    "aws-sdk": "^2.606.0",
-    "uuid": "^3.2.1",
-    "debug": ">=4.1.1"
+    "aws-sdk": "",
+    "debug": ">=4.3.4"
   },
   "scripts": {
     "setup": "./node_modules/.bin/node-lambda setup",

diff --git a/cloud/aws/node/foqus-fake-job-runner/running.js b/cloud/aws/node/foqus-fake-job-runner/running.js
@@ -9,7 +9,6 @@
  * @see https://github.com/motdotla/node-lambda-template
  */
 'use strict';
-'use uuid'
 const AWS = require('aws-sdk');
 const sqs = new AWS.SQS();
 const sns = new AWS.SNS();

diff --git a/cloud/aws/node/foqus-fake-job-runner/setup.js b/cloud/aws/node/foqus-fake-job-runner/setup.js
@@ -9,7 +9,6 @@
  * @see https://github.com/motdotla/node-lambda-template
  */
 'use strict';
-'use uuid'
 const AWS = require('aws-sdk');
 const sqs = new AWS.SQS();
 const sns = new AWS.SNS();

diff --git a/cloud/aws/node/foqus-fake-job-runner/submit.js b/cloud/aws/node/foqus-fake-job-runner/submit.js
@@ -9,7 +9,6 @@
  * @see https://github.com/motdotla/node-lambda-template
  */
 'use strict';
-'use uuid'
 const AWS = require('aws-sdk');
 const sqs = new AWS.SQS();
 const sns = new AWS.SNS();

diff --git a/cloud/aws/node/foqus-sns-update/package.json b/cloud/aws/node/foqus-sns-update/package.json
@@ -1,10 +1,10 @@
 {
   "name": "foqus-sns-update",
-  "version": "1.0.0",
-  "description": "",
+  "version": "2.0.0",
+  "description": "Central Message Processor for front and backends",
   "main": "index.js",
   "dependencies": {
-    "aws-sdk": "^2.606.0"
+    "aws-sdk": ""
   },
   "scripts": {
     "setup": "./node_modules/.bin/node-lambda setup",

diff --git a/cloud/aws/node/get-session-list/package.json b/cloud/aws/node/get-session-list/package.json
@@ -1,11 +1,11 @@
 {
   "name": "get-session-list",
-  "version": "1.0.0",
-  "description": "Creates a new Turbine Session in S3 bucket under user",
+  "version": "2.0.0",
+  "description": "List of session resources (GUIDs)",
   "main": "index.js",
   "dependencies": {
-    "aws-sdk": "^2.606.0",
-    "debug": ">=4.1.1"
+    "aws-sdk": "",
+    "debug": ">=4.3.4"
   },
   "scripts": {
     "setup": "./node_modules/.bin/node-lambda setup",

diff --git a/cloud/aws/node/get-session-result-page/package.json b/cloud/aws/node/get-session-result-page/package.json
@@ -1,11 +1,11 @@
 {
   "name": "get-session-result-page",
-  "version": "1.0.0",
-  "description": "Returns Simulation Flowsheet",
+  "version": "2.0.0",
+  "description": "Returns page of session results",
   "main": "index.js",
   "dependencies": {
-    "aws-sdk": "^2.606.0",
-    "debug": ">=4.1.1"
+    "aws-sdk": "",
+    "debug": ">=4.3.4"
   },
   "scripts": {
     "setup": "./node_modules/.bin/node-lambda setup",

diff --git a/cloud/aws/node/get-session/package.json b/cloud/aws/node/get-session/package.json
@@ -1,11 +1,11 @@
 {
   "name": "get-session",
-  "version": "1.0.0",
-  "description": "Return all FOQUS jobs in a session",
+  "version": "2.0.0",
+  "description": "Returns FOQUS jobs (GUIDs) in a session",
   "main": "index.js",
   "dependencies": {
-    "aws-sdk": "^2.606.0",
-    "debug": ">=4.1.1"
+    "aws-sdk": "",
+    "debug": ">=4.3.4"
   },
   "scripts": {
     "setup": "./node_modules/.bin/node-lambda setup",

diff --git a/cloud/aws/node/get-simulation-input-file/package.json b/cloud/aws/node/get-simulation-input-file/package.json
@@ -1,11 +1,11 @@
 {
   "name": "get-simulation-input",
-  "version": "1.0.0",
-  "description": "Returns Simulation Flowsheet",
+  "version": "2.0.0",
+  "description": "Returns staged-in simulation/{name}/input/{resource}",
   "main": "index.js",
   "dependencies": {
-    "aws-sdk": "^2.606.0",
-    "debug": ">=4.1.1"
+    "aws-sdk": "",
+    "debug": ">=4.3.4"
   },
   "scripts": {
     "setup": "./node_modules/.bin/node-lambda setup",

diff --git a/cloud/aws/node/get-simulation-list/package.json b/cloud/aws/node/get-simulation-list/package.json
@@ -1,10 +1,11 @@
 {
   "name": "get-simulation-list",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "Returns array of simulations",
   "main": "index.js",
   "dependencies": {
-    "aws-sdk": "^2.606.0"
+    "aws-sdk": "",
+    "debug": ">=4.3.4"
   },
   "scripts": {
     "setup": "./node_modules/.bin/node-lambda setup",

diff --git a/cloud/aws/node/http-basic-authorizer/index.js b/cloud/aws/node/http-basic-authorizer/index.js
@@ -9,7 +9,6 @@
  */
 'use strict';
 'use AWS.DynamoDB'
-'use uuid'
 const AWS = require('aws-sdk');
 //const table_name = "FOQUS_Resources";
 const table_name = process.env.FOQUS_DYNAMO_TABLE_NAME;
@@ -139,12 +138,6 @@ var generateDeny = function(principalId, resource) {
     return generatePolicy(principalId, 'Deny', resource);
 }
 
-function decodeBase64(str) {
-  return new Buffer(str, 'base64').toString();
-}
-
-
-
 var credentialsRegExp = /^ *(?:[Bb][Aa][Ss][Ii][Cc]) +([A-Za-z0-9\-\._~\+\/]+=*) *$/;
 
 /**
@@ -188,7 +181,7 @@ function userFromBasicAuthString(header) {
  */
 
 function decodeBase64(str) {
-  return new Buffer(str, 'base64').toString();
+  return new Buffer.from(str, 'base64').toString();
 }
 
 /**

diff --git a/cloud/aws/node/http-basic-authorizer/package.json b/cloud/aws/node/http-basic-authorizer/package.json
@@ -1,11 +1,11 @@
 {
   "name": "http-basic-authorizer",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "Basic HTTP Custom Authorizer",
   "main": "index.js",
   "dependencies": {
-    "aws-sdk": "^2.606.0",
-    "debug": ">=4.1.1"
+    "aws-sdk": "",
+    "debug": ">=4.3.4"
   },
   "scripts": {
     "setup": "./node_modules/.bin/node-lambda setup",

diff --git a/cloud/aws/node/post-session-append/index.js b/cloud/aws/node/post-session-append/index.js
@@ -14,15 +14,14 @@
 'use strict';
 'use AWS.S3'
 'use AWS.DynamoDB'
-'use uuid'
 const log = require("debug")("post-session-append")
 const AWS = require('aws-sdk');
 //const s3 = require('s3');
 const fs = require('fs');
 const dirPath = "./tmp";
 const path = require('path');
 const abspath = path.resolve(dirPath);
-const uuidv4 = require('uuid/v4');
+const { v4: uuidv4 } = require('uuid');
 const s3_bucket_name = process.env.SESSION_BUCKET_NAME;
 const s3_sim_bucket_name = process.env.SIMULATION_BUCKET_NAME;
 const tablename = process.env.FOQUS_DYNAMO_TABLE_NAME;

diff --git a/cloud/aws/node/post-session-append/package.json b/cloud/aws/node/post-session-append/package.json
@@ -1,12 +1,12 @@
 {
   "name": "post-session-append",
-  "version": "1.0.0",
-  "description": "Adds a job array to a Turbine Session in S3 bucket under user",
+  "version": "2.0.0",
+  "description": "Adds an array of Jobs to a Session",
   "main": "index.js",
   "dependencies": {
-    "aws-sdk": "^2.606.0",
-    "uuid": "^3.2.1",
-    "debug": ">=4.1.1"
+    "aws-sdk": "",
+    "uuid": "^8.3.2",
+    "debug": ">=4.3.4"
   },
   "scripts": {
     "setup": "./node_modules/.bin/node-lambda setup",

diff --git a/cloud/aws/node/post-session-create/index.js b/cloud/aws/node/post-session-create/index.js
@@ -7,8 +7,8 @@
  * @see https://github.com/motdotla/node-lambda-template
  */
 'use strict';
-'use uuid'
-const uuidv4 = require('uuid/v4');
+const { v4: uuidv4 } = require('uuid');
+
 exports.handler = function(event, context, callback) {
   const done = (err, res) => callback(null, {
       statusCode: err ? '400' : '200',

diff --git a/cloud/aws/node/post-session-create/package.json b/cloud/aws/node/post-session-create/package.json
@@ -1,10 +1,10 @@
 {
   "name": "post-session-create",
-  "version": "1.0.0",
-  "description": "Creates a new Turbine Session in S3 bucket under user",
+  "version": "2.0.0",
+  "description": "Returns a new GUID for use as a Session resource",
   "main": "index.js",
   "dependencies": {
-    "uuid": "^3.2.1"
+    "uuid": "^8.3.2"
   },
   "scripts": {
     "setup": "./node_modules/.bin/node-lambda setup",

diff --git a/cloud/aws/node/post-session-kill/index.js b/cloud/aws/node/post-session-kill/index.js
@@ -10,7 +10,6 @@
  */
 'use strict';
 'use AWS.SNS'
-'use uuid'
 const log = require("debug")("post-session-kill")
 const AWS = require('aws-sdk');
 //const s3 = require('s3');
@@ -19,7 +18,7 @@ const dirPath = "./tmp";
 const path = require('path');
 const abspath = path.resolve(dirPath);
 //const s3_bucket_name = process.env.SESSION_BUCKET_NAME;
-const uuidv4 = require('uuid/v4');
+const { v4: uuidv4 } = require('uuid');
 const foqus_update_topic = process.env.FOQUS_UPDATE_TOPIC;
 
 // post-session-start:

diff --git a/cloud/aws/node/post-session-kill/package.json b/cloud/aws/node/post-session-kill/package.json
@@ -1,12 +1,12 @@
 {
   "name": "post-session-kill",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "Kill jobs in Turbine Session",
   "main": "index.js",
   "dependencies": {
-    "aws-sdk": "^2.606.0",
-    "uuid": "^3.2.1",
-    "debug": ">=4.1.1"
+    "aws-sdk": "",
+    "uuid": "^8.3.2",
+    "debug": ">=4.3.4"
   },
   "scripts": {
     "setup": "./node_modules/.bin/node-lambda setup",

diff --git a/cloud/aws/node/post-session-result/index.js b/cloud/aws/node/post-session-result/index.js
@@ -11,9 +11,8 @@
  */
 'use strict';
 'use AWS.S3'
-'use uuid'
 const log = require("debug")("post-session-result")
-const uuidv4 = require('uuid/v4');
+const { v4: uuidv4 } = require('uuid');
 const AWS = require('aws-sdk');
 const tableName = process.env.FOQUS_DYNAMO_TABLE_NAME;
 const s3_bucket_name = process.env.SESSION_BUCKET_NAME;

diff --git a/cloud/aws/node/post-session-result/package.json b/cloud/aws/node/post-session-result/package.json
@@ -1,12 +1,12 @@
 {
   "name": "post-session-result",
-  "version": "1.0.0",
-  "description": "Creates a new Turbine Session generator result page in S3 bucket under user, returns page number",
+  "version": "2.0.0",
+  "description": "Creates a Turbine Session result page in S3 bucket under user, returns page number",
   "main": "index.js",
   "dependencies": {
-    "aws-sdk": "^2.606.0",
-    "uuid": "^3.2.1",
-    "debug": ">=4.1.1",
+    "aws-sdk": "",
+    "uuid": "^8.3.2",
+    "debug": ">=4.3.4",
     "collections": ">=5.1.11"
   },
   "scripts": {

diff --git a/cloud/aws/node/post-session-start/index.js b/cloud/aws/node/post-session-start/index.js
@@ -12,7 +12,6 @@
  */
 'use strict';
 'use AWS.S3'
-'use uuid'
 const assert = require('assert');
 const log = require("debug")("post-session-start")
 const AWS = require('aws-sdk');
@@ -22,7 +21,7 @@ const dirPath = "./tmp";
 const path = require('path');
 const abspath = path.resolve(dirPath);
 const s3_bucket_name = process.env.SESSION_BUCKET_NAME;
-const uuidv4 = require('uuid/v4');
+const { v4: uuidv4 } = require('uuid');
 const foqus_update_topic = process.env.FOQUS_UPDATE_TOPIC;
 const s3 = new AWS.S3();
 const sns = new AWS.SNS();

diff --git a/cloud/aws/node/post-session-start/package.json b/cloud/aws/node/post-session-start/package.json
@@ -1,12 +1,12 @@
 {
   "name": "post-session-start",
-  "version": "1.0.0",
-  "description": "Moves jobs in Turbine Session to the Queue",
+  "version": "2.0.0",
+  "description": "Changes state of jobs in a Session to submit state (queued)",
   "main": "index.js",
   "dependencies": {
-    "aws-sdk": "^2.606.0",
-    "uuid": "^3.2.1",
-    "debug": ">=4.1.1"
+    "aws-sdk": "",
+    "uuid": "^8.3.2",
+    "debug": ">=4.3.4"
   },
   "scripts": {
     "setup": "./node_modules/.bin/node-lambda setup",