Merge pull request #2 from mmz-srf/fix/PLATFORm-3053-fix-async-issues

PLATFORM-3053 Fix function async issues
mmz-srf · Sep 25, 2023 · 1ab9c05 · 1ab9c05
2 parents 643d87e + db643ef
commit 1ab9c05
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 26 deletions.
diff --git a/lib/ag-handler.js b/lib/ag-handler.js
@@ -2,6 +2,7 @@ const assert = require('assert');
 const actions = require('./actions');
 const utils = require('./utils');
 const pkg = require('../package.json');
+const CONFIG = require('./config').CONFIG;
 
 /**
  * Handles HTTP result callback
@@ -15,6 +16,13 @@ exports.handler = async (event, context, callback) => {
   try {
     assert.ok(event.body !== undefined, "event had no body");
 
+    await utils.getScaniiAPISecrets()
+      .then(function (secretString) {
+        secrets = JSON.parse(secretString)
+        CONFIG.KEY = secrets['API_KEY'];
+        CONFIG.SECRET = secrets['API_SECRET'];
+      });
+
     const result = JSON.parse(event.body);
 
     // callback sanity checks

diff --git a/lib/config.js b/lib/config.js
@@ -5,24 +5,6 @@ if (process.env.AWS_SAM_LOCAL !== undefined) {
   console.log(process.env);
 }
 
-function getScaniiAPISecrets() {
-  const headers = {"X-Aws-Parameters-Secrets-Token": process.env.AWS_SESSION_TOKEN}
-  const scaniiAPISecrets = process.env.SCANII_API_SECRETS_NAME;
-  return fetch(`http://localhost:2773/secretsmanager/get?secretId=${scaniiAPISecrets}`, {
-    method: 'GET',
-    headers: headers,
-  })
-    .then(function (response) {
-      if (!response.ok) {
-        throw new Error('API request failed with status: ' + response.status);
-      }
-      return response.json();
-    })
-    .then(function (data) {
-      return data.SecretString;
-    })
-}
-
 function defaults() {
   CONFIG.KEY = null;
   CONFIG.SECRET = null;
@@ -61,13 +43,5 @@ function defaults() {
 }
 
 defaults();
-
-var secrets = getScaniiAPISecrets()
-  .then(function (secretString) {
-    secrets = JSON.parse(secretString)
-    CONFIG.KEY = secrets['API_KEY'];
-    CONFIG.SECRET = secrets['API_SECRET'];
-  });
-
 exports.defaults = defaults;
 exports.CONFIG = CONFIG;
diff --git a/lib/s3-handler.js b/lib/s3-handler.js
@@ -18,6 +18,13 @@ exports.handler = async (event, context, callback) => {
   try {
     console.log(`handling s3 event using ${pkg.name}/v${pkg.version}`);
 
+    await utils.getScaniiAPISecrets()
+      .then(function (secretString) {
+        secrets = JSON.parse(secretString)
+        CONFIG.KEY = secrets['API_KEY'];
+        CONFIG.SECRET = secrets['API_SECRET'];
+      });
+
     // pre-flight checks:
     assert.ok(CONFIG.CALLBACK_URL !== null, "api callback url cannot be null");
     assert.ok(CONFIG.KEY !== null, "api key cannot be null");

diff --git a/lib/utils.js b/lib/utils.js
@@ -37,7 +37,26 @@ exports.formatTagValue = (value) => {
   return formattedValue;
 };
 
+const getScaniiAPISecrets = function() {
+  const headers = {"X-Aws-Parameters-Secrets-Token": process.env.AWS_SESSION_TOKEN}
+  const scaniiAPISecrets = process.env.SCANII_API_SECRETS_NAME;
+  return fetch(`http://localhost:2773/secretsmanager/get?secretId=${scaniiAPISecrets}`, {
+    method: 'GET',
+    headers: headers,
+  })
+    .then(function (response) {
+      if (!response.ok) {
+        throw new Error('API request failed with status: ' + response.status);
+      }
+      return response.json();
+    })
+    .then(function (data) {
+      return data.SecretString;
+    })
+};
+
 exports.internalId = internalId;
 exports.generateSignature = generateSignature;
+exports.getScaniiAPISecrets = getScaniiAPISecrets;