Skip to content

iot: mark serviceAccountJson optional in getClient #1079

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
gguuss merged 1 commit into from
Jan 4, 2019
Merged

iot: mark serviceAccountJson optional in getClient #1079

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 1 deletion iot/manager/manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ function listRegistries(client, projectId, cloudRegion) {
console.log(err);
} else {
let data = res.data;
console.log('Current registries in project:', data['deviceRegistries']);
console.log('Current registries in project:\n', data['deviceRegistries']);
}
});
// [END iot_list_registries]
Expand Down Expand Up @@ -783,8 +783,11 @@ function getRegistry(client, registryId, projectId, cloudRegion) {
// Returns an authorized API client by discovering the Cloud IoT Core API with
// the provided API key.
function getClient(serviceAccountJson, cb) {
// the getClient method looks for the GCLOUD_PROJECT and GOOGLE_APPLICATION_CREDENTIALS
// environment variables if serviceAccountJson is not passed in
google.auth
.getClient({
keyFilename: serviceAccountJson,
scopes: ['https://www.googleapis.com/auth/cloud-platform'],
})
.then(authClient => {
Expand Down