Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implemented reading keyFile/credentials field from config object (#315)
Clients may use config.keyFilename and config.credentials to supply a key file or its contents in lieu of GCLOUD_APPLICATION_CREDENTIALS.
- Loading branch information
Showing
5 changed files
with
165 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| /** | ||
| * Copyright 2015 Google Inc. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| 'use strict'; | ||
|
|
||
| var path = require('path'); | ||
| var assert = require('assert'); | ||
| var nock = require('nock'); | ||
| var cls = require('../../lib/cls.js'); | ||
|
|
||
| var queueSpans = function(n, privateAgent) { | ||
| for (var i = 0; i < n; i++) { | ||
| privateAgent.createRootSpanData('name', 1, 0).close(); | ||
| } | ||
| }; | ||
|
|
||
| process.env.GCLOUD_PROJECT = 0; | ||
|
|
||
| describe('test-config-credentials', function() { | ||
| it('should use the keyFilename field of the config object', function(done) { | ||
| var credentials = require('../fixtures/gcloud-credentials.json'); | ||
| var config = { | ||
| bufferSize: 2, | ||
| samplingRate: 0, | ||
| keyFilename: path.join('test', 'fixtures', 'gcloud-credentials.json') | ||
| }; | ||
| var agent = require('../..').start(config); | ||
| nock.disableNetConnect(); | ||
| var scope = nock('https://accounts.google.com') | ||
| .intercept('/o/oauth2/token', 'POST', function(body) { | ||
| assert.equal(body.client_id, credentials.client_id); | ||
| assert.equal(body.client_secret, credentials.client_secret); | ||
| assert.equal(body.refresh_token, credentials.refresh_token); | ||
| return true; | ||
| }).reply(200, { | ||
| refresh_token: 'hello', | ||
| access_token: 'goodbye', | ||
| expiry_date: new Date(9999, 1, 1) | ||
| }); | ||
| // Since we have to get an auth token, this always gets intercepted second | ||
| nock('https://cloudtrace.googleapis.com') | ||
| .intercept('/v1/projects/0/traces', 'PATCH', function() { | ||
| scope.done(); | ||
| agent.stop(); | ||
| setImmediate(done); | ||
| return true; | ||
| }).reply(200); | ||
| cls.getNamespace().run(function() { | ||
| queueSpans(2, agent.private_()); | ||
| }); | ||
| }); | ||
|
|
||
| it('should use the credentials field of the config object', function(done) { | ||
| var config = { | ||
| bufferSize: 2, | ||
| samplingRate: 0, | ||
| credentials: require('../fixtures/gcloud-credentials.json') | ||
| }; | ||
| var agent = require('../..').start(config); | ||
| nock.disableNetConnect(); | ||
| var scope = nock('https://accounts.google.com') | ||
| .intercept('/o/oauth2/token', 'POST', function(body) { | ||
| assert.equal(body.client_id, config.credentials.client_id); | ||
| assert.equal(body.client_secret, config.credentials.client_secret); | ||
| assert.equal(body.refresh_token, config.credentials.refresh_token); | ||
| return true; | ||
| }).reply(200, { | ||
| refresh_token: 'hello', | ||
| access_token: 'goodbye', | ||
| expiry_date: new Date(9999, 1, 1) | ||
| }); | ||
| // Since we have to get an auth token, this always gets intercepted second | ||
| nock('https://cloudtrace.googleapis.com') | ||
| .intercept('/v1/projects/0/traces', 'PATCH', function() { | ||
| scope.done(); | ||
| agent.stop(); | ||
| setImmediate(done); | ||
| return true; | ||
| }).reply(200); | ||
| cls.getNamespace().run(function() { | ||
| queueSpans(2, agent.private_()); | ||
| }); | ||
| }); | ||
|
|
||
| it('should ignore credentials if keyFilename is provided', function(done) { | ||
| var correctCredentials = require('../fixtures/gcloud-credentials.json'); | ||
| var config = { | ||
| bufferSize: 2, | ||
| samplingRate: 0, | ||
| keyFilename: path.join('test', 'fixtures', 'gcloud-credentials.json'), | ||
| credentials: { | ||
| client_id: 'a', | ||
| client_secret: 'b', | ||
| refresh_token: 'c', | ||
| type: 'authorized_user' | ||
| } | ||
| }; | ||
| ['client_id', 'client_secret', 'refresh_token'].forEach(function (field) { | ||
| assert(correctCredentials.hasOwnProperty(field)); | ||
| assert(config.credentials.hasOwnProperty(field)); | ||
| assert.notEqual(config.credentials[field], | ||
| correctCredentials[field]); | ||
| }); | ||
| var agent = require('../..').start(config); | ||
| nock.disableNetConnect(); | ||
| var scope = nock('https://accounts.google.com') | ||
| .intercept('/o/oauth2/token', 'POST', function(body) { | ||
| assert.equal(body.client_id, correctCredentials.client_id); | ||
| assert.equal(body.client_secret, correctCredentials.client_secret); | ||
| assert.equal(body.refresh_token, correctCredentials.refresh_token); | ||
| agent.stop(); | ||
| return true; | ||
| }).reply(200, { | ||
| refresh_token: 'hello', | ||
| access_token: 'goodbye', | ||
| expiry_date: new Date(9999, 1, 1) | ||
| }); | ||
| // Since we have to get an auth token, this always gets intercepted second | ||
| nock('https://cloudtrace.googleapis.com') | ||
| .intercept('/v1/projects/0/traces', 'PATCH', function() { | ||
| scope.done(); | ||
| agent.stop(); | ||
| setImmediate(done); | ||
| return true; | ||
| }).reply(200); | ||
| cls.getNamespace().run(function() { | ||
| queueSpans(2, agent.private_()); | ||
| }); | ||
| }); | ||
| }); |