Skip to content

Provide user's project ID to google-auto-auth. #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexander-fenster merged 4 commits into from
Dec 21, 2017
Merged

Provide user's project ID to google-auto-auth. #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7a64e7
Provide user's project ID to google-auto-auth.
stephenplusplus Dec 21, 2017
55ec663
Add tests.
stephenplusplus Dec 21, 2017
a26aee6
Remove un-used test.
stephenplusplus Dec 21, 2017
1d2fea9
Merge branch 'master' into spp--27
alexander-fenster Dec 21, 2017
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"concat-stream": "^1.5.0",
"create-error-class": "^3.0.2",
"extend": "^3.0.1",
"google-auto-auth": "^0.8.2",
"google-auto-auth": "^0.9.0",
"google-gax": "^0.14.2",
"google-proto-files": "^0.13.1",
"is": "^3.0.1",
Expand Down
11 changes: 8 additions & 3 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,17 +370,22 @@ function Datastore(options) {

this.clients_ = new Map();
this.datastore = this;

/**
* @name Datastore#namespace
* @type {string}
*/
this.namespace = options.namespace;

const userProvidedProjectId =
options.projectId || process.env.DATASTORE_PROJECT_ID;

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

const defaultProjectId = '{{projectId}}';

/**
* @name Datastore#projectId
* @type {string}
*/
this.projectId =
process.env.DATASTORE_PROJECT_ID || options.projectId || '{{projectId}}';
this.projectId = userProvidedProjectId || defaultProjectId;

this.defaultBaseUrl_ = 'datastore.googleapis.com';
this.determineBaseUrl_(options.apiEndpoint);
Expand All @@ -392,10 +397,10 @@ function Datastore(options) {
scopes: gapic.v1.DatastoreClient.scopes,
servicePath: this.baseUrl_,
port: is.number(this.port_) ? this.port_ : 443,
projectId: userProvidedProjectId,
},
options
);

if (this.customEndpoint_) {
this.options.sslCreds = grpc.credentials.createInsecure();
}
Expand Down
24 changes: 21 additions & 3 deletions test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ describe('Datastore', function() {
var PROJECT_ID = 'project-id';
var NAMESPACE = 'namespace';

var DATASTORE_PROJECT_ID_CACHED = process.env.DATASTORE_PROJECT_ID;

var OPTIONS = {
projectId: PROJECT_ID,
apiEndpoint: 'http://endpoint',
Expand Down Expand Up @@ -123,6 +125,14 @@ describe('Datastore', function() {
});
});

afterEach(function() {
if (typeof DATASTORE_PROJECT_ID_CACHED === 'string') {
process.env.DATASTORE_PROJECT_ID = DATASTORE_PROJECT_ID_CACHED;
} else {
delete process.env.DATASTORE_PROJECT_ID;
}
});

after(function() {
createInsecureOverride = null;
googleAutoAuthOverride = null;
Expand Down Expand Up @@ -167,23 +177,28 @@ describe('Datastore', function() {

it('should localize the projectId', function() {
assert.strictEqual(datastore.projectId, PROJECT_ID);
assert.strictEqual(datastore.options.projectId, PROJECT_ID);
});

it('should default project ID to placeholder', function() {
var datastore = new Datastore({});
assert.strictEqual(datastore.projectId, '{{projectId}}');
});

it('should not default options.projectId to placeholder', function() {
var datastore = new Datastore({});
assert.strictEqual(datastore.options.projectId, undefined);
});

it('should use DATASTORE_PROJECT_ID', function() {
var datastoreProjectIdCached = process.env.DATASTORE_PROJECT_ID;
var projectId = 'overridden-project-id';

process.env.DATASTORE_PROJECT_ID = projectId;

var datastore = new Datastore(OPTIONS);
process.env.DATASTORE_PROJECT_ID = datastoreProjectIdCached;
var datastore = new Datastore({});

assert.strictEqual(datastore.projectId, projectId);
assert.strictEqual(datastore.options.projectId, projectId);
});

it('should set the default base URL', function() {
Expand All @@ -204,6 +219,8 @@ describe('Datastore', function() {
});

it('should localize the options', function() {
delete process.env.DATASTORE_PROJECT_ID;

var options = {
a: 'b',
c: 'd',
Expand All @@ -222,6 +239,7 @@ describe('Datastore', function() {
scopes: v1.DatastoreClient.scopes,
servicePath: datastore.baseUrl_,
port: 443,
projectId: undefined,

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

},
options
)
Expand Down