Skip to content
This repository has been archived by the owner on Jul 13, 2023. It is now read-only.

fix(deps): upgrade to the latest gce-images #201

Merged
merged 2 commits into from
Nov 9, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
node_modules/*
samples/node_modules/*
src/**/doc/*
**/node_modules
build/
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down
1 change: 1 addition & 0 deletions samples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"license": "Apache-2.0",
"author": "Google Inc.",
"repository": "googleapis/nodejs-compute",
"files": [ "*.js" ],
"engines": {
"node": ">=8"
},
Expand Down
3 changes: 3 additions & 0 deletions samples/startup-script/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 0 additions & 4 deletions samples/startup-script/system-test/.eslintrc.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
---
env:
mocha: true
rules:
node/no-unpublished-require: off
node/no-unsupported-features: off
no-empty: off
4 changes: 0 additions & 4 deletions samples/system-test/.eslintrc.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
---
env:
mocha: true
rules:
node/no-unpublished-require: off
node/no-unsupported-features: off
no-empty: off
6 changes: 1 addition & 5 deletions samples/test/.eslintrc.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
---
---
env:
mocha: true
rules:
node/no-unpublished-require: off
node/no-unsupported-features: off
no-empty: off
4 changes: 2 additions & 2 deletions src/zone.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -151,7 +151,7 @@ class Zone extends common.ServiceObject {
* @type {string}
*/
this.name = name;
this.gceImages = gceImages({
this.gceImages = new GCEImages({
authClient: compute.authClient,
});
}
Expand Down
19 changes: 3 additions & 16 deletions test/zone.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -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);
}
Expand Down Expand Up @@ -122,7 +117,6 @@ describe('Zone', function() {

before(function() {
Zone = proxyquire('../src/zone.js', {
'gce-images': fakeGceImages,
'@google-cloud/common': {
ServiceObject: FakeServiceObject,
},
Expand All @@ -139,7 +133,6 @@ describe('Zone', function() {

beforeEach(function() {
formatPortsOverride = null;
gceImagesOverride = null;
zone = new Zone(COMPUTE, ZONE_NAME);
});

Expand Down Expand Up @@ -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() {
Expand Down