Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
5 changes: 3 additions & 2 deletions lib/common/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ var request = require('request').defaults({
});
var retryRequest = require('retry-request');
var through = require('through2');
var uniq = require('array-uniq');

/** @const {object} gcloud-node's package.json file. */
var PKG = require('../../package.json');
Expand Down Expand Up @@ -81,13 +82,13 @@ var ApiError = createErrorClass('ApiError', function(errorBody) {

if (errorBody.errors && errorBody.errors.length === 1) {
messages.push(errorBody.errors[0].message);
} else if (errorBody.response.body) {
} else if (errorBody.response && errorBody.response.body) {

This comment was marked as spam.

This comment was marked as spam.

messages.push(errorBody.response.body.toString());
} else if (!errorBody.message) {
messages.push('Error during request.');
}

this.message = messages.join(' - ');
this.message = uniq(messages).join(' - ');
});

/**
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
],
"dependencies": {
"JSONStream": "^1.0.7",
"array-uniq": "^1.0.2",
"arrify": "^1.0.0",
"async": "^1.4.2",
"concat-stream": "^1.5.0",
Expand Down
16 changes: 16 additions & 0 deletions test/common/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,22 @@ describe('common/util', function() {

assert.strictEqual(apiError.message, expectedErrorMessage);
});

it('should filter out duplicate errors', function() {
var expectedErrorMessage = 'Error during request.';

var error = {
code: 100,
message: expectedErrorMessage,
response: {
body: expectedErrorMessage
}
};

var apiError = new util.ApiError(error);

assert.strictEqual(apiError.message, expectedErrorMessage);
});
});

describe('extendGlobalConfig', function() {
Expand Down