diff --git a/samples/generated/v1/device_manager.bind_device_to_gateway.js b/samples/generated/v1/device_manager.bind_device_to_gateway.js index e5d0348f..8c901cc0 100644 --- a/samples/generated/v1/device_manager.bind_device_to_gateway.js +++ b/samples/generated/v1/device_manager.bind_device_to_gateway.js @@ -23,6 +23,9 @@ function main(parent, gatewayId, deviceId) { // [START cloudiot_v1_generated_DeviceManager_BindDeviceToGateway_async] /** + * This snippet has been automatically generated and should be regarded as a code template only. + * It will require modifications to work. + * It may require correct/in-range values for request initialization. * TODO(developer): Uncomment these variables before running the sample. */ /** diff --git a/samples/generated/v1/device_manager.create_device.js b/samples/generated/v1/device_manager.create_device.js index d38142b0..ee99565e 100644 --- a/samples/generated/v1/device_manager.create_device.js +++ b/samples/generated/v1/device_manager.create_device.js @@ -23,6 +23,9 @@ function main(parent, device) { // [START cloudiot_v1_generated_DeviceManager_CreateDevice_async] /** + * This snippet has been automatically generated and should be regarded as a code template only. + * It will require modifications to work. + * It may require correct/in-range values for request initialization. * TODO(developer): Uncomment these variables before running the sample. */ /** diff --git a/samples/generated/v1/device_manager.create_device_registry.js b/samples/generated/v1/device_manager.create_device_registry.js index 6248800b..7ea41299 100644 --- a/samples/generated/v1/device_manager.create_device_registry.js +++ b/samples/generated/v1/device_manager.create_device_registry.js @@ -23,6 +23,9 @@ function main(parent, deviceRegistry) { // [START cloudiot_v1_generated_DeviceManager_CreateDeviceRegistry_async] /** + * This snippet has been automatically generated and should be regarded as a code template only. + * It will require modifications to work. + * It may require correct/in-range values for request initialization. * TODO(developer): Uncomment these variables before running the sample. */ /** diff --git a/samples/generated/v1/device_manager.delete_device.js b/samples/generated/v1/device_manager.delete_device.js index ab1999e2..e981a8a7 100644 --- a/samples/generated/v1/device_manager.delete_device.js +++ b/samples/generated/v1/device_manager.delete_device.js @@ -23,6 +23,9 @@ function main(name) { // [START cloudiot_v1_generated_DeviceManager_DeleteDevice_async] /** + * This snippet has been automatically generated and should be regarded as a code template only. + * It will require modifications to work. + * It may require correct/in-range values for request initialization. * TODO(developer): Uncomment these variables before running the sample. */ /** diff --git a/samples/generated/v1/device_manager.delete_device_registry.js b/samples/generated/v1/device_manager.delete_device_registry.js index 663be451..37f5d2ad 100644 --- a/samples/generated/v1/device_manager.delete_device_registry.js +++ b/samples/generated/v1/device_manager.delete_device_registry.js @@ -23,6 +23,9 @@ function main(name) { // [START cloudiot_v1_generated_DeviceManager_DeleteDeviceRegistry_async] /** + * This snippet has been automatically generated and should be regarded as a code template only. + * It will require modifications to work. + * It may require correct/in-range values for request initialization. * TODO(developer): Uncomment these variables before running the sample. */ /** diff --git a/samples/generated/v1/device_manager.get_device.js b/samples/generated/v1/device_manager.get_device.js index db5022fb..97bdebc6 100644 --- a/samples/generated/v1/device_manager.get_device.js +++ b/samples/generated/v1/device_manager.get_device.js @@ -23,6 +23,9 @@ function main(name) { // [START cloudiot_v1_generated_DeviceManager_GetDevice_async] /** + * This snippet has been automatically generated and should be regarded as a code template only. + * It will require modifications to work. + * It may require correct/in-range values for request initialization. * TODO(developer): Uncomment these variables before running the sample. */ /** diff --git a/samples/generated/v1/device_manager.get_device_registry.js b/samples/generated/v1/device_manager.get_device_registry.js index 7cbb7241..2ec184f4 100644 --- a/samples/generated/v1/device_manager.get_device_registry.js +++ b/samples/generated/v1/device_manager.get_device_registry.js @@ -23,6 +23,9 @@ function main(name) { // [START cloudiot_v1_generated_DeviceManager_GetDeviceRegistry_async] /** + * This snippet has been automatically generated and should be regarded as a code template only. + * It will require modifications to work. + * It may require correct/in-range values for request initialization. * TODO(developer): Uncomment these variables before running the sample. */ /** diff --git a/samples/generated/v1/device_manager.get_iam_policy.js b/samples/generated/v1/device_manager.get_iam_policy.js index 039b3941..05f5ad9f 100644 --- a/samples/generated/v1/device_manager.get_iam_policy.js +++ b/samples/generated/v1/device_manager.get_iam_policy.js @@ -23,6 +23,9 @@ function main(resource) { // [START cloudiot_v1_generated_DeviceManager_GetIamPolicy_async] /** + * This snippet has been automatically generated and should be regarded as a code template only. + * It will require modifications to work. + * It may require correct/in-range values for request initialization. * TODO(developer): Uncomment these variables before running the sample. */ /** diff --git a/samples/generated/v1/device_manager.list_device_config_versions.js b/samples/generated/v1/device_manager.list_device_config_versions.js index be6a024d..2b4d1e01 100644 --- a/samples/generated/v1/device_manager.list_device_config_versions.js +++ b/samples/generated/v1/device_manager.list_device_config_versions.js @@ -23,6 +23,9 @@ function main(name) { // [START cloudiot_v1_generated_DeviceManager_ListDeviceConfigVersions_async] /** + * This snippet has been automatically generated and should be regarded as a code template only. + * It will require modifications to work. + * It may require correct/in-range values for request initialization. * TODO(developer): Uncomment these variables before running the sample. */ /** diff --git a/samples/generated/v1/device_manager.list_device_registries.js b/samples/generated/v1/device_manager.list_device_registries.js index d7853e34..344f409e 100644 --- a/samples/generated/v1/device_manager.list_device_registries.js +++ b/samples/generated/v1/device_manager.list_device_registries.js @@ -23,6 +23,9 @@ function main(parent) { // [START cloudiot_v1_generated_DeviceManager_ListDeviceRegistries_async] /** + * This snippet has been automatically generated and should be regarded as a code template only. + * It will require modifications to work. + * It may require correct/in-range values for request initialization. * TODO(developer): Uncomment these variables before running the sample. */ /** diff --git a/samples/generated/v1/device_manager.list_device_states.js b/samples/generated/v1/device_manager.list_device_states.js index d9c8519d..a6323204 100644 --- a/samples/generated/v1/device_manager.list_device_states.js +++ b/samples/generated/v1/device_manager.list_device_states.js @@ -23,6 +23,9 @@ function main(name) { // [START cloudiot_v1_generated_DeviceManager_ListDeviceStates_async] /** + * This snippet has been automatically generated and should be regarded as a code template only. + * It will require modifications to work. + * It may require correct/in-range values for request initialization. * TODO(developer): Uncomment these variables before running the sample. */ /** diff --git a/samples/generated/v1/device_manager.list_devices.js b/samples/generated/v1/device_manager.list_devices.js index 7e33937a..f8751e6c 100644 --- a/samples/generated/v1/device_manager.list_devices.js +++ b/samples/generated/v1/device_manager.list_devices.js @@ -23,6 +23,9 @@ function main(parent) { // [START cloudiot_v1_generated_DeviceManager_ListDevices_async] /** + * This snippet has been automatically generated and should be regarded as a code template only. + * It will require modifications to work. + * It may require correct/in-range values for request initialization. * TODO(developer): Uncomment these variables before running the sample. */ /** diff --git a/samples/generated/v1/device_manager.modify_cloud_to_device_config.js b/samples/generated/v1/device_manager.modify_cloud_to_device_config.js index 9e415682..8a6968b0 100644 --- a/samples/generated/v1/device_manager.modify_cloud_to_device_config.js +++ b/samples/generated/v1/device_manager.modify_cloud_to_device_config.js @@ -23,6 +23,9 @@ function main(name, binaryData) { // [START cloudiot_v1_generated_DeviceManager_ModifyCloudToDeviceConfig_async] /** + * This snippet has been automatically generated and should be regarded as a code template only. + * It will require modifications to work. + * It may require correct/in-range values for request initialization. * TODO(developer): Uncomment these variables before running the sample. */ /** diff --git a/samples/generated/v1/device_manager.send_command_to_device.js b/samples/generated/v1/device_manager.send_command_to_device.js index df399716..ba46cd8d 100644 --- a/samples/generated/v1/device_manager.send_command_to_device.js +++ b/samples/generated/v1/device_manager.send_command_to_device.js @@ -23,6 +23,9 @@ function main(name, binaryData) { // [START cloudiot_v1_generated_DeviceManager_SendCommandToDevice_async] /** + * This snippet has been automatically generated and should be regarded as a code template only. + * It will require modifications to work. + * It may require correct/in-range values for request initialization. * TODO(developer): Uncomment these variables before running the sample. */ /** diff --git a/samples/generated/v1/device_manager.set_iam_policy.js b/samples/generated/v1/device_manager.set_iam_policy.js index 05ba74e3..87f44955 100644 --- a/samples/generated/v1/device_manager.set_iam_policy.js +++ b/samples/generated/v1/device_manager.set_iam_policy.js @@ -23,6 +23,9 @@ function main(resource, policy) { // [START cloudiot_v1_generated_DeviceManager_SetIamPolicy_async] /** + * This snippet has been automatically generated and should be regarded as a code template only. + * It will require modifications to work. + * It may require correct/in-range values for request initialization. * TODO(developer): Uncomment these variables before running the sample. */ /** diff --git a/samples/generated/v1/device_manager.test_iam_permissions.js b/samples/generated/v1/device_manager.test_iam_permissions.js index 81f299d3..d13cb26b 100644 --- a/samples/generated/v1/device_manager.test_iam_permissions.js +++ b/samples/generated/v1/device_manager.test_iam_permissions.js @@ -23,6 +23,9 @@ function main(resource, permissions) { // [START cloudiot_v1_generated_DeviceManager_TestIamPermissions_async] /** + * This snippet has been automatically generated and should be regarded as a code template only. + * It will require modifications to work. + * It may require correct/in-range values for request initialization. * TODO(developer): Uncomment these variables before running the sample. */ /** diff --git a/samples/generated/v1/device_manager.unbind_device_from_gateway.js b/samples/generated/v1/device_manager.unbind_device_from_gateway.js index 37fb81b5..5341f2f0 100644 --- a/samples/generated/v1/device_manager.unbind_device_from_gateway.js +++ b/samples/generated/v1/device_manager.unbind_device_from_gateway.js @@ -23,6 +23,9 @@ function main(parent, gatewayId, deviceId) { // [START cloudiot_v1_generated_DeviceManager_UnbindDeviceFromGateway_async] /** + * This snippet has been automatically generated and should be regarded as a code template only. + * It will require modifications to work. + * It may require correct/in-range values for request initialization. * TODO(developer): Uncomment these variables before running the sample. */ /** diff --git a/samples/generated/v1/device_manager.update_device.js b/samples/generated/v1/device_manager.update_device.js index f2c21788..62a144d1 100644 --- a/samples/generated/v1/device_manager.update_device.js +++ b/samples/generated/v1/device_manager.update_device.js @@ -23,6 +23,9 @@ function main(device, updateMask) { // [START cloudiot_v1_generated_DeviceManager_UpdateDevice_async] /** + * This snippet has been automatically generated and should be regarded as a code template only. + * It will require modifications to work. + * It may require correct/in-range values for request initialization. * TODO(developer): Uncomment these variables before running the sample. */ /** diff --git a/samples/generated/v1/device_manager.update_device_registry.js b/samples/generated/v1/device_manager.update_device_registry.js index c3a34b16..06843ef1 100644 --- a/samples/generated/v1/device_manager.update_device_registry.js +++ b/samples/generated/v1/device_manager.update_device_registry.js @@ -23,6 +23,9 @@ function main(deviceRegistry, updateMask) { // [START cloudiot_v1_generated_DeviceManager_UpdateDeviceRegistry_async] /** + * This snippet has been automatically generated and should be regarded as a code template only. + * It will require modifications to work. + * It may require correct/in-range values for request initialization. * TODO(developer): Uncomment these variables before running the sample. */ /** diff --git a/samples/generated/v1/snippet_metadata.google.cloud.iot.v1.json b/samples/generated/v1/snippet_metadata.google.cloud.iot.v1.json index 13c5a252..f3a41c0f 100644 --- a/samples/generated/v1/snippet_metadata.google.cloud.iot.v1.json +++ b/samples/generated/v1/snippet_metadata.google.cloud.iot.v1.json @@ -22,7 +22,7 @@ "segments": [ { "start": 25, - "end": 58, + "end": 61, "type": "FULL" } ], @@ -66,7 +66,7 @@ "segments": [ { "start": 25, - "end": 51, + "end": 54, "type": "FULL" } ], @@ -106,7 +106,7 @@ "segments": [ { "start": 25, - "end": 61, + "end": 64, "type": "FULL" } ], @@ -150,7 +150,7 @@ "segments": [ { "start": 25, - "end": 51, + "end": 54, "type": "FULL" } ], @@ -190,7 +190,7 @@ "segments": [ { "start": 25, - "end": 66, + "end": 69, "type": "FULL" } ], @@ -238,7 +238,7 @@ "segments": [ { "start": 25, - "end": 59, + "end": 62, "type": "FULL" } ], @@ -282,7 +282,7 @@ "segments": [ { "start": 25, - "end": 58, + "end": 61, "type": "FULL" } ], @@ -326,7 +326,7 @@ "segments": [ { "start": 25, - "end": 61, + "end": 64, "type": "FULL" } ], @@ -370,7 +370,7 @@ "segments": [ { "start": 25, - "end": 52, + "end": 55, "type": "FULL" } ], @@ -410,7 +410,7 @@ "segments": [ { "start": 25, - "end": 87, + "end": 90, "type": "FULL" } ], @@ -474,7 +474,7 @@ "segments": [ { "start": 25, - "end": 65, + "end": 68, "type": "FULL" } ], @@ -522,7 +522,7 @@ "segments": [ { "start": 25, - "end": 58, + "end": 61, "type": "FULL" } ], @@ -566,7 +566,7 @@ "segments": [ { "start": 25, - "end": 58, + "end": 61, "type": "FULL" } ], @@ -610,7 +610,7 @@ "segments": [ { "start": 25, - "end": 66, + "end": 69, "type": "FULL" } ], @@ -658,7 +658,7 @@ "segments": [ { "start": 25, - "end": 56, + "end": 59, "type": "FULL" } ], @@ -702,7 +702,7 @@ "segments": [ { "start": 25, - "end": 59, + "end": 62, "type": "FULL" } ], @@ -746,7 +746,7 @@ "segments": [ { "start": 25, - "end": 65, + "end": 68, "type": "FULL" } ], @@ -794,7 +794,7 @@ "segments": [ { "start": 25, - "end": 64, + "end": 67, "type": "FULL" } ], @@ -842,7 +842,7 @@ "segments": [ { "start": 25, - "end": 64, + "end": 67, "type": "FULL" } ], diff --git a/src/v1/device_manager_client.ts b/src/v1/device_manager_client.ts index 948db8bc..3b85af18 100644 --- a/src/v1/device_manager_client.ts +++ b/src/v1/device_manager_client.ts @@ -28,7 +28,6 @@ import { } from 'google-gax'; import {Transform} from 'stream'; -import {RequestType} from 'google-gax/build/src/apitypes'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); /** @@ -279,7 +278,8 @@ export class DeviceManagerClient { const apiCall = this._gaxModule.createApiCall( callPromise, this._defaults[methodName], - descriptor + descriptor, + this._opts.fallback ); this.innerApiCalls[methodName] = apiCall; @@ -2101,7 +2101,7 @@ export class DeviceManagerClient { const callSettings = defaultCallSettings.merge(options); this.initialize(); return this.descriptors.page.listDeviceRegistries.createStream( - this.innerApiCalls.listDeviceRegistries as gax.GaxCall, + this.innerApiCalls.listDeviceRegistries as GaxCall, request, callSettings ); @@ -2155,7 +2155,7 @@ export class DeviceManagerClient { this.initialize(); return this.descriptors.page.listDeviceRegistries.asyncIterate( this.innerApiCalls['listDeviceRegistries'] as GaxCall, - request as unknown as RequestType, + request as {}, callSettings ) as AsyncIterable; } @@ -2326,7 +2326,7 @@ export class DeviceManagerClient { const callSettings = defaultCallSettings.merge(options); this.initialize(); return this.descriptors.page.listDevices.createStream( - this.innerApiCalls.listDevices as gax.GaxCall, + this.innerApiCalls.listDevices as GaxCall, request, callSettings ); @@ -2393,7 +2393,7 @@ export class DeviceManagerClient { this.initialize(); return this.descriptors.page.listDevices.asyncIterate( this.innerApiCalls['listDevices'] as GaxCall, - request as unknown as RequestType, + request as {}, callSettings ) as AsyncIterable; } diff --git a/test/gapic_device_manager_v1.ts b/test/gapic_device_manager_v1.ts index d2d77742..de9ed037 100644 --- a/test/gapic_device_manager_v1.ts +++ b/test/gapic_device_manager_v1.ts @@ -113,99 +113,103 @@ function stubAsyncIterationCall( } describe('v1.DeviceManagerClient', () => { - it('has servicePath', () => { - const servicePath = devicemanagerModule.v1.DeviceManagerClient.servicePath; - assert(servicePath); - }); - - it('has apiEndpoint', () => { - const apiEndpoint = devicemanagerModule.v1.DeviceManagerClient.apiEndpoint; - assert(apiEndpoint); - }); - - it('has port', () => { - const port = devicemanagerModule.v1.DeviceManagerClient.port; - assert(port); - assert(typeof port === 'number'); - }); + describe('Common methods', () => { + it('has servicePath', () => { + const servicePath = + devicemanagerModule.v1.DeviceManagerClient.servicePath; + assert(servicePath); + }); - it('should create a client with no option', () => { - const client = new devicemanagerModule.v1.DeviceManagerClient(); - assert(client); - }); + it('has apiEndpoint', () => { + const apiEndpoint = + devicemanagerModule.v1.DeviceManagerClient.apiEndpoint; + assert(apiEndpoint); + }); - it('should create a client with gRPC fallback', () => { - const client = new devicemanagerModule.v1.DeviceManagerClient({ - fallback: true, + it('has port', () => { + const port = devicemanagerModule.v1.DeviceManagerClient.port; + assert(port); + assert(typeof port === 'number'); }); - assert(client); - }); - it('has initialize method and supports deferred initialization', async () => { - const client = new devicemanagerModule.v1.DeviceManagerClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', + it('should create a client with no option', () => { + const client = new devicemanagerModule.v1.DeviceManagerClient(); + assert(client); }); - assert.strictEqual(client.deviceManagerStub, undefined); - await client.initialize(); - assert(client.deviceManagerStub); - }); - it('has close method for the initialized client', done => { - const client = new devicemanagerModule.v1.DeviceManagerClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', + it('should create a client with gRPC fallback', () => { + const client = new devicemanagerModule.v1.DeviceManagerClient({ + fallback: true, + }); + assert(client); }); - client.initialize(); - assert(client.deviceManagerStub); - client.close().then(() => { - done(); + + it('has initialize method and supports deferred initialization', async () => { + const client = new devicemanagerModule.v1.DeviceManagerClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + assert.strictEqual(client.deviceManagerStub, undefined); + await client.initialize(); + assert(client.deviceManagerStub); }); - }); - it('has close method for the non-initialized client', done => { - const client = new devicemanagerModule.v1.DeviceManagerClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', + it('has close method for the initialized client', done => { + const client = new devicemanagerModule.v1.DeviceManagerClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + assert(client.deviceManagerStub); + client.close().then(() => { + done(); + }); }); - assert.strictEqual(client.deviceManagerStub, undefined); - client.close().then(() => { - done(); + + it('has close method for the non-initialized client', done => { + const client = new devicemanagerModule.v1.DeviceManagerClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + assert.strictEqual(client.deviceManagerStub, undefined); + client.close().then(() => { + done(); + }); }); - }); - it('has getProjectId method', async () => { - const fakeProjectId = 'fake-project-id'; - const client = new devicemanagerModule.v1.DeviceManagerClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', + it('has getProjectId method', async () => { + const fakeProjectId = 'fake-project-id'; + const client = new devicemanagerModule.v1.DeviceManagerClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.auth.getProjectId = sinon.stub().resolves(fakeProjectId); + const result = await client.getProjectId(); + assert.strictEqual(result, fakeProjectId); + assert((client.auth.getProjectId as SinonStub).calledWithExactly()); }); - client.auth.getProjectId = sinon.stub().resolves(fakeProjectId); - const result = await client.getProjectId(); - assert.strictEqual(result, fakeProjectId); - assert((client.auth.getProjectId as SinonStub).calledWithExactly()); - }); - it('has getProjectId method with callback', async () => { - const fakeProjectId = 'fake-project-id'; - const client = new devicemanagerModule.v1.DeviceManagerClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - client.auth.getProjectId = sinon - .stub() - .callsArgWith(0, null, fakeProjectId); - const promise = new Promise((resolve, reject) => { - client.getProjectId((err?: Error | null, projectId?: string | null) => { - if (err) { - reject(err); - } else { - resolve(projectId); - } + it('has getProjectId method with callback', async () => { + const fakeProjectId = 'fake-project-id'; + const client = new devicemanagerModule.v1.DeviceManagerClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.auth.getProjectId = sinon + .stub() + .callsArgWith(0, null, fakeProjectId); + const promise = new Promise((resolve, reject) => { + client.getProjectId((err?: Error | null, projectId?: string | null) => { + if (err) { + reject(err); + } else { + resolve(projectId); + } + }); }); + const result = await promise; + assert.strictEqual(result, fakeProjectId); }); - const result = await promise; - assert.strictEqual(result, fakeProjectId); }); describe('createDeviceRegistry', () => {