From c8ddbd6f6d2f9fb42875c56036a0141b530b8931 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Thu, 8 Nov 2018 16:27:14 -0800 Subject: [PATCH] fix(deps): upgrade to the latest gce-images --- .eslintignore | 4 +--- package.json | 5 ++--- samples/package.json | 1 + samples/startup-script/package.json | 3 +++ .../startup-script/system-test/.eslintrc.yml | 4 ---- samples/system-test/.eslintrc.yml | 4 ---- samples/test/.eslintrc.yml | 6 +----- src/zone.js | 4 ++-- test/zone.js | 19 +++---------------- 9 files changed, 13 insertions(+), 37 deletions(-) diff --git a/.eslintignore b/.eslintignore index f08b0fd1..25439044 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,4 +1,2 @@ -node_modules/* -samples/node_modules/* -src/**/doc/* +**/node_modules build/ diff --git a/package.json b/package.json index e2e6aa0e..fee809bc 100644 --- a/package.json +++ b/package.json @@ -54,8 +54,7 @@ "cover": "nyc --reporter=lcov mocha test/*.js && nyc report", "docs": "jsdoc -c .jsdoc.js", "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json", - "lint": "eslint src/ samples/ system-test/ test/", - "prettier": "prettier --write src/*.js src/*/*.js samples/*.js samples/*/*.js test/*.js test/*/*.js system-test/*.js system-test/*/*.js", + "lint": "eslint '**/*.js'", "samples-test": "cd samples/ && npm link ../ && cd startup-script && npm link ../../ && cd ../ && npm test && cd ../", "system-test": "mocha system-test/*.js --timeout 600000", "test-no-cover": "mocha test/*.js", @@ -71,7 +70,7 @@ "async": "^2.6.1", "create-error-class": "^3.0.2", "extend": "^3.0.1", - "gce-images": "^0.3.3", + "gce-images": "^1.0.0", "is": "^3.2.1", "string-format-obj": "^1.1.1", "teeny-request": "^3.10.0" diff --git a/samples/package.json b/samples/package.json index c3901c25..b3aef28a 100644 --- a/samples/package.json +++ b/samples/package.json @@ -5,6 +5,7 @@ "license": "Apache-2.0", "author": "Google Inc.", "repository": "googleapis/nodejs-compute", + "files": [ "*.js" ], "engines": { "node": ">=8" }, diff --git a/samples/startup-script/package.json b/samples/startup-script/package.json index 6ba8aace..20be3a13 100644 --- a/samples/startup-script/package.json +++ b/samples/startup-script/package.json @@ -3,6 +3,9 @@ "version": "1.0.0", "description": "Start a Google Compute Engine and run the startup script.", "main": "index.js", + "files": [ + "*.js" + ], "dependencies": { "@google-cloud/compute": "0.10.0", "node-fetch": "^2.2.0" diff --git a/samples/startup-script/system-test/.eslintrc.yml b/samples/startup-script/system-test/.eslintrc.yml index 75216436..6db2a46c 100644 --- a/samples/startup-script/system-test/.eslintrc.yml +++ b/samples/startup-script/system-test/.eslintrc.yml @@ -1,7 +1,3 @@ --- env: mocha: true -rules: - node/no-unpublished-require: off - node/no-unsupported-features: off - no-empty: off diff --git a/samples/system-test/.eslintrc.yml b/samples/system-test/.eslintrc.yml index 75216436..6db2a46c 100644 --- a/samples/system-test/.eslintrc.yml +++ b/samples/system-test/.eslintrc.yml @@ -1,7 +1,3 @@ --- env: mocha: true -rules: - node/no-unpublished-require: off - node/no-unsupported-features: off - no-empty: off diff --git a/samples/test/.eslintrc.yml b/samples/test/.eslintrc.yml index 2385deb8..6db2a46c 100644 --- a/samples/test/.eslintrc.yml +++ b/samples/test/.eslintrc.yml @@ -1,7 +1,3 @@ ---- +--- env: mocha: true -rules: - node/no-unpublished-require: off - node/no-unsupported-features: off - no-empty: off diff --git a/src/zone.js b/src/zone.js index 53f4cf36..0c4f0ab1 100644 --- a/src/zone.js +++ b/src/zone.js @@ -21,7 +21,7 @@ const async = require('async'); const common = require('@google-cloud/common'); const extend = require('extend'); const format = require('string-format-obj'); -const gceImages = require('gce-images'); +const {GCEImages} = require('gce-images'); const is = require('is'); const {promisifyAll} = require('@google-cloud/promisify'); const {paginator} = require('@google-cloud/paginator'); @@ -151,7 +151,7 @@ class Zone extends common.ServiceObject { * @type {string} */ this.name = name; - this.gceImages = gceImages({ + this.gceImages = new GCEImages({ authClient: compute.authClient, }); } diff --git a/test/zone.js b/test/zone.js index 3efb27e0..0b71c380 100644 --- a/test/zone.js +++ b/test/zone.js @@ -19,7 +19,7 @@ const arrify = require('arrify'); const assert = require('assert'); const extend = require('extend'); -const gceImages = require('gce-images'); +const {GCEImages} = require('gce-images'); const proxyquire = require('proxyquire'); const {ServiceObject, util} = require('@google-cloud/common'); const promisify = require('@google-cloud/promisify'); @@ -43,11 +43,6 @@ const fakePromisify = extend({}, promisify, { }, }); -let gceImagesOverride; -function fakeGceImages() { - return (gceImagesOverride || gceImages).apply(null, arguments); -} - function FakeAutoscaler() { this.calledWith_ = [].slice.call(arguments); } @@ -122,7 +117,6 @@ describe('Zone', function() { before(function() { Zone = proxyquire('../src/zone.js', { - 'gce-images': fakeGceImages, '@google-cloud/common': { ServiceObject: FakeServiceObject, }, @@ -139,7 +133,6 @@ describe('Zone', function() { beforeEach(function() { formatPortsOverride = null; - gceImagesOverride = null; zone = new Zone(COMPUTE, ZONE_NAME); }); @@ -170,15 +163,9 @@ describe('Zone', function() { }); it('should create a gceImages instance', function() { - const gceVal = 'ok'; - - gceImagesOverride = function(authConfig) { - assert.strictEqual(authConfig.authClient, COMPUTE.authClient); - return gceVal; - }; - const newZone = new Zone(COMPUTE, ZONE_NAME); - assert.strictEqual(newZone.gceImages, gceVal); + assert(newZone.gceImages instanceof GCEImages); + assert.strictEqual(newZone.gceImages._auth, COMPUTE.authClient); }); it('should inherit from ServiceObject', function() {