iot: add mqtt gateway samples to GA (#1169)

* iot: add mqtt gateway samples to GA

* iot: update kokoro iot presubmits, codereview check

* iot: update mqttDeviceDemo arguments

* iot: add iot presubmit common.cfg

* iot: fix name for mqtt-http test

* iot: fix flaky test

* iot: lint fix

.kokoro/iot/common.cfg

@@ -0,0 +1,16 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Download trampoline resources. These will be in ${KOKORO_GFILE_DIR}
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Download secrets from Cloud Storage.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/nodejs-docs-samples"
+
+# All builds use the trampoline script to run in docker.
+build_file: "nodejs-docs-samples/.kokoro/trampoline.sh"
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:8-user"
+}

iot/beta-features/gateway/gateway.js

@@ -758,7 +758,6 @@ function sendDataFromBoundDevice(
     if (!success) {
       console.log('Client not connected...');
     } else if (!publishChainInProgress) {
-      // TODO: wait for commands
       console.log('Client connected: Attaching device');
       attachDevice(deviceId, client);
       setTimeout(() => {

iot/http_example/system-test/cloudiot_http_example.test.js

@@ -114,7 +114,7 @@ test(`should send event message`, async t => {
   await tools.runAsync(`${helper} deleteRegistry ${localRegName}`, cwd);
 });
 
-test(`should send event message`, async t => {
+test(`should send state message`, async t => {
   const localDevice = `test-rsa-device`;
   const localRegName = `${registryName}-rsa256`;
   await tools.runAsync(`${helper} setupIotTopic ${topicName}`, cwd);

iot/manager/manager.js

@@ -1381,10 +1381,10 @@ require(`yargs`) // eslint-disable-line
     `Creates a device with the given public key. Public key can be ommitted and added later on.`,
     {
       publicKeyFormat: {
-        default: 'RS256_X509_PEM',
+        default: 'RSA_X509_PEM',
         description: 'Public key format for devices.',
         requiresArg: true,
-        choices: ['RS256_PEM', 'RS256_X509_PEM', 'ES256_PEM', 'ES256_X509_PEM'],
+        choices: ['RSA_PEM', 'RSA_X509_PEM', 'ES256_PEM', 'ES256_X509_PEM'],
         type: 'string',
       },
       publicKeyFile: {
@@ -1671,7 +1671,21 @@ require(`yargs`) // eslint-disable-line
   .command(
     `createGateway <registryId> <gatewayId>`,
     `Creates a gateway`,
-    {},
+    {
+      publicKeyFormat: {
+        default: 'RSA_X509_PEM',
+        description: 'Public key format for devices.',
+        requiresArg: true,
+        choices: ['RSA_PEM', 'RSA_X509_PEM', 'ES256_PEM', 'ES256_X509_PEM'],
+        type: 'string',
+      },
+      publicKeyFile: {
+        description:
+          'Path to the public key file used for device authentication.',
+        requiresArg: true,
+        type: 'string',
+      },
+    },
     opts => {
       const cb = function(client) {
         createGateway(
@@ -1680,8 +1694,8 @@ require(`yargs`) // eslint-disable-line
           opts.cloudRegion,
           opts.registryId,
           opts.gatewayId,
-          opts.publicKeyFile,
-          opts.publicKeyFormat
+          opts.publicKeyFormat,
+          opts.publicKeyFile
         );
       };
       getClient(opts.serviceAccount, cb);

iot/manager/system-test/manager.test.js

@@ -267,7 +267,7 @@ test(`should send command message to device`, async t => {
   );
 
   tools.runAsync(
-    `node cloudiot_mqtt_example_nodejs.js --deviceId=${deviceId} --registryId=${registryName} --privateKeyFile=${rsaPrivateKey} --algorithm=RS256 --numMessages=20 --mqttBridgePort=443`,
+    `node cloudiot_mqtt_example_nodejs.js mqttDeviceDemo --deviceId=${deviceId} --registryId=${registryName} --privateKeyFile=${rsaPrivateKey} --algorithm=RS256 --numMessages=20 --mqttBridgePort=443`,
     path.join(__dirname, '../../mqtt_example')
   );
 
@@ -283,7 +283,7 @@ test(`should send command message to device`, async t => {
 test(`should create a new gateway`, async t => {
   const gatewayId = `nodejs-test-gateway-iot-${uuid.v4()}`;
   let gatewayOut = await tools.runAsync(
-    `${cmd} createGateway ${registryName} ${gatewayId} RS256_X509_PEM ${rsaPublicCert}`
+    `${cmd} createGateway ${registryName} ${gatewayId} RSA_X509_PEM ${rsaPublicCert}`
   );
 
   // test no error on create gateway.
@@ -297,7 +297,7 @@ test(`should create a new gateway`, async t => {
 test(`should list gateways`, async t => {
   const gatewayId = `nodejs-test-gateway-iot-${uuid.v4()}`;
   await tools.runAsync(
-    `${cmd} createGateway ${registryName} ${gatewayId} RS256_X509_PEM ${rsaPublicCert}`
+    `${cmd} createGateway ${registryName} ${gatewayId} RSA_X509_PEM ${rsaPublicCert}`
   );
 
   // look for output in list gateway
@@ -312,7 +312,7 @@ test(`should list gateways`, async t => {
 test(`should bind existing device to gateway`, async t => {
   const gatewayId = `nodejs-test-gateway-iot-${uuid.v4()}`;
   await tools.runAsync(
-    `${cmd} createGateway ${registryName} ${gatewayId} RS256_X509_PEM ${rsaPublicCert}`
+    `${cmd} createGateway ${registryName} ${gatewayId} RSA_X509_PEM ${rsaPublicCert}`
   );
 
   // create device
@@ -350,7 +350,7 @@ test(`should bind existing device to gateway`, async t => {
 test(`should list devices bound to gateway`, async t => {
   const gatewayId = `nodejs-test-gateway-iot-${uuid.v4()}`;
   await tools.runAsync(
-    `${cmd} createGateway ${registryName} ${gatewayId} RS256_X509_PEM ${rsaPublicCert}`
+    `${cmd} createGateway ${registryName} ${gatewayId} RSA_X509_PEM ${rsaPublicCert}`
   );
 
   const deviceId = `nodejs-test-device-iot-${uuid.v4()}`;
@@ -389,7 +389,7 @@ test(`should list devices bound to gateway`, async t => {
 test(`should list gateways for bound device`, async t => {
   const gatewayId = `nodejs-test-gateway-iot-${uuid.v4()}`;
   await tools.runAsync(
-    `${cmd} createGateway ${registryName} ${gatewayId} RS256_X509_PEM ${rsaPublicCert}`
+    `${cmd} createGateway ${registryName} ${gatewayId} RSA_X509_PEM ${rsaPublicCert}`
   );
 
   // create device