merge tkexp

JaneliaSciComp · Oct 21, 2020 · 5047dfe · 5047dfe
1 parent cf64f20
commit 5047dfe
Show file tree

Hide file tree

Showing 4 changed files with 103 additions and 22 deletions.
diff --git a/config.yml b/config.yml
@@ -5,7 +5,7 @@ config:
   libraryBucket: janelia-flylight-color-depth-${env:IMAGE_DATA_LEVEL, 'dev'}
   libraryThumbnailsBucket: janelia-flylight-color-depth-thumbnails-${env:IMAGE_DATA_LEVEL, 'dev'}
   alignmentTemplatesBucket: janelia-flylight-color-depth-${env:IMAGE_DATA_LEVEL, 'dev'}
-  searchBucket: janelia-neuronbridge-masks-tkdev
+  searchBucket: janelia-neuronbridge-searches-${env:SEARCH_DATA_LEVEL, 'dev'}
   perDaySearchLimits: ${env:PER_DAY_SEARCH_LIMITS, 100}
   concurrentSearchLimits: ${env:CONCURRENT_SEARCH_LIMITS, 10}
   tracing: true

diff --git a/search/package-lock.json b/search/package-lock.json
diff --git a/search/package.json b/search/package.json
@@ -11,7 +11,7 @@
     "aws-appsync": "^4.0.0",
     "aws-sdk": "^2.720.0",
     "aws-xray-sdk": "^3.0.1",
-    "geotiff": "^1.0.0-beta.13",
+    "geotiff": "^1.0.0-beta.14",
     "graphql": "^15.3.0",
     "graphql-tag": "^2.10.4",
     "isomorphic-fetch": "^2.2.1",

diff --git a/search/src/main/nodejs/utils.js b/search/src/main/nodejs/utils.js
@@ -30,7 +30,7 @@ const getAllKeys = async params => {
 };
 
 // Retrieve a file from S3
-exports.getObjectDataArray = async (bucket, key, defaultValue) => {
+const getObjectDataArray = async (bucket, key, defaultValue) => {
     try {
         if (DEBUG)
             console.log(`Getting object from ${bucket}:${key}`);
@@ -67,9 +67,7 @@ const getObject = async (bucket, key, defaultValue) => {
     }
 };
 
-exports.getObject = getObject;
-
-exports.sleep = async (ms) => {
+const sleep = async (ms) => {
     return new Promise(resolve => setTimeout(resolve, ms));
 }
 
@@ -335,6 +333,8 @@ const verifyKey = async (Bucket, Key) => {
 
 module.exports = {
     DEBUG,
+    sleep: sleep,
+    getObjectDataArray: getObjectDataArray,
     getAllKeys: getAllKeys,
     getObject: getObject,
     getObjectWithRetry: getObjectWithRetry,