Update deps, drop support for 0.12 (#258)

matthewloring · web-flow · commit 8a119de64fc9 · 2017-05-15T17:56:45.000-07:00
This change updates google-cloud/common to a version which is no longer compatable with node v0.12. To upgrade this dependency, we must drop support for 0.12 as well. Additionally, we prune out some code paths that were only executed on node versions less than 1.6. PR-URL: #258
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: node_js
 dist: trusty
 node_js:
-- '0.12'
 - '4'
 - '6'
 - '7'
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ This module provides Stackdriver Debugger support for Node.js applications. [Sta
 [![Cloud Debugger Intro](http://img.youtube.com/vi/tyHcK_kAOpw/0.jpg)](https://www.youtube.com/watch?v=tyHcK_kAOpw)
 
 ## Prerequisites
-* Stackdriver Debugger is comptible with Node.js version 0.12 or greater. Node.js v5+ is recommended.
+* Stackdriver Debugger is comptible with Node.js version 4 or greater. Node.js v5+ is recommended.
 
 ## Quick Start
 ```shell
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
   ],
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=0.12"
+    "node": ">=4"
   },
   "devDependencies": {
     "changelog-maker": "^2.2.2",
@@ -28,17 +28,18 @@
     "istanbul": "^0.4.1",
     "jshint": "^2.7.0",
     "mocha": "^3.0.0",
-    "nock": "^9.0.0"
+    "nock": "^9.0.0",
+    "proxyquire": "^1.7.11",
+    "request": "^2.81.0"
   },
   "dependencies": {
-    "@google-cloud/common": "^0.12.0",
-    "acorn": "^4.0.3",
+    "@google-cloud/common": "^0.13.3",
+    "acorn": "^5.0.3",
     "async": "^2.1.2",
     "coffee-script": "^1.9.3",
     "findit2": "^2.2.3",
-    "gcp-metadata": "^0.1.0",
+    "gcp-metadata": "^0.2.0",
     "lodash": "^4.12.0",
-    "request": "^2.61.0",
     "semver": "^5.1.0",
     "source-map": "^0.5.1",
     "split": "^1.0.0"
diff --git a/src/agent/debuglet.js b/src/agent/debuglet.js
@@ -215,7 +215,7 @@ Debuglet.prototype.start = function() {
               // This is ignorable.
             }
 
-            if (semver.satisfies(process.version, '5.2 || <0.12')) {
+            if (semver.satisfies(process.version, '5.2 || <4')) {
               // Using an unsupported version. We report an error message about the
               // Node.js version, but we keep on running. The idea is that the user
               // may miss the error message on the console. This way we can report the
@@ -550,7 +550,7 @@ Debuglet.prototype.addBreakpoint_ = function(breakpoint, cb) {
     return;
   }
 
-  if (semver.satisfies(process.version, '5.2 || <0.12')) {
+  if (semver.satisfies(process.version, '5.2 || <4')) {
     var message = NODE_VERSION_MESSAGE;
     that.logger_.error(message);
     breakpoint.status = new StatusMessage(StatusMessage.UNSPECIFIED,
diff --git a/src/agent/state.js b/src/agent/state.js
@@ -23,12 +23,9 @@ module.exports = {
 
 var ScopeType = require('vm').runInDebugContext('ScopeType');
 var assert = require('assert');
-var semver = require('semver');
 var util = require('util');
 var lodash = require('lodash');
-var find = lodash.find;
 var transform = lodash.transform;
-var remove = lodash.remove;
 var flatten = lodash.flatten;
 var isEmpty = lodash.isEmpty;
 
@@ -302,23 +299,13 @@ StateResolver.prototype.resolveFrame_ = function(frame, underFrameCap) {
       varTableIndex: ARG_LOCAL_LIMIT_MESSAGE_INDEX
     });
   } else {
-    args = this.extractArgumentsList_(frame);
+    // We will use the values aggregated from the ScopeMirror traversal stored
+    // in locals which will include any applicable arguments from the invocation.
+    args = [];
     locals = this.resolveLocalsList_(frame, args);
     if (isEmpty(locals)) {
       locals = [];
     }
-    if (semver.satisfies(process.version, '<1.6')) {
-      // If the node version is over 1.6 we do not read the frame arguments since
-      // the values produced by the frame for the arguments may contain inaccurate
-      // values. If the version is lower than 1.6, though, the frame's argument
-      // list can be relied upon to produce accurate values for arguments.
-      args = !isEmpty(args) ? this.resolveArgumentList_(args) : [];
-    } else {
-      // Otherwise, if the version is 1.6 or higher than we will use the values
-      // aggregated from the ScopeMirror traversal stored in locals which will
-      // include any applicable arguments from the invocation.
-      args = [];
-    }
   }
   return {
     function: this.resolveFunctionName_(frame.func()),
@@ -355,13 +342,6 @@ StateResolver.prototype.extractArgumentsList_ = function (frame) {
   return args;
 };
 
-StateResolver.prototype.resolveArgumentList_ = function(args) {
-  var resolveVariable = this.resolveVariable_.bind(this);
-  return args.map(function (arg){
-    return resolveVariable(arg.name, arg.value);
-  });
-};
-
 /**
  * Iterates and returns variable information for all scopes (excluding global)
  * in a given frame. FrameMirrors should return their scope object list with 
@@ -396,34 +376,7 @@ StateResolver.prototype.resolveLocalsList_ = function (frame, args) {
         scope.details().object(),
         function (locals, value, name) {
           var trg = makeMirror(value);
-          var argMatch = find(args, {name: name});
-          if (argMatch && (semver.satisfies(process.version, '<1.6'))) {
-            // If the version is lower than 1.6 we will use the frame's argument
-            // list to source argument values, yet the ScopeMirror traversal for
-            // these Node versions will also return the arguments. Therefore, on
-            // these versions, compare the value sourced as the argument from 
-            // the FrameMirror to the argument found in the ScopeMirror locals 
-            // list with the same name and attempt to determine whether or not 
-            // they have the same value. If each of these items has the same
-            // name and value we may assume that the ScopeMirror variable 
-            // representation is merely a duplicate of the FrameMirror's 
-            // variable representation. Otherwise, the variable may have been
-            // redeclared or reassigned in the function and is therefore a local
-            // triggering removal from the arguments list and insertion into the
-            // locals list.
-            if (argMatch.value.value() === trg.value()) {
-              // Argument ref is the same ref as the local ref - this is an
-              // argument do not push this into the locals list
-              return locals;
-            }
-            // There is another local/scope var with the same name and it is not 
-            // the argument so this will take precedence. Remove the same-named 
-            // entry from the arguments list and push the local value onto the
-            // locals list.
-            remove(args, {name: name});
-            usedNames[name] = true;
-            locals.push(self.resolveVariable_(name, trg));
-          } else if (!usedNames[name]) {
+          if (!usedNames[name]) {
             // It's a valid variable that belongs in the locals list and wasn't
             // discovered at a lower-scope
             usedNames[name] = true;
@@ -507,55 +460,9 @@ StateResolver.prototype.storeObjectToVariableTable_ = function(obj) {
 
 /**
  * Responsible for recursively resolving the properties on a
- * provided object mirror. Due to a bug in early node versions,
- * we maintain two implementations using the fast approach
- * for supported node versions.
- *
- * See https://github.com/iojs/io.js/issues/1190.
+ * provided object mirror.
  */
 StateResolver.prototype.resolveMirror_ = function(mirror) {
-  if (semver.satisfies(process.version, '<1.6')) {
-    return this.resolveMirrorSlow_(mirror);
-  } else {
-    return this.resolveMirrorFast_(mirror);
-  }
-};
-
-// A slower implementation of resolveMirror_ which is safe for all node versions
-StateResolver.prototype.resolveMirrorSlow_ = function(mirror) {
-  // Instead, let's use Object.keys. This will only get the enumerable
-  // properties. The other alternative would be Object.getOwnPropertyNames, but
-  // I'm going with the former as that's what util.inspect does.
-  var that = this;
-
-  var keys = Object.keys(mirror.value());
-  var maxProps = that.config_.capture.maxProperties;
-  var truncate = maxProps && keys.length > maxProps;
-  if (truncate) {
-    keys = keys.slice(0, maxProps);
-  }
-  var members = keys.map(function(prop) {
-    return that.resolveMirrorProperty_(mirror.property(prop));
-  });
-  if (truncate) {
-    members.push({name: 'Only first `config.capture.maxProperties=' +
-                        this.config_.capture.maxProperties +
-                        '` properties were captured'});
-  }
-
-  var mirrorVal = mirror.value();
-  var len = mirrorVal && mirrorVal.length;
-  return {
-    value: mirror.toText() +
-      ((typeof len === 'undefined') ? '' : ' of length ' + len),
-    members: members
-  };
-};
-
-// A faster implementation of resolveMirror_ which segfaults in node <1.6
-//
-// See https://github.com/iojs/io.js/issues/1190.
-StateResolver.prototype.resolveMirrorFast_ = function(mirror) {
   var properties = mirror.properties();
   var maxProps = this.config_.capture.maxProperties;
   var truncate = maxProps && properties.length > maxProps;
diff --git a/test/test-debuglet.js b/test/test-debuglet.js
@@ -15,6 +15,11 @@
  */
 'use strict';
 
+var proxyquire = require('proxyquire');
+proxyquire('gcp-metadata', {
+  'retry-request': require('request')
+});
+
 var _ = require('lodash');
 var assert = require('assert');
 var DEFAULT_CONFIG = require('../src/agent/config.js');
@@ -78,15 +83,9 @@ describe('Debuglet', function() {
       var debug = require('../src/debug.js')();
       var debuglet = new Debuglet(debug, defaultConfig);
 
-      // The following mock is neccessary for the case when the test is running
-      // on GCP. In that case we will get the projectId from the metadata
-      // service.
-      var scope = nocks.projectId(404);
-
       debuglet.once('initError', function(err) {
         assert.ok(err);
         // no need to stop the debuggee.
-        scope.done();
         done();
       });
       debuglet.once('started', function() { assert.fail(); });
@@ -98,14 +97,8 @@ describe('Debuglet', function() {
       var debug = require('../src/debug.js')();
       var debuglet = new Debuglet(debug, defaultConfig);
 
-      // The following mock is neccessary for the case when the test is running
-      // on GCP. In that case we will get the projectId from the metadata
-      // service.
-      var scope = nocks.projectId(404);
-
       debuglet.once('started', function() { assert.fail(); });
       debuglet.once('initError', function() {
-        scope.done();
         done();
       });
       debuglet.start();
diff --git a/test/test-duplicate-nested-expressions.js b/test/test-duplicate-nested-expressions.js
@@ -31,7 +31,6 @@ var common = require('@google-cloud/common');
 var defaultConfig = require('../src/agent/config.js');
 var SourceMapper = require('../src/agent/sourcemapper.js');
 var scanner = require('../src/agent/scanner.js');
-var semver = require('semver');
 
 function stateIsClean(api) {
   assert.equal(api.numBreakpoints_(), 0,
@@ -83,21 +82,12 @@ describe(__filename, function() {
         var frame = brk.stackFrames[0];
         var args = frame.arguments;
         var locals = frame.locals;
-        if (semver.satisfies(process.version, '<1.6')) {
-            assert.equal(args.length, 1, 'There should be one argument');
-            assert.deepEqual(
-              args[0],
-              {name: 'a', value: '11'}
-   	   	    );
-            assert.equal(locals.length, 0);
-        } else {
-          assert.equal(args.length, 0, 'There should be zero arguments');
-          assert.equal(locals.length, 1, 'There should be one locals');
-          assert.deepEqual(
-            locals[0],
-            {name: 'a', value: 'test'}
-   	      );
-        }
+        assert.equal(args.length, 0, 'There should be zero arguments');
+        assert.equal(locals.length, 1, 'There should be one locals');
+        assert.deepEqual(
+          locals[0],
+          {name: 'a', value: 'test'}
+ 	      );
         api.clear(brk);
         done();
       });
@@ -117,21 +107,12 @@ describe(__filename, function() {
         var frame = brk.stackFrames[0];
         var args = frame.arguments;
         var locals = frame.locals;
-        if (semver.satisfies(process.version, '<1.6')) {
-            assert.equal(args.length, 1, 'There should be one argument');
-            assert.deepEqual(
-              args[0],
-              {name: 'a', value: '11'}
-   	   	    );
-            assert.equal(locals.length, 0);
-        } else {
-          assert.equal(args.length, 0, 'There should be zero arguments');
-          assert.equal(locals.length, 1, 'There should be one local');
-          assert.deepEqual(
-            locals[0],
-            {name: 'a', value: '10'}
-          );
-        }
+        assert.equal(args.length, 0, 'There should be zero arguments');
+        assert.equal(locals.length, 1, 'There should be one local');
+        assert.deepEqual(
+          locals[0],
+          {name: 'a', value: '10'}
+        );
         api.clear(brk);
         done();
       });
@@ -151,21 +132,12 @@ describe(__filename, function() {
         var frame = brk.stackFrames[0];
         var args = frame.arguments;
         var locals = frame.locals;
-        if (semver.satisfies(process.version, '<1.6')) {
-            assert.equal(args.length, 1, 'There should be one argument');
-            assert.deepEqual(
-              args[0],
-              {name: 'a', value: '11'}
-   	   	    );
-            assert.equal(locals.length, 0);
-        } else {
-          assert.equal(args.length, 0, 'There should be zero arguments');
-          assert.equal(locals.length, 1, 'There should be one local');
-          assert.deepEqual(
-            locals[0],
-            {name: 'a', value: '11'}
-          );
-        }
+        assert.equal(args.length, 0, 'There should be zero arguments');
+        assert.equal(locals.length, 1, 'There should be one local');
+        assert.deepEqual(
+          locals[0],
+          {name: 'a', value: '11'}
+        );
         api.clear(brk);
         done();
       });
@@ -178,15 +150,6 @@ describe(__filename, function() {
       id: 'fake-id-1234',
       location: { path: 'test-duplicate-nested-expressions.js', line: 8 }
     };
-    if (semver.satisfies(process.version, '<1.6')) {
-      // this IIFE test does not work on 0.12. Specifically the IIFE never
-      // executes and, therefore, the breakpoint is never hit. This will require
-      // further investigation as to what is causing the IIFE not to execute.a
-      // @TODO cristiancavalli - investigate why this IIFE does not execute
-      console.log('Skipping IIFE test due to Node.JS version requirements');
-      this.skip();
-      return;
-    }
     api.set(brk, function(err) {
       assert.ifError(err);
       api.wait(brk, function(err) {
diff --git a/test/test-fat-arrow.js b/test/test-fat-arrow.js
@@ -22,7 +22,6 @@ var common = require('@google-cloud/common');
 var defaultConfig = require('../src/agent/config.js');
 var SourceMapper = require('../src/agent/sourcemapper.js');
 var scanner = require('../src/agent/scanner.js');
-var semver = require('semver');
 
 process.env.GCLOUD_PROJECT = 0;
 
@@ -43,13 +42,6 @@ describe(__filename, function() {
   var api = null;
   var foo;
   before(function () {
-    if (semver.satisfies(process.version, '<4.0')) {
-      // Fat arrow syntax is not recognized by these node versions - skip tests.
-      console.log('Skipping fat-arrow syntax due to Node.JS version being ' +
-        'lower than requirements');
-      this.skip();
-      return;
-    }
     foo = require('./fixtures/fat-arrow.js');
   });
   beforeEach(function(done) {
diff --git a/test/test-this-context.js b/test/test-this-context.js
diff --git a/test/test-try-catch.js b/test/test-try-catch.js
diff --git a/test/test-v8debugapi.js b/test/test-v8debugapi.js
diff --git a/yarn.lock b/yarn.lock
