From d1e67759e7c35ae52e53aafbbf5453af5fe185d8 Mon Sep 17 00:00:00 2001 From: Gus Class Date: Mon, 2 Dec 2019 17:08:36 -0800 Subject: [PATCH 01/11] Cloud client library migration part 1: Registry management --- iot/manager/manager.js | 279 ++++++++++++++++++++++------------------- 1 file changed, 152 insertions(+), 127 deletions(-) diff --git a/iot/manager/manager.js b/iot/manager/manager.js index 0acc0877cd..0e6df2df96 100644 --- a/iot/manager/manager.js +++ b/iot/manager/manager.js @@ -88,22 +88,26 @@ const createIotTopic = async topicName => { // Lookup the registry, assuming that it exists. const lookupRegistry = async (client, registryId, projectId, cloudRegion) => { // [START iot_lookup_registry] - // Client retrieved in callback - // getClient(serviceAccountJson, function(client) {...}); // const cloudRegion = 'us-central1'; // const projectId = 'adjective-noun-123'; // const registryId = 'my-registry'; - const parentName = `projects/${projectId}/locations/${cloudRegion}`; - const registryName = `${parentName}/registries/${registryId}`; - const request = { - name: registryName, - }; + const iot = require('@google-cloud/iot'); - try { - const {data} = await client.projects.locations.registries.get(request); + const iotClient = new iot.v1.DeviceManagerClient({ + // optional auth parameters. + }); - console.log('Looked up existing registry'); - console.log(data); + try { + var registryName = iotClient.registryPath( + projectId, cloudRegion, registryId); + iotClient.getDeviceRegistry({name: registryName}).then(responses => { + var response = responses[0]; + // doThingsWith(response) + console.log(response); + }) + .catch(err => { + console.error(err); + }); } catch (err) { console.log('Could not look up registry'); console.log(err); @@ -120,35 +124,41 @@ const createRegistry = async ( ) => { // [START iot_create_registry] // Client retrieved in callback - // getClient(serviceAccountJson, function(client) {...}); // const cloudRegion = 'us-central1'; // const projectId = 'adjective-noun-123'; // const registryId = 'my-registry'; // function errCb = lookupRegistry; // Lookup registry if already exists. - const parentName = `projects/${projectId}/locations/${cloudRegion}`; - const pubsubTopic = `projects/${projectId}/topics/${pubsubTopicId}`; + const iot = require('@google-cloud/iot'); - const request = { - parent: parentName, - resource: { + // Lookup the pubsub topc + const topicPath = `projects/${projectId}/topics/${pubsubTopicId}`; + + var iotClient = new iot.v1.DeviceManagerClient({ + // optional auth parameters. + }); + + var newParent = iotClient.locationPath(projectId, cloudRegion); + var deviceRegistry = { eventNotificationConfigs: [ { - pubsubTopicName: pubsubTopic, + pubsubTopicName: topicPath, }, ], id: registryId, - }, + }; + var request = { + parent: newParent, + deviceRegistry: deviceRegistry, }; - try { - const {data} = await client.projects.locations.registries.create(request); - - console.log('Successfully created registry'); - console.log(data); - } catch (err) { - console.log('Could not create registry'); - console.log(err); - } + iotClient.createDeviceRegistry(request).then(responses => { + var response = responses[0]; + console.log('Successfully created registry'); + console.log(response); + }).catch(err => { + console.log('Could not create registry'); + console.error(err); + }); // [END iot_create_registry] }; @@ -466,34 +476,34 @@ const listDevices = async (client, registryId, projectId, cloudRegion) => { // List all of the registries in the given project. const listRegistries = async (client, projectId, cloudRegion) => { // [START iot_list_registries] - // Client retrieved in callback - // getClient(serviceAccountJson, function(client) {...}); // const cloudRegion = 'us-central1'; // const projectId = 'adjective-noun-123'; - const parentName = `projects/${projectId}/locations/${cloudRegion}`; + const iot = require('@google-cloud/iot'); - const request = { - parent: parentName, - }; + var newClient = new iot.v1.DeviceManagerClient({ + // optional auth parameters. + }); - try { - const {data} = await client.projects.locations.registries.list(request); - console.log('Current registries in project:\n', data['deviceRegistries']); - } catch (err) { - console.log('Could not list registries'); - console.log(err); - } + // Iterate over all elements. + var formattedParent = newClient.locationPath(projectId, cloudRegion); + + newClient.listDeviceRegistries({parent: formattedParent}).then(responses => { + var resources = responses[0]; + console.log('Current registries in project:\n', resources); + }).catch(err => { + console.error(err); + }); // [END iot_list_registries] }; // Delete the given device from the registry. const deleteDevice = async ( - client, - deviceId, - registryId, - projectId, - cloudRegion -) => { + client, + deviceId, + registryId, + projectId, + cloudRegion + ) => { // [START iot_delete_device] // Client retrieved in callback // getClient(serviceAccountJson, function(client) {...}); @@ -577,25 +587,24 @@ const clearRegistry = async (client, registryId, projectId, cloudRegion) => { const deleteRegistry = async (client, registryId, projectId, cloudRegion) => { // [START iot_delete_registry] // Client retrieved in callback - // getClient(serviceAccountJson, function(client) {...}); // const cloudRegion = 'us-central1'; // const projectId = 'adjective-noun-123'; // const registryId = 'my-registry'; - const parentName = `projects/${projectId}/locations/${cloudRegion}`; - const registryName = `${parentName}/registries/${registryId}`; - const request = { - name: registryName, - }; - try { - const res = await client.projects.locations.registries.delete(request); + const iot = require('@google-cloud/iot'); + var iotClient = new iot.v1.DeviceManagerClient({ + // optional auth parameters. + }); + + var registryName = iotClient.registryPath(projectId, cloudRegion, registryId); + iotClient.deleteDeviceRegistry({name: registryName}).then(responses => { + console.log(responses); console.log('Successfully deleted registry'); - console.log(res); - } catch (err) { + }).catch(err => { console.log('Could not delete registry'); - console.log(err); - } + console.error(err); + }); // [END iot_delete_registry] }; @@ -799,17 +808,25 @@ const getRegistry = async (client, registryId, projectId, cloudRegion) => { // const cloudRegion = 'us-central1'; // const projectId = 'adjective-noun-123'; // const registryId = 'my-registry'; - const parentName = `projects/${projectId}/locations/${cloudRegion}`; - const registryName = `${parentName}/registries/${registryId}`; - const request = { - name: `${registryName}`, - }; + const iot = require('@google-cloud/iot'); - try { - const {data} = await client.projects.locations.registries.get(request); + const iotClient = new iot.v1.DeviceManagerClient({ + // optional auth parameters. + }); - console.log('Found registry:', registryId); - console.log(data); + try { + var registryName = iotClient.registryPath( + projectId, cloudRegion, registryId); + iotClient.getDeviceRegistry({name: registryName}).then(responses => { + var response = responses[0]; + + // doThingsWith(response) + console.log('Found registry:', registryId); + console.log(response); + }) + .catch(err => { + console.error(err); + }); } catch (err) { console.log('Could not find registry:', registryId); console.log(err); @@ -845,39 +862,42 @@ const getClient = async serviceAccountJson => { // Retrieves the IAM policy for a given registry. const getIamPolicy = async (client, registryId, projectId, cloudRegion) => { // [START iot_get_iam_policy] - // Client retrieved in callback - // getClient(serviceAccountJson, function(client) {...}); // const cloudRegion = 'us-central1'; // const projectId = 'adjective-noun-123'; // const registryId = 'my-registry'; - const parentName = `projects/${projectId}/locations/${cloudRegion}`; - const registryName = `${parentName}/registries/${registryId}`; - const request = { - resource_: `${registryName}`, - }; + const iot = require('@google-cloud/iot'); + + var client = new iot.v1.DeviceManagerClient({ + // optional auth parameters. + }); + + var formattedResource = client.registryPath( + projectId, cloudRegion, registryId); let bindings, etag; - try { - const {data} = await client.projects.locations.registries.getIamPolicy( - request - ); - bindings = data.bindings; - etag = data.etag; - } catch (err) { - console.log('Could not find policy for: ', registryId); - console.log('Trace: ', err); - return; - } + client.getIamPolicy({resource: formattedResource}) + .then(responses => { + var response = responses[0]; - console.log(`ETAG: ${etag}`); - bindings = bindings || []; - bindings.forEach(_binding => { - console.log(`Role: ${_binding.role}`); - _binding.members || (_binding.members = []); - _binding.members.forEach(_member => { - console.log(`\t${_member}`); + bindings = response.bindings; + etag = response.etag; + + console.log('ETAG:', response.etag); + bindings = bindings || []; + + bindings.forEach(_binding => { + console.log(`Role: ${_binding.role}`); + _binding.members || (_binding.members = []); + _binding.members.forEach(_member => { + console.log(`\t${_member}`); + }); + }); + }).catch(err => { + console.log('Could not find policy for: ', registryId); + console.log('Trace: ', err); + return; }); - }); + // [END iot_get_iam_policy] }; @@ -891,50 +911,55 @@ const setIamPolicy = async ( role ) => { // [START iot_set_iam_policy] - // Client retrieved in callback - // setClient(serviceAccountJson, function(client) {...}); // const cloudRegion = 'us-central1'; // const projectId = 'adjective-noun-123'; // const registryId = 'my-registry'; - const parentName = `projects/${projectId}/locations/${cloudRegion}`; - const registryName = `${parentName}/registries/${registryId}`; - const request = { - resource_: `${registryName}`, - resource: { - policy: { - bindings: [ - { - members: member, - role: role, - }, - ], + + const iot = require('@google-cloud/iot'); + + var iotClient = new iot.v1.DeviceManagerClient({ + // optional auth parameters. + }); + + var resource = iotClient.registryPath(projectId, cloudRegion, registryId); + + const policy = { + bindings: [ + { + members: [member], + role: role, }, - }, + ], + }; + + var request = { + resource: resource, + policy: policy, }; let bindings, etag; - try { - const {data} = await client.projects.locations.registries.setIamPolicy( - request - ); - bindings = data.bindings; - etag = data.etag; + iotClient.setIamPolicy(request).then(responses => { + let response = responses[0]; - console.log(JSON.stringify(data)); - } catch (err) { - console.log('Could not set policy for: ', registryId); - console.log('Trace: ', err); - } + bindings = response.bindings; + etag = response.etag; - console.log(`ETAG: ${etag}`); - bindings = bindings || []; - bindings.forEach(_binding => { - console.log(`Role: ${_binding.role}`); - _binding.members || (_binding.members = []); - _binding.members.forEach(_member => { - console.log(`\t${_member}`); + console.log('ETAG:', response.etag); + bindings = bindings || []; + + bindings.forEach(_binding => { + console.log(`Role: ${_binding.role}`); + _binding.members || (_binding.members = []); + _binding.members.forEach(_member => { + console.log(`\t${_member}`); + }); }); + + }).catch(err => { + console.log('Could not set policy for: ', registryId); + console.log('Trace: ', err); }); + // [END iot_set_iam_policy] }; From 56e7f6b7d60770660816f6c0f36b66006c16b6d0 Mon Sep 17 00:00:00 2001 From: Gus Class Date: Tue, 3 Dec 2019 11:29:29 -0800 Subject: [PATCH 02/11] Small lint change --- iot/manager/manager.js | 44 ++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/iot/manager/manager.js b/iot/manager/manager.js index 0e6df2df96..ccd0dcd363 100644 --- a/iot/manager/manager.js +++ b/iot/manager/manager.js @@ -98,10 +98,12 @@ const lookupRegistry = async (client, registryId, projectId, cloudRegion) => { }); try { - var registryName = iotClient.registryPath( - projectId, cloudRegion, registryId); + let registryName = iotClient.registryPath( + projectId, + cloudRegion, + registryId); iotClient.getDeviceRegistry({name: registryName}).then(responses => { - var response = responses[0]; + let response = responses[0]; // doThingsWith(response) console.log(response); }) @@ -133,12 +135,12 @@ const createRegistry = async ( // Lookup the pubsub topc const topicPath = `projects/${projectId}/topics/${pubsubTopicId}`; - var iotClient = new iot.v1.DeviceManagerClient({ + let iotClient = new iot.v1.DeviceManagerClient({ // optional auth parameters. }); - var newParent = iotClient.locationPath(projectId, cloudRegion); - var deviceRegistry = { + let newParent = iotClient.locationPath(projectId, cloudRegion); + let deviceRegistry = { eventNotificationConfigs: [ { pubsubTopicName: topicPath, @@ -146,13 +148,13 @@ const createRegistry = async ( ], id: registryId, }; - var request = { + let request = { parent: newParent, deviceRegistry: deviceRegistry, }; iotClient.createDeviceRegistry(request).then(responses => { - var response = responses[0]; + let response = responses[0]; console.log('Successfully created registry'); console.log(response); }).catch(err => { @@ -480,15 +482,15 @@ const listRegistries = async (client, projectId, cloudRegion) => { // const projectId = 'adjective-noun-123'; const iot = require('@google-cloud/iot'); - var newClient = new iot.v1.DeviceManagerClient({ + let newClient = new iot.v1.DeviceManagerClient({ // optional auth parameters. }); // Iterate over all elements. - var formattedParent = newClient.locationPath(projectId, cloudRegion); + let formattedParent = newClient.locationPath(projectId, cloudRegion); newClient.listDeviceRegistries({parent: formattedParent}).then(responses => { - var resources = responses[0]; + let resources = responses[0]; console.log('Current registries in project:\n', resources); }).catch(err => { console.error(err); @@ -593,11 +595,11 @@ const deleteRegistry = async (client, registryId, projectId, cloudRegion) => { const iot = require('@google-cloud/iot'); - var iotClient = new iot.v1.DeviceManagerClient({ + let iotClient = new iot.v1.DeviceManagerClient({ // optional auth parameters. }); - var registryName = iotClient.registryPath(projectId, cloudRegion, registryId); + let registryName = iotClient.registryPath(projectId, cloudRegion, registryId); iotClient.deleteDeviceRegistry({name: registryName}).then(responses => { console.log(responses); console.log('Successfully deleted registry'); @@ -815,10 +817,10 @@ const getRegistry = async (client, registryId, projectId, cloudRegion) => { }); try { - var registryName = iotClient.registryPath( + let registryName = iotClient.registryPath( projectId, cloudRegion, registryId); iotClient.getDeviceRegistry({name: registryName}).then(responses => { - var response = responses[0]; + let response = responses[0]; // doThingsWith(response) console.log('Found registry:', registryId); @@ -867,17 +869,17 @@ const getIamPolicy = async (client, registryId, projectId, cloudRegion) => { // const registryId = 'my-registry'; const iot = require('@google-cloud/iot'); - var client = new iot.v1.DeviceManagerClient({ + let client = new iot.v1.DeviceManagerClient({ // optional auth parameters. }); - var formattedResource = client.registryPath( + let formattedResource = client.registryPath( projectId, cloudRegion, registryId); let bindings, etag; client.getIamPolicy({resource: formattedResource}) .then(responses => { - var response = responses[0]; + let response = responses[0]; bindings = response.bindings; etag = response.etag; @@ -917,11 +919,11 @@ const setIamPolicy = async ( const iot = require('@google-cloud/iot'); - var iotClient = new iot.v1.DeviceManagerClient({ + let iotClient = new iot.v1.DeviceManagerClient({ // optional auth parameters. }); - var resource = iotClient.registryPath(projectId, cloudRegion, registryId); + let resource = iotClient.registryPath(projectId, cloudRegion, registryId); const policy = { bindings: [ @@ -932,7 +934,7 @@ const setIamPolicy = async ( ], }; - var request = { + let request = { resource: resource, policy: policy, }; From f7ceeca828c02a3c2d4ae20f72b4e7d56d201253 Mon Sep 17 00:00:00 2001 From: Gus Class Date: Tue, 3 Dec 2019 12:48:57 -0800 Subject: [PATCH 03/11] Prettier fixjsstyle? --- iot/manager/manager.js | 160 +++++++++++++++++++++++------------------ 1 file changed, 92 insertions(+), 68 deletions(-) diff --git a/iot/manager/manager.js b/iot/manager/manager.js index ccd0dcd363..9ddb68f6a2 100644 --- a/iot/manager/manager.js +++ b/iot/manager/manager.js @@ -99,17 +99,20 @@ const lookupRegistry = async (client, registryId, projectId, cloudRegion) => { try { let registryName = iotClient.registryPath( - projectId, - cloudRegion, - registryId); - iotClient.getDeviceRegistry({name: registryName}).then(responses => { - let response = responses[0]; - // doThingsWith(response) - console.log(response); - }) - .catch(err => { - console.error(err); - }); + projectId, + cloudRegion, + registryId + ); + iotClient + .getDeviceRegistry({name: registryName}) + .then(responses => { + let response = responses[0]; + // doThingsWith(response) + console.log(response); + }) + .catch(err => { + console.error(err); + }); } catch (err) { console.log('Could not look up registry'); console.log(err); @@ -141,23 +144,26 @@ const createRegistry = async ( let newParent = iotClient.locationPath(projectId, cloudRegion); let deviceRegistry = { - eventNotificationConfigs: [ - { - pubsubTopicName: topicPath, - }, - ], - id: registryId, + eventNotificationConfigs: [ + { + pubsubTopicName: topicPath, + }, + ], + id: registryId, }; let request = { parent: newParent, deviceRegistry: deviceRegistry, }; - iotClient.createDeviceRegistry(request).then(responses => { + iotClient + .createDeviceRegistry(request) + .then(responses => { let response = responses[0]; console.log('Successfully created registry'); console.log(response); - }).catch(err => { + }) + .catch(err => { console.log('Could not create registry'); console.error(err); }); @@ -489,23 +495,26 @@ const listRegistries = async (client, projectId, cloudRegion) => { // Iterate over all elements. let formattedParent = newClient.locationPath(projectId, cloudRegion); - newClient.listDeviceRegistries({parent: formattedParent}).then(responses => { - let resources = responses[0]; - console.log('Current registries in project:\n', resources); - }).catch(err => { - console.error(err); - }); + newClient + .listDeviceRegistries({parent: formattedParent}) + .then(responses => { + let resources = responses[0]; + console.log('Current registries in project:\n', resources); + }) + .catch(err => { + console.error(err); + }); // [END iot_list_registries] }; // Delete the given device from the registry. const deleteDevice = async ( - client, - deviceId, - registryId, - projectId, - cloudRegion - ) => { + client, + deviceId, + registryId, + projectId, + cloudRegion +) => { // [START iot_delete_device] // Client retrieved in callback // getClient(serviceAccountJson, function(client) {...}); @@ -600,13 +609,16 @@ const deleteRegistry = async (client, registryId, projectId, cloudRegion) => { }); let registryName = iotClient.registryPath(projectId, cloudRegion, registryId); - iotClient.deleteDeviceRegistry({name: registryName}).then(responses => { - console.log(responses); - console.log('Successfully deleted registry'); - }).catch(err => { - console.log('Could not delete registry'); - console.error(err); - }); + iotClient + .deleteDeviceRegistry({name: registryName}) + .then(responses => { + console.log(responses); + console.log('Successfully deleted registry'); + }) + .catch(err => { + console.log('Could not delete registry'); + console.error(err); + }); // [END iot_delete_registry] }; @@ -818,17 +830,22 @@ const getRegistry = async (client, registryId, projectId, cloudRegion) => { try { let registryName = iotClient.registryPath( - projectId, cloudRegion, registryId); - iotClient.getDeviceRegistry({name: registryName}).then(responses => { - let response = responses[0]; - - // doThingsWith(response) - console.log('Found registry:', registryId); - console.log(response); - }) - .catch(err => { - console.error(err); - }); + projectId, + cloudRegion, + registryId + ); + iotClient + .getDeviceRegistry({name: registryName}) + .then(responses => { + let response = responses[0]; + + // doThingsWith(response) + console.log('Found registry:', registryId); + console.log(response); + }) + .catch(err => { + console.error(err); + }); } catch (err) { console.log('Could not find registry:', registryId); console.log(err); @@ -874,10 +891,14 @@ const getIamPolicy = async (client, registryId, projectId, cloudRegion) => { }); let formattedResource = client.registryPath( - projectId, cloudRegion, registryId); + projectId, + cloudRegion, + registryId + ); let bindings, etag; - client.getIamPolicy({resource: formattedResource}) + client + .getIamPolicy({resource: formattedResource}) .then(responses => { let response = responses[0]; @@ -894,7 +915,8 @@ const getIamPolicy = async (client, registryId, projectId, cloudRegion) => { console.log(`\t${_member}`); }); }); - }).catch(err => { + }) + .catch(err => { console.log('Could not find policy for: ', registryId); console.log('Trace: ', err); return; @@ -940,28 +962,30 @@ const setIamPolicy = async ( }; let bindings, etag; - iotClient.setIamPolicy(request).then(responses => { - let response = responses[0]; + iotClient + .setIamPolicy(request) + .then(responses => { + let response = responses[0]; - bindings = response.bindings; - etag = response.etag; + bindings = response.bindings; + etag = response.etag; - console.log('ETAG:', response.etag); - bindings = bindings || []; + console.log('ETAG:', response.etag); + bindings = bindings || []; - bindings.forEach(_binding => { - console.log(`Role: ${_binding.role}`); - _binding.members || (_binding.members = []); - _binding.members.forEach(_member => { - console.log(`\t${_member}`); + bindings.forEach(_binding => { + console.log(`Role: ${_binding.role}`); + _binding.members || (_binding.members = []); + _binding.members.forEach(_member => { + console.log(`\t${_member}`); + }); }); + }) + .catch(err => { + console.log('Could not set policy for: ', registryId); + console.log('Trace: ', err); }); - }).catch(err => { - console.log('Could not set policy for: ', registryId); - console.log('Trace: ', err); - }); - // [END iot_set_iam_policy] }; From 18ee478a2565feebb7f2b6afe9879235f133561b Mon Sep 17 00:00:00 2001 From: Gus Class Date: Tue, 3 Dec 2019 13:02:00 -0800 Subject: [PATCH 04/11] Fix client instantiation for lint --- iot/manager/manager.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/iot/manager/manager.js b/iot/manager/manager.js index 9ddb68f6a2..36fa58a4c6 100644 --- a/iot/manager/manager.js +++ b/iot/manager/manager.js @@ -886,18 +886,18 @@ const getIamPolicy = async (client, registryId, projectId, cloudRegion) => { // const registryId = 'my-registry'; const iot = require('@google-cloud/iot'); - let client = new iot.v1.DeviceManagerClient({ + let iotClient = new iot.v1.DeviceManagerClient({ // optional auth parameters. }); - let formattedResource = client.registryPath( + let formattedResource = iotClient.registryPath( projectId, cloudRegion, registryId ); let bindings, etag; - client + iotClient .getIamPolicy({resource: formattedResource}) .then(responses => { let response = responses[0]; From 8a10987ec440b1d19e6b29ab87567347473f8310 Mon Sep 17 00:00:00 2001 From: Gus Class Date: Tue, 3 Dec 2019 13:16:44 -0800 Subject: [PATCH 05/11] Prettier fixjsstyle? --- iot/manager/manager.js | 44 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/iot/manager/manager.js b/iot/manager/manager.js index 36fa58a4c6..67a56935f7 100644 --- a/iot/manager/manager.js +++ b/iot/manager/manager.js @@ -98,7 +98,7 @@ const lookupRegistry = async (client, registryId, projectId, cloudRegion) => { }); try { - let registryName = iotClient.registryPath( + const registryName = iotClient.registryPath( projectId, cloudRegion, registryId @@ -106,7 +106,7 @@ const lookupRegistry = async (client, registryId, projectId, cloudRegion) => { iotClient .getDeviceRegistry({name: registryName}) .then(responses => { - let response = responses[0]; + const response = responses[0]; // doThingsWith(response) console.log(response); }) @@ -138,12 +138,12 @@ const createRegistry = async ( // Lookup the pubsub topc const topicPath = `projects/${projectId}/topics/${pubsubTopicId}`; - let iotClient = new iot.v1.DeviceManagerClient({ + const iotClient = new iot.v1.DeviceManagerClient({ // optional auth parameters. }); - let newParent = iotClient.locationPath(projectId, cloudRegion); - let deviceRegistry = { + const newParent = iotClient.locationPath(projectId, cloudRegion); + const deviceRegistry = { eventNotificationConfigs: [ { pubsubTopicName: topicPath, @@ -151,7 +151,7 @@ const createRegistry = async ( ], id: registryId, }; - let request = { + const request = { parent: newParent, deviceRegistry: deviceRegistry, }; @@ -488,17 +488,17 @@ const listRegistries = async (client, projectId, cloudRegion) => { // const projectId = 'adjective-noun-123'; const iot = require('@google-cloud/iot'); - let newClient = new iot.v1.DeviceManagerClient({ + const newClient = new iot.v1.DeviceManagerClient({ // optional auth parameters. }); // Iterate over all elements. - let formattedParent = newClient.locationPath(projectId, cloudRegion); + const formattedParent = newClient.locationPath(projectId, cloudRegion); newClient .listDeviceRegistries({parent: formattedParent}) .then(responses => { - let resources = responses[0]; + const resources = responses[0]; console.log('Current registries in project:\n', resources); }) .catch(err => { @@ -604,11 +604,11 @@ const deleteRegistry = async (client, registryId, projectId, cloudRegion) => { const iot = require('@google-cloud/iot'); - let iotClient = new iot.v1.DeviceManagerClient({ + const iotClient = new iot.v1.DeviceManagerClient({ // optional auth parameters. }); - let registryName = iotClient.registryPath(projectId, cloudRegion, registryId); + const registryName = iotClient.registryPath(projectId, cloudRegion, registryId); iotClient .deleteDeviceRegistry({name: registryName}) .then(responses => { @@ -829,7 +829,7 @@ const getRegistry = async (client, registryId, projectId, cloudRegion) => { }); try { - let registryName = iotClient.registryPath( + const registryName = iotClient.registryPath( projectId, cloudRegion, registryId @@ -837,7 +837,7 @@ const getRegistry = async (client, registryId, projectId, cloudRegion) => { iotClient .getDeviceRegistry({name: registryName}) .then(responses => { - let response = responses[0]; + const response = responses[0]; // doThingsWith(response) console.log('Found registry:', registryId); @@ -886,11 +886,11 @@ const getIamPolicy = async (client, registryId, projectId, cloudRegion) => { // const registryId = 'my-registry'; const iot = require('@google-cloud/iot'); - let iotClient = new iot.v1.DeviceManagerClient({ + const iotClient = new iot.v1.DeviceManagerClient({ // optional auth parameters. }); - let formattedResource = iotClient.registryPath( + const formattedResource = iotClient.registryPath( projectId, cloudRegion, registryId @@ -900,12 +900,12 @@ const getIamPolicy = async (client, registryId, projectId, cloudRegion) => { iotClient .getIamPolicy({resource: formattedResource}) .then(responses => { - let response = responses[0]; + const response = responses[0]; bindings = response.bindings; etag = response.etag; - console.log('ETAG:', response.etag); + console.log('ETAG:', etag); bindings = bindings || []; bindings.forEach(_binding => { @@ -941,11 +941,11 @@ const setIamPolicy = async ( const iot = require('@google-cloud/iot'); - let iotClient = new iot.v1.DeviceManagerClient({ + const iotClient = new iot.v1.DeviceManagerClient({ // optional auth parameters. }); - let resource = iotClient.registryPath(projectId, cloudRegion, registryId); + const resource = iotClient.registryPath(projectId, cloudRegion, registryId); const policy = { bindings: [ @@ -956,7 +956,7 @@ const setIamPolicy = async ( ], }; - let request = { + const request = { resource: resource, policy: policy, }; @@ -965,12 +965,12 @@ const setIamPolicy = async ( iotClient .setIamPolicy(request) .then(responses => { - let response = responses[0]; + const response = responses[0]; bindings = response.bindings; etag = response.etag; - console.log('ETAG:', response.etag); + console.log('ETAG:', etag); bindings = bindings || []; bindings.forEach(_binding => { From cf8f554897264f10e9c5b46590d3861683a6c770 Mon Sep 17 00:00:00 2001 From: Gus Class Date: Tue, 3 Dec 2019 13:41:09 -0800 Subject: [PATCH 06/11] Variable rename typo during refactor forced by prettier --- iot/manager/manager.js | 170 +++++++++++++++++++---------------------- 1 file changed, 80 insertions(+), 90 deletions(-) diff --git a/iot/manager/manager.js b/iot/manager/manager.js index 67a56935f7..d39ae7ecfa 100644 --- a/iot/manager/manager.js +++ b/iot/manager/manager.js @@ -103,16 +103,13 @@ const lookupRegistry = async (client, registryId, projectId, cloudRegion) => { cloudRegion, registryId ); - iotClient - .getDeviceRegistry({name: registryName}) - .then(responses => { - const response = responses[0]; - // doThingsWith(response) - console.log(response); - }) - .catch(err => { - console.error(err); - }); + try { + const responses = await iotClient.getDeviceRegistry({name: registryName}); + const response = responses[0]; + console.log(response); + } catch (err) { + console.error(err); + } } catch (err) { console.log('Could not look up registry'); console.log(err); @@ -156,17 +153,16 @@ const createRegistry = async ( deviceRegistry: deviceRegistry, }; - iotClient - .createDeviceRegistry(request) - .then(responses => { - let response = responses[0]; - console.log('Successfully created registry'); - console.log(response); - }) - .catch(err => { - console.log('Could not create registry'); - console.error(err); - }); + try { + const responses = await iotClient.createDeviceRegistry(request); + + let response = responses[0]; + console.log('Successfully created registry'); + console.log(response); + } catch (err) { + console.log('Could not create registry'); + console.error(err); + } // [END iot_create_registry] }; @@ -495,15 +491,13 @@ const listRegistries = async (client, projectId, cloudRegion) => { // Iterate over all elements. const formattedParent = newClient.locationPath(projectId, cloudRegion); - newClient - .listDeviceRegistries({parent: formattedParent}) - .then(responses => { - const resources = responses[0]; - console.log('Current registries in project:\n', resources); - }) - .catch(err => { - console.error(err); - }); + try { + const responses = newClient.listDeviceRegistries({parent: formattedParent}); + const resources = responses[0]; + console.log('Current registries in project:\n', resources); + } catch (err) { + console.error(err); + } // [END iot_list_registries] }; @@ -608,17 +602,21 @@ const deleteRegistry = async (client, registryId, projectId, cloudRegion) => { // optional auth parameters. }); - const registryName = iotClient.registryPath(projectId, cloudRegion, registryId); - iotClient - .deleteDeviceRegistry({name: registryName}) - .then(responses => { - console.log(responses); - console.log('Successfully deleted registry'); - }) - .catch(err => { - console.log('Could not delete registry'); - console.error(err); + const registryName = iotClient.registryPath( + projectId, + cloudRegion, + registryId + ); + try { + const responses = await iotClient.deleteDeviceRegistry({ + name: registryName, }); + console.log(responses); + console.log('Successfully deleted registry'); + } catch (err) { + console.log('Could not delete registry'); + console.error(err); + } // [END iot_delete_registry] }; @@ -834,18 +832,15 @@ const getRegistry = async (client, registryId, projectId, cloudRegion) => { cloudRegion, registryId ); - iotClient - .getDeviceRegistry({name: registryName}) - .then(responses => { - const response = responses[0]; - - // doThingsWith(response) - console.log('Found registry:', registryId); - console.log(response); - }) - .catch(err => { - console.error(err); - }); + try { + const responses = await iotClient.getDeviceRegistry({name: registryName}); + const response = responses[0]; + + console.log('Found registry:', registryId); + console.log(response); + } catch (err) { + console.error(err); + } } catch (err) { console.log('Could not find registry:', registryId); console.log(err); @@ -897,30 +892,28 @@ const getIamPolicy = async (client, registryId, projectId, cloudRegion) => { ); let bindings, etag; - iotClient - .getIamPolicy({resource: formattedResource}) - .then(responses => { - const response = responses[0]; + try { + const responses = iotClient.getIamPolicy({resource: formattedResource}); + const response = responses[0]; - bindings = response.bindings; - etag = response.etag; + bindings = response.bindings; + etag = response.etag; - console.log('ETAG:', etag); - bindings = bindings || []; + console.log('ETAG:', etag); + bindings = bindings || []; - bindings.forEach(_binding => { - console.log(`Role: ${_binding.role}`); - _binding.members || (_binding.members = []); - _binding.members.forEach(_member => { - console.log(`\t${_member}`); - }); + bindings.forEach(_binding => { + console.log(`Role: ${_binding.role}`); + _binding.members || (_binding.members = []); + _binding.members.forEach(_member => { + console.log(`\t${_member}`); }); - }) - .catch(err => { - console.log('Could not find policy for: ', registryId); - console.log('Trace: ', err); - return; }); + } catch (err) { + console.log('Could not find policy for: ', registryId); + console.log('Trace: ', err); + return; + } // [END iot_get_iam_policy] }; @@ -962,30 +955,27 @@ const setIamPolicy = async ( }; let bindings, etag; - iotClient - .setIamPolicy(request) - .then(responses => { - const response = responses[0]; + try { + const responses = await iotClient.setIamPolicy(request); + const response = responses[0]; - bindings = response.bindings; - etag = response.etag; + bindings = response.bindings; + etag = response.etag; - console.log('ETAG:', etag); - bindings = bindings || []; + console.log('ETAG:', etag); + bindings = bindings || []; - bindings.forEach(_binding => { - console.log(`Role: ${_binding.role}`); - _binding.members || (_binding.members = []); - _binding.members.forEach(_member => { - console.log(`\t${_member}`); - }); + bindings.forEach(_binding => { + console.log(`Role: ${_binding.role}`); + _binding.members || (_binding.members = []); + _binding.members.forEach(_member => { + console.log(`\t${_member}`); }); - }) - .catch(err => { - console.log('Could not set policy for: ', registryId); - console.log('Trace: ', err); }); - + } catch (err) { + console.log('Could not set policy for: ', registryId); + console.log('Trace: ', err); + } // [END iot_set_iam_policy] }; From 72f98473adda23729a6a859db8c6ca6f42087dec Mon Sep 17 00:00:00 2001 From: Gus Class Date: Tue, 3 Dec 2019 13:55:57 -0800 Subject: [PATCH 07/11] Variable rename typo during refactor forced by prettier --- iot/manager/manager.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/iot/manager/manager.js b/iot/manager/manager.js index d39ae7ecfa..deff8e37c5 100644 --- a/iot/manager/manager.js +++ b/iot/manager/manager.js @@ -155,8 +155,8 @@ const createRegistry = async ( try { const responses = await iotClient.createDeviceRegistry(request); + const response = responses[0]; - let response = responses[0]; console.log('Successfully created registry'); console.log(response); } catch (err) { @@ -492,7 +492,7 @@ const listRegistries = async (client, projectId, cloudRegion) => { const formattedParent = newClient.locationPath(projectId, cloudRegion); try { - const responses = newClient.listDeviceRegistries({parent: formattedParent}); + const responses = await newClient.listDeviceRegistries({parent: formattedParent}); const resources = responses[0]; console.log('Current registries in project:\n', resources); } catch (err) { @@ -893,7 +893,7 @@ const getIamPolicy = async (client, registryId, projectId, cloudRegion) => { let bindings, etag; try { - const responses = iotClient.getIamPolicy({resource: formattedResource}); + const responses = await iotClient.getIamPolicy({resource: formattedResource}); const response = responses[0]; bindings = response.bindings; From 70c98f8df52a16a3f3262811e4c5277b1c2e3628 Mon Sep 17 00:00:00 2001 From: Gus Class Date: Tue, 3 Dec 2019 14:02:52 -0800 Subject: [PATCH 08/11] Variable rename typo during refactor forced by prettier --- iot/manager/manager.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/iot/manager/manager.js b/iot/manager/manager.js index deff8e37c5..0c4e84aae3 100644 --- a/iot/manager/manager.js +++ b/iot/manager/manager.js @@ -492,7 +492,9 @@ const listRegistries = async (client, projectId, cloudRegion) => { const formattedParent = newClient.locationPath(projectId, cloudRegion); try { - const responses = await newClient.listDeviceRegistries({parent: formattedParent}); + const responses = await newClient.listDeviceRegistries({ + parent: formattedParent, + }); const resources = responses[0]; console.log('Current registries in project:\n', resources); } catch (err) { @@ -893,7 +895,9 @@ const getIamPolicy = async (client, registryId, projectId, cloudRegion) => { let bindings, etag; try { - const responses = await iotClient.getIamPolicy({resource: formattedResource}); + const responses = await iotClient.getIamPolicy({ + resource: formattedResource, + }); const response = responses[0]; bindings = response.bindings; From 85f885f18c77aa3f83960442bd76da3a38989a29 Mon Sep 17 00:00:00 2001 From: Gus Class Date: Thu, 5 Dec 2019 14:13:04 -0800 Subject: [PATCH 09/11] Address feedback on CR --- iot/manager/manager.js | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/iot/manager/manager.js b/iot/manager/manager.js index 0c4e84aae3..20e190acb2 100644 --- a/iot/manager/manager.js +++ b/iot/manager/manager.js @@ -132,7 +132,7 @@ const createRegistry = async ( // function errCb = lookupRegistry; // Lookup registry if already exists. const iot = require('@google-cloud/iot'); - // Lookup the pubsub topc + // Lookup the pubsub topic const topicPath = `projects/${projectId}/topics/${pubsubTopicId}`; const iotClient = new iot.v1.DeviceManagerClient({ @@ -160,8 +160,7 @@ const createRegistry = async ( console.log('Successfully created registry'); console.log(response); } catch (err) { - console.log('Could not create registry'); - console.error(err); + console.log('Could not create registry', err); } // [END iot_create_registry] }; @@ -211,8 +210,7 @@ const createDevice = async ( console.log('Created device'); console.log(data); } catch (err) { - console.log('Could not create device'); - console.log(err); + console.log('Could not create device', err); } // [END iot_create_device] }; @@ -250,8 +248,7 @@ const createUnauthDevice = async ( console.log('Created device'); console.log(data); } catch (err) { - console.log('Could not create device'); - console.log(err); + console.log('Could not create device', err); } // [END iot_create_unauth_device] }; @@ -301,8 +298,7 @@ const createRsaDevice = async ( console.log('Created device'); console.log(data); } catch (err) { - console.log('Could not create device'); - console.log(err); + console.log('Could not create device', err); } // [END iot_create_rsa_device] }; @@ -350,8 +346,7 @@ const createEsDevice = async ( console.log('Created device'); console.log(data); } catch (err) { - console.log('Could not create device'); - console.log(err); + console.log('Could not create device', err); } // [END iot_create_es_device] }; @@ -397,8 +392,7 @@ const patchRsa256ForAuth = async ( console.log('Patched device:', deviceId); console.log(data); } catch (err) { - console.log('Error patching device:', deviceId); - console.log(err); + console.log('Error patching device:', deviceId, err); } // [END iot_patch_rsa] }; @@ -444,8 +438,7 @@ const patchEs256ForAuth = async ( console.log('Patched device:', deviceId); console.log(data); } catch (err) { - console.log('Error patching device:', deviceId); - console.log(err); + console.log('Error patching device:', deviceId, err); } // [END iot_patch_es] }; @@ -471,8 +464,7 @@ const listDevices = async (client, registryId, projectId, cloudRegion) => { ); console.log('Current devices in registry:', data['devices']); } catch (err) { - console.log('Could not list devices'); - console.log(err); + console.log('Could not list devices', err); } // [END iot_list_devices] }; @@ -498,7 +490,7 @@ const listRegistries = async (client, projectId, cloudRegion) => { const resources = responses[0]; console.log('Current registries in project:\n', resources); } catch (err) { - console.error(err); + console.error('Could not list registries', err); } // [END iot_list_registries] }; @@ -531,8 +523,7 @@ const deleteDevice = async ( console.log('Successfully deleted device:', deviceId); console.log(data); } catch (err) { - console.log('Could not delete device:', deviceId); - console.log(err); + console.log('Could not delete device:', deviceId, err); } // [END iot_delete_device] }; From 60274a6cd53068dbf85fc59acf06232c0f55fb20 Mon Sep 17 00:00:00 2001 From: Gus Class Date: Fri, 6 Dec 2019 12:44:03 -0800 Subject: [PATCH 10/11] Use console.error for errors. --- iot/manager/manager.js | 61 +++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 34 deletions(-) diff --git a/iot/manager/manager.js b/iot/manager/manager.js index 20e190acb2..ccd5a6c52a 100644 --- a/iot/manager/manager.js +++ b/iot/manager/manager.js @@ -576,7 +576,7 @@ const clearRegistry = async (client, registryId, projectId, cloudRegion) => { console.log(`Successfully deleted registry ${registryName}`); console.log(data); } catch (err) { - console.log('Could not delete registry', err); + console.error('Could not delete registry', err); } }; @@ -607,8 +607,7 @@ const deleteRegistry = async (client, registryId, projectId, cloudRegion) => { console.log(responses); console.log('Successfully deleted registry'); } catch (err) { - console.log('Could not delete registry'); - console.error(err); + console.error('Could not delete registry', err); } // [END iot_delete_registry] }; @@ -642,8 +641,8 @@ const getDevice = async ( console.log('Found device:', deviceId); console.log(data); } catch (err) { - console.log('Could not find device:', deviceId); - console.log(err); + console.error('Could not find device:', deviceId); + console.error('Trace:', err); } // [END iot_get_device] }; @@ -675,8 +674,8 @@ const getDeviceState = async ( } = await client.projects.locations.registries.devices.states.list(request); console.log('State:', data); } catch (err) { - console.log('Could not find device:', deviceId); - console.log(err); + console.error('Could not find device:', deviceId); + console.error('trace:', err); } // [END iot_get_device_state] }; @@ -711,8 +710,8 @@ const getDeviceConfigs = async ( console.log('Configs:', data); } catch (err) { - console.log('Could not find device:', deviceId); - console.log(err); + console.error('Could not find device:', deviceId); + console.error('Trace:', err); } // [END iot_get_device_configs] }; @@ -755,8 +754,8 @@ const setDeviceConfig = async ( console.log('Success:', data); } catch (err) { - console.log('Could not update config:', deviceId); - console.log('Message:', err); + console.error('Could not update config:', deviceId); + console.error('Message:', err); } // [END iot_set_device_config] }; @@ -800,7 +799,7 @@ const sendCommand = async ( console.log('Sent command'); } catch (err) { - console.error(err); + console.error('Could not send command:', err); } // [END iot_send_command] }; @@ -832,11 +831,11 @@ const getRegistry = async (client, registryId, projectId, cloudRegion) => { console.log('Found registry:', registryId); console.log(response); } catch (err) { - console.error(err); + console.error('Could not get device registry', err); } } catch (err) { - console.log('Could not find registry:', registryId); - console.log(err); + console.error('Could not find registry:', registryId); + console.error('Trace:', err); } // [END iot_get_registry] }; @@ -905,9 +904,8 @@ const getIamPolicy = async (client, registryId, projectId, cloudRegion) => { }); }); } catch (err) { - console.log('Could not find policy for: ', registryId); - console.log('Trace: ', err); - return; + console.error('Could not find policy for: ', registryId); + console.error('Trace: ', err); } // [END iot_get_iam_policy] @@ -968,8 +966,8 @@ const setIamPolicy = async ( }); }); } catch (err) { - console.log('Could not set policy for: ', registryId); - console.log('Trace: ', err); + console.error('Could not set policy for: ', registryId); + console.error('Trace: ', err); } // [END iot_set_iam_policy] }; @@ -1026,11 +1024,9 @@ const createGateway = async ( createRequest ); - console.log('Created device'); - console.log(data); + console.log('Created device', data); } catch (err) { - console.log('Could not create device'); - console.log(err); + console.error('Could not create device', err); } // [END iot_create_gateway] }; @@ -1065,7 +1061,7 @@ const bindDeviceToGateway = async ( console.log(`Bound ${deviceId} to`, gatewayId); } catch (err) { - console.log('Could not bind device', err); + console.error('Could not bind device', err); } // [END iot_bind_device_to_gateway] }; @@ -1101,7 +1097,7 @@ const unbindDeviceFromGateway = async ( console.log(`Unbound ${deviceId} from`, gatewayId); } catch (err) { - console.log('Could not unbind device', err); + console.error('Could not unbind device', err); } // [END iot_unbind_device_to_gateway] }; @@ -1172,7 +1168,7 @@ const unbindDeviceFromAllGateways = async ( console.log('Unbound device from gateways', gateway.id); resolve(); } catch (err) { - console.log('Could not unbind device', err); + console.error('Could not unbind device', err); reject(); } }); @@ -1199,7 +1195,7 @@ const unbindAllDevices = async (client, projectId, cloudRegion, registryId) => { ); devices = data.devices; } catch (err) { - console.log('Could not list devices', err); + console.error('Could not list devices', err); return; } @@ -1245,8 +1241,7 @@ const listGateways = async (client, projectId, cloudRegion, registryId) => { ); devices = data.devices; } catch (err) { - console.log('Could not list devices'); - console.log(err); + console.error('Could not list devices', err); return; } @@ -1290,8 +1285,7 @@ const listDevicesForGateway = async ( ); devices = data.devices; } catch (err) { - console.log('Could not list devices'); - console.log(err); + console.error('Could not list devices', err); return; } @@ -1332,8 +1326,7 @@ const listGatewaysForDevice = async ( ); devices = data.devices; } catch (err) { - console.log('Could not list gateways for device'); - console.log(err); + console.error('Could not list gateways for device', err); return; } From bd9df3f0f376ffde2bf74b57335a74c57d25370c Mon Sep 17 00:00:00 2001 From: Gus Class Date: Fri, 6 Dec 2019 13:05:48 -0800 Subject: [PATCH 11/11] One more pass on console log vs error --- iot/manager/manager.js | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/iot/manager/manager.js b/iot/manager/manager.js index ccd5a6c52a..7339af5ffb 100644 --- a/iot/manager/manager.js +++ b/iot/manager/manager.js @@ -70,7 +70,7 @@ const setupIotTopic = async topicName => { const [updatedPolicy] = await topic.iam.setPolicy(policy); console.log(JSON.stringify(updatedPolicy, null, 2)); } catch (err) { - console.error('ERROR:', err); + console.error('Error updating policy:', err); } }; @@ -108,11 +108,10 @@ const lookupRegistry = async (client, registryId, projectId, cloudRegion) => { const response = responses[0]; console.log(response); } catch (err) { - console.error(err); + console.error('Error getting registry', err); } } catch (err) { - console.log('Could not look up registry'); - console.log(err); + console.error('Could not look up registry', err); } // [END iot_lookup_registry] }; @@ -160,7 +159,7 @@ const createRegistry = async ( console.log('Successfully created registry'); console.log(response); } catch (err) { - console.log('Could not create registry', err); + console.error('Could not create registry', err); } // [END iot_create_registry] }; @@ -210,7 +209,7 @@ const createDevice = async ( console.log('Created device'); console.log(data); } catch (err) { - console.log('Could not create device', err); + console.error('Could not create device', err); } // [END iot_create_device] }; @@ -248,7 +247,7 @@ const createUnauthDevice = async ( console.log('Created device'); console.log(data); } catch (err) { - console.log('Could not create device', err); + console.error('Could not create device', err); } // [END iot_create_unauth_device] }; @@ -298,7 +297,7 @@ const createRsaDevice = async ( console.log('Created device'); console.log(data); } catch (err) { - console.log('Could not create device', err); + console.error('Could not create device', err); } // [END iot_create_rsa_device] }; @@ -346,7 +345,7 @@ const createEsDevice = async ( console.log('Created device'); console.log(data); } catch (err) { - console.log('Could not create device', err); + console.error('Could not create device', err); } // [END iot_create_es_device] }; @@ -392,7 +391,7 @@ const patchRsa256ForAuth = async ( console.log('Patched device:', deviceId); console.log(data); } catch (err) { - console.log('Error patching device:', deviceId, err); + console.error('Error patching device:', deviceId, err); } // [END iot_patch_rsa] }; @@ -438,7 +437,7 @@ const patchEs256ForAuth = async ( console.log('Patched device:', deviceId); console.log(data); } catch (err) { - console.log('Error patching device:', deviceId, err); + console.error('Error patching device:', deviceId, err); } // [END iot_patch_es] }; @@ -464,7 +463,7 @@ const listDevices = async (client, registryId, projectId, cloudRegion) => { ); console.log('Current devices in registry:', data['devices']); } catch (err) { - console.log('Could not list devices', err); + console.error('Could not list devices', err); } // [END iot_list_devices] }; @@ -523,7 +522,7 @@ const deleteDevice = async ( console.log('Successfully deleted device:', deviceId); console.log(data); } catch (err) { - console.log('Could not delete device:', deviceId, err); + console.error('Could not delete device:', deviceId, err); } // [END iot_delete_device] }; @@ -547,7 +546,7 @@ const clearRegistry = async (client, registryId, projectId, cloudRegion) => { ); devices = data.devices; } catch (err) { - console.log('Could not list devices', err); + console.error('Could not list devices', err); return; } @@ -860,7 +859,7 @@ const getClient = async serviceAccountJson => { try { return google.discoverAPI(discoveryUrl); } catch (err) { - console.log('Error during API discovery.', err); + console.error('Error during API discovery.', err); } }; // [END iot_get_client]