Revert, try setting LD_LIBRARY_PATH

dockstore · Aug 17, 2023 · 3877484 · 3877484
1 parent 314478e
commit 3877484
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 26 deletions.
diff --git a/checkUrlExists/lambda/index.js b/checkUrlExists/lambda/index.js
@@ -1,8 +1,7 @@
 const fs = require("fs");
 const tls = require("tls");
-const process = require("process");
 
-// const { curly } = require("node-libcurl");
+const { curly } = require("node-libcurl");
 
 // important steps to get validation of https (as opposed to http) urls
 // Get root certificates so https will work
@@ -35,30 +34,27 @@ fs.writeFileSync(certFilePath, tlsData);
  *
  */
 exports.lambdaHandler = async function (event) {
-  console.log(process.env.PATH);
-  console.log(process.env.LD_LIBRARY_PATH);
   const url = event.queryStringParameters.url;
-  console.log(url);
-  return returnResponse(false);
+  return checkUrl(url);
 };
 
-// async function checkUrl(url) {
-//   return run(url)
-//     .then(() => {
-//       return returnResponse(true);
-//     })
-//     .catch((error) => {
-//       console.error(`Something went wrong`, { error });
-//       return returnResponse(false);
-//     });
-// }
+async function checkUrl(url) {
+  return run(url)
+    .then(() => {
+      return returnResponse(true);
+    })
+    .catch((error) => {
+      console.error(`Something went wrong`, { error });
+      return returnResponse(false);
+    });
+}
 
-// async function run(url) {
-//   const curlOpts = {
-//     caInfo: certFilePath,
-//   };
-//   return curly.head(url, curlOpts);
-// }
+async function run(url) {
+  const curlOpts = {
+    caInfo: certFilePath,
+  };
+  return curly.head(url, curlOpts);
+}
 
 function returnResponse(fileFound) {
   const response = {

diff --git a/checkUrlExists/lambda/package.json b/checkUrlExists/lambda/package.json
@@ -7,6 +7,7 @@
   "author": "Dockstore",
   "license": "MIT",
   "dependencies": {
+    "node-libcurl": "^3.0.0"
   },
   "scripts": {
     "test": "jasmine"

diff --git a/checkUrlExists/lambda/tests/unit/test-handler.js b/checkUrlExists/lambda/tests/unit/test-handler.js
@@ -9,11 +9,11 @@ describe("Tests index", function () {
   });
   it("verifies successful response from http", async () => {
     const url = "http://docs.aws.amazon.com/lambda/latest/dg/welcome.html";
-    await setupTest(url, false);
+    await setupTest(url, true);
   });
   it("verifies successful response from https", async () => {
     const url = "https://www.google.ca";
-    await setupTest(url, false);
+    await setupTest(url, true);
   });
   it("verifies unsuccessful response", async () => {
     const url =
@@ -23,12 +23,12 @@ describe("Tests index", function () {
   it("verifies successful response for large file", async () => {
     const url =
       "https://dcc.icgc.org/api/v1/download?fn=/PCAWG/reference_data/data_for_testing/HCC1143_ds/HCC1143.bam";
-    await setupTest(url, false);
+    await setupTest(url, true);
   });
   it("verifies successful response from ftp file", async () => {
     const url =
       "ftp://ftp.ensembl.org/pub/release-100/tsv/homo_sapiens/Homo_sapiens.GRCh38.100.entrez.tsv.gz";
-    await setupTest(url, false);
+    await setupTest(url, true);
   });
   it("verifies unsuccessful response from ftp file", async () => {
     const url =

diff --git a/checkUrlExists/template.yaml b/checkUrlExists/template.yaml
@@ -25,6 +25,8 @@ Resources:
       CodeUri: lambda/
       Handler: index.lambdaHandler
       Runtime: nodejs18.x
+      Environment:
+        LD_LIBRARY_PATH: /opt/lib64:/var/lang/lib:/lib64:/usr/lib64:/var/runtime:/var/runtime/lib:/var/task:/var/task/lib:/opt/lib
       Layers: !Ref LayerVersion
       Events:
         Lambda: