Stop filtering functions logs by region, remove dependency on googleapis (#94)

Author: laurenzlong

commands/functions-log.js

@@ -2,8 +2,6 @@
 
 var _ = require('lodash');
 var RSVP = require('rsvp');
-
-var api = require('../lib/api');
 var Command = require('../lib/command');
 var FirebaseError = require('../lib/error');
 var gcp = require('../lib/gcp');
@@ -14,7 +12,7 @@ var scopes = require('../lib/scopes');
 
 var POLL_INTERVAL = 3000; // 3 sec
 
-function _pollLogs(authClient, projectId, filter, pos) {
+function _pollLogs(projectId, filter, pos) {
   return new RSVP.Promise(function(resolve, reject) {
     function poll() {
       var nf = filter;
@@ -25,7 +23,7 @@ function _pollLogs(authClient, projectId, filter, pos) {
         nf += ' insertId>"' + pos.insertId + '" ';
       }
 
-      gcp.cloudlogging.entries(authClient, projectId, nf, 1000, 'asc').then(function(entries) {
+      gcp.cloudlogging.listEntries(projectId, nf, 1000, 'asc').then(function(entries) {
         for (var i = 0; i < _.size(entries); i++) {
           var entry = entries[i];
           logger.info(
@@ -52,8 +50,7 @@ module.exports = new Command('functions:log')
   .option('-f, --follow', 'stream logs from GCF cluster')
   .before(requireAccess, [scopes.OPENID, scopes.CLOUD_PLATFORM])
   .action(function(options) {
-    var filter = 'resource.type="cloud_function" ' +
-                 'labels."cloudfunctions.googleapis.com/region"="us-central1" ';
+    var filter = 'resource.type="cloud_function"';
     if (options.only) {
       var funcNames = options.only.split(',');
       var funcFilters = _.map(funcNames, function(funcName) {
@@ -62,13 +59,8 @@ module.exports = new Command('functions:log')
       filter += funcFilters.join('OR ');
     }
     var projectId = getProjectId(options);
-    var authClient;
-    return api.getAccessToken().then(function(result) {
-      return gcp.createClient(result.access_token);
-    }).then(function(client) {
-      authClient = client;
-      return gcp.cloudlogging.entries(authClient, projectId, filter, options.lines || 35, 'desc');
-    }).then(function(entries) {
+    return gcp.cloudlogging.listEntries(projectId, filter, options.lines || 35, 'desc')
+    .then(function(entries) {
       for (var i = _.size(entries); i-- > 0;) {
         var entry = entries[i];
         logger.info(
@@ -86,7 +78,7 @@ module.exports = new Command('functions:log')
             insertId: lastEntry.insertId
           };
         }
-        return _pollLogs(authClient, projectId, filter, pos);
+        return _pollLogs(projectId, filter, pos);
       } else if (_.isEmpty(entries)) {
         logger.info('No log entries found.');
       }

lib/api.js

@@ -71,6 +71,7 @@ var api = {
   billingOrigin: utils.envOverride('FIREBASE_BILLING_URL', 'https://cloudbilling.googleapis.com'),
   clientId: utils.envOverride('FIREBASE_CLIENT_ID', '563584335869-fgrhgmd47bqnekij5i8b5pr03ho849e6.apps.googleusercontent.com'),
   clientSecret: utils.envOverride('FIREBASE_CLIENT_SECRET', 'j9iVZfS8kkCEFUPaAeJV0sAi'),
+  cloudloggingOrigin: utils.envOverride('FIREBASE_CLOUDLOGGING_URL', 'https://logging.googleapis.com'),
   adminOrigin: utils.envOverride('FIREBASE_ADMIN_URL', 'https://admin.firebase.com'),
   authOrigin: utils.envOverride('FIREBASE_AUTH_URL', 'https://accounts.google.com'),
   consoleOrigin: utils.envOverride('FIREBASE_CONSOLE_URL', 'https://console.firebase.google.com'),

lib/gcp/cloudlogging.js

@@ -1,30 +1,25 @@
 'use strict';
 
 var RSVP = require('rsvp');
-var google = require('googleapis');
-var cloudlogging = google.logging('v2beta1');
-var logger = require('../logger');
+var api = require('../api');
+
+var version = 'v2beta1';
+
+var _listEntries = function(projectId, filter, pageSize, order) {
+  return api.request('POST', '/' + version + '/entries:list', {
+    auth: true,
+    data: {
+      projectIds: [projectId],
+      filter: filter,
+      orderBy: 'timestamp ' + order,
+      pageSize: pageSize
+    },
+    origin: api.cloudloggingOrigin
+  }).then(function(result) {
+    return RSVP.resolve(result.body.entries);
+  });
+};
 
 module.exports = {
-  entries: function(authClient, projectId, filter, pageSize, order) {
-    return new RSVP.Promise(function(resolve, reject) {
-      cloudlogging.entries.list({
-        resource: {
-          projectIds: [projectId],
-          pageSize: pageSize,
-          orderBy: 'timestamp ' + order,
-          filter: filter
-        },
-        auth: authClient
-      }, function(err, result) {
-        if (err) {
-          logger.warn('Failed to list log entries.', {
-            error: err.message
-          });
-          return reject(err);
-        }
-        return resolve(result.entries || {});
-      });
-    });
-  }
+  listEntries: _listEntries
 };

lib/gcp/index.js

@@ -1,18 +1,6 @@
 'use strict';
 
-var RSVP = require('rsvp');
-var google = require('googleapis');
-
 module.exports = {
-  createClient: function(accessToken) {
-    return new RSVP.Promise(function(resolve) {
-      var oauth2Client = new google.auth.OAuth2(/* not needed, since we have access_token */);
-      oauth2Client.setCredentials({
-        access_token: accessToken
-      });
-      return resolve(oauth2Client);
-    });
-  },
   cloudlogging: require('./cloudlogging'),
   cloudfunctions: require('./cloudfunctions'),
   storage: require('./storage'),