PubSub version upgrade and changed subscription retry count to 5 (#475)

* updates * Update pubSubUtil.js * package updates * scope update * Update dataManager.js * Update dataManager.js * Update dataManager.js
GoogleCloudPlatform · Apr 13, 2021 · 102fd13 · 102fd13
1 parent c2ddcb3
commit 102fd13
Show file tree

Hide file tree

Showing 7 changed files with 511 additions and 1,179 deletions.
diff --git a/api/v1alpha/package-lock.json b/api/v1alpha/package-lock.json
diff --git a/api/v1alpha/src/admin/dataManager.js b/api/v1alpha/src/admin/dataManager.js
@@ -246,8 +246,7 @@ async function startPubSubListener() {
     await retry(async bail => {
         await initializePubSubListener();
     }, {
-        // retries: 5,
-        forever: true,
+        retries: 5,
         minTimeout: 30000,
         maxTimeout: 60000,
         onRetry: logRetry
@@ -362,10 +361,10 @@ async function initializePubSubListener() {
             subscription.on('message', messageHandler);
             subscription.on('error', errorHandler);
             subscription.on('close', () => { console.error('Subscription closed') });
-            subscription.detached((cb) => {
-                console.warn('Subscription detached');
-                if (cb) {
-                    console.error(cb);
+            subscription.detached((err, exists) => {
+                console.log(`Is subscription detached: ${exists}`);
+                if (err) {
+                    console.error(err);
                 }
             });
         } catch (err) {

diff --git a/api/v1alpha/src/datasets/dataManager.js b/api/v1alpha/src/datasets/dataManager.js
@@ -62,7 +62,7 @@ async function listDatasets(projectId, includeAll) {
         console.warn(err);
         return { success: false, errors: [err.message] };
     });
-    if (datasets === undefined) {
+    if (!datasets || datasets === undefined) {
         const message = `Datasets do not exist with labelKey: '${labelKey}'`;
         return { success: false, code: 400, errors: [message] };
     }

diff --git a/shared/bigqueryUtil.js b/shared/bigqueryUtil.js
@@ -27,7 +27,9 @@ const underscore = require("underscore");
 class BigQueryUtil {
     constructor(projectId) {
         this.projectId = projectId;
-        const options = {};
+        const options = {
+            scopes:['https://www.googleapis.com/auth/cloud-platform']
+        };
         if (projectId) {
             options.projectId = projectId;
         }