ESLint: Node 8+ WARNINGs --> ERRORs

.eslintrc.yml

@@ -20,13 +20,13 @@ rules:
   prefer-const: error
   no-var: error
   prefer-arrow-callback: error
-  no-throw-literal: warn
-  require-await: warn
-  promise/prefer-await-to-then: warn
-  promise/no-nesting: warn
-  prefer-destructuring: warn
-  prefer-template: warn
+  no-throw-literal: error
+  require-await: error
+  promise/prefer-await-to-then: error
+  promise/no-nesting: error
+  prefer-destructuring: error
+  prefer-template: error
   func-style:
-    - 1
+    - error
     - expression
     - allowArrowFunctions: true

cloud-sql/mysql/mysql/server.js

@@ -156,7 +156,7 @@ app.post('/', async (req, res) => {
 
   res
     .status(200)
-    .send('Successfully voted for ' + team + ' at ' + timestamp)
+    .send(`Successfully voted for ${team} at ${timestamp}`)
     .end();
 });
 

cloud-sql/postgres/knex/server.js

@@ -47,9 +47,7 @@ const logger = winston.createLogger({
 
 // [START cloud_sql_postgres_connection_pool]
 // Initialize Knex, a Node.js SQL query builder library with built-in connection pooling.
-const knex = connect();
-
-function connect() {
+const connect = () => {
   // Configure which instance and what database user to connect with.
   // Remember - storing secrets in plaintext is potentially unsafe. Consider using
   // something like https://cloud.google.com/kms/ to help keep secrets secret.
@@ -101,8 +99,10 @@ function connect() {
 
   // [END_EXCLUDE]
   return knex;
-  // [END cloud_sql_postgres_connection_pool]
-}
+};
+
+const knex = connect();
+// [END cloud_sql_postgres_connection_pool]
 
 // [START cloud_sql_example_statement]
 /**
@@ -112,13 +112,13 @@ function connect() {
  * @param {object} vote The vote record to insert.
  * @returns {Promise}
  */
-async function insertVote(knex, vote) {
+const insertVote = async (knex, vote) => {
   try {
     return await knex('votes').insert(vote);
   } catch (err) {
     throw Error(err);
   }
-}
+};
 // [END cloud_sql_example_statement]
 
 /**
@@ -127,13 +127,13 @@ async function insertVote(knex, vote) {
  * @param {object} knex The Knex connection object.
  * @returns {Promise}
  */
-async function getVotes(knex) {
+const getVotes = async knex => {
   return await knex
     .select('candidate', 'time_cast')
     .from('votes')
     .orderBy('time_cast', 'desc')
     .limit(5);
-}
+};
 
 /**
  * Retrieve the total count of records for a given candidate
@@ -143,11 +143,11 @@ async function getVotes(knex) {
  * @param {object} candidate The candidate for which to get the total vote count
  * @returns {Promise}
  */
-async function getVoteCount(knex, candidate) {
+const getVoteCount = async (knex, candidate) => {
   return await knex('votes')
     .count('vote_id')
     .where('candidate', candidate);
-}
+};
 
 app.get('/', (req, res) => {
   (async function() {
@@ -212,7 +212,7 @@ app.post('/', async (req, res) => {
   try {
     await insertVote(knex, vote);
   } catch (err) {
-    logger.error('Error while attempting to submit vote:' + err);
+    logger.error(`Error while attempting to submit vote:${err}`);
     res
       .status(500)
       .send('Unable to cast vote; see logs for more details.')

datacatalog/cloud-client/lookupEntry.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-warning-comments */
+
 /**
  * Copyright 2019 Google Inc. All Rights Reserved.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,32 +24,31 @@
  * For more information, see the README.md under /datacatalog and the
  * documentation at https://cloud.google.com/data-catalog/docs.
  */
-function main(
+const main = async (
   projectId = process.env.GCLOUD_PROJECT,
   datasetId = process.env.GCLOUD_DATASET_ID
-) {
+) => {
   // [START datacatalog_lookup_dataset]
   // -------------------------------
   // Import required modules.
   // -------------------------------
   const {DataCatalogClient} = require('@google-cloud/datacatalog').v1beta1;
   const datacatalog = new DataCatalogClient();
 
-  async function lookup() {
+  const lookup = async () => {
     // TODO(developer): Uncomment the following lines before running the sample.
     // const projectId = 'my-project'
     // const datasetId = 'my_dataset'
     const resourceName = `//bigquery.googleapis.com/projects/${projectId}/datasets/${datasetId}`;
     const request = {linkedResource: resourceName};
     const [result] = await datacatalog.lookupEntry(request);
     return result;
-  }
+  };
 
-  lookup().then(response => {
-    console.log(response);
-  });
+  const response = await lookup();
+  console.log(response);
   // [END datacatalog_lookup_dataset]
-}
+};
 
 // node lookupEntry.js <projectId> <datasetID>
 main(...process.argv.slice(2));

endpoints/getting-started-grpc/client.js

@@ -15,7 +15,7 @@
 
 'use strict';
 
-function makeGrpcRequest(JWT_AUTH_TOKEN, API_KEY, HOST, GREETEE) {
+const makeGrpcRequest = (JWT_AUTH_TOKEN, API_KEY, HOST, GREETEE) => {
   // Uncomment these lines to set their values
   // const JWT_AUTH_TOKEN = 'YOUR_JWT_AUTH_TOKEN';
   // const API_KEY = 'YOUR_API_KEY';
@@ -51,7 +51,7 @@ function makeGrpcRequest(JWT_AUTH_TOKEN, API_KEY, HOST, GREETEE) {
       console.log(response.message);
     }
   });
-}
+};
 
 // The command-line program
 const {argv} = require('yargs')

endpoints/getting-started-grpc/server.js

@@ -22,17 +22,17 @@ const grpc = require('grpc');
 const helloProto = grpc.load(PROTO_PATH).helloworld;
 
 // Implement the SayHello RPC method.
-function sayHello(call, callback) {
+const sayHello = (call, callback) => {
   callback(null, {message: `Hello ${call.request.name}`});
-}
+};
 
 // Start an RPC server to handle Greeter service requests
-function startServer(PORT) {
+const startServer = PORT => {
   const server = new grpc.Server();
   server.addProtoService(helloProto.Greeter.service, {sayHello: sayHello});
   server.bind(`0.0.0.0:${PORT}`, grpc.ServerCredentials.createInsecure());
   server.start();
-}
+};
 
 // The command-line program
 const {argv} = require('yargs')

endpoints/getting-started/app.js

@@ -33,7 +33,7 @@ app.post('/echo', (req, res) => {
     .end();
 });
 
-function authInfoHandler(req, res) {
+const authInfoHandler = (req, res) => {
   let authUser = {id: 'anonymous'};
   const encodedInfo = req.get('X-Endpoint-API-UserInfo');
   if (encodedInfo) {
@@ -43,7 +43,7 @@ function authInfoHandler(req, res) {
     .status(200)
     .json(authUser)
     .end();
-}
+};
 
 app.get('/auth/info/googlejwt', authInfoHandler);
 app.get('/auth/info/googleidtoken', authInfoHandler);

endpoints/getting-started/test/app.test.js

@@ -25,7 +25,7 @@ const tools = require('@google-cloud/nodejs-repo-tools');
 
 const SAMPLE_PATH = path.join(__dirname, '../app.js');
 
-function getSample() {
+const getSample = () => {
   const testApp = express();
   sinon.stub(testApp, 'listen').callsArg(1);
   const expressMock = sinon.stub().returns(testApp);
@@ -39,7 +39,7 @@ function getSample() {
       express: expressMock,
     },
   };
-}
+};
 
 beforeEach(tools.stubConsole);
 afterEach(tools.restoreConsole);

functions/billing/index.js

@@ -187,7 +187,7 @@ const _stopInstances = async (projectId, zone, instanceNames) => {
           instance: instanceName,
         })
         .then(res => {
-          console.log('Instance stopped successfully: ' + instanceName);
+          console.log(`Instance stopped successfully: ${instanceName}`);
           return res.data;
         });
     })

functions/composer-storage-trigger/test/index.test.js

@@ -19,7 +19,7 @@ const proxyquire = require('proxyquire').noCallThru();
 const sinon = require('sinon');
 const assert = require('assert');
 
-function getSample(FetchStub) {
+const getSample = FetchStub => {
   return {
     program: proxyquire('../', {
       'node-fetch': FetchStub,
@@ -28,7 +28,7 @@ function getSample(FetchStub) {
       fetch: FetchStub,
     },
   };
-}
+};
 
 it('Handles error in JSON body', async () => {
   const event = {

functions/env_vars/test/index.test.js

@@ -19,7 +19,7 @@ const sinon = require('sinon');
 const assert = require('assert');
 const functions = require('../');
 
-function getMocks() {
+const getMocks = () => {
   const req = {};
   const res = {
     send: sinon.stub().returnsThis(),
@@ -29,7 +29,7 @@ function getMocks() {
     req: req,
     res: res,
   };
-}
+};
 
 it('should read env vars', () => {
   const mocks = getMocks();

functions/firebase/index.js

@@ -114,7 +114,7 @@ exports.helloAnalytics = event => {
   const {resource} = event;
   console.log(`Function triggered by the following event: ${resource}`);
 
-  const analyticsEvent = event.data.eventDim[0];
+  const [analyticsEvent] = event.data.eventDim;
   console.log(`Name: ${analyticsEvent.name}`);
   console.log(`Timestamp: ${new Date(analyticsEvent.timestampMicros / 1000)}`);
 

functions/firebase/test/index.test.js

@@ -20,7 +20,7 @@ const sinon = require('sinon');
 const assert = require('assert');
 const tools = require('@google-cloud/nodejs-repo-tools');
 
-function getSample() {
+const getSample = () => {
   const firestoreMock = {
     doc: sinon.stub().returnsThis(),
     set: sinon.stub(),
@@ -34,7 +34,7 @@ function getSample() {
       firestore: firestoreMock,
     },
   };
-}
+};
 
 beforeEach(tools.stubConsole);
 afterEach(tools.restoreConsole);

functions/http/index.js

@@ -31,7 +31,7 @@ exports.helloContent = (req, res) => {
   switch (req.get('content-type')) {
     // '{"name":"John"}'
     case 'application/json':
-      name = req.body.name;
+      name = req.body;
       break;
 
     // 'John', stored in a Buffer
@@ -46,7 +46,7 @@ exports.helloContent = (req, res) => {
 
     // 'name=John' in the body of a POST request (not the URL)
     case 'application/x-www-form-urlencoded':
-      name = req.body.name;
+      name = req.body;
       break;
   }
 
@@ -167,15 +167,15 @@ exports.uploadFile = (req, res) => {
 
   // Triggered once all uploaded files are processed by Busboy.
   // We still need to wait for the disk writes (saves) to complete.
-  busboy.on('finish', () => {
-    Promise.all(fileWrites).then(() => {
-      // TODO(developer): Process saved files here
-      for (const name in uploads) {
-        const file = uploads[name];
-        fs.unlinkSync(file);
-      }
-      res.send();
-    });
+  busboy.on('finish', async () => {
+    await Promise.all(fileWrites);
+
+    // TODO(developer): Process saved files here
+    for (const name in uploads) {
+      const file = uploads[name];
+      fs.unlinkSync(file);
+    }
+    res.send();
   });
 
   busboy.end(req.rawBody);

functions/http/test/index.test.js

@@ -21,7 +21,7 @@ const assert = require('assert');
 const uuid = require('uuid');
 const tools = require('@google-cloud/nodejs-repo-tools');
 
-function getSample() {
+const getSample = () => {
   const requestPromise = sinon
     .stub()
     .returns(new Promise(resolve => resolve('test')));
@@ -34,9 +34,9 @@ function getSample() {
       requestPromise: requestPromise,
     },
   };
-}
+};
 
-function getMocks() {
+const getMocks = () => {
   const req = {
     headers: {},
     get: function(header) {
@@ -65,7 +65,7 @@ function getMocks() {
       status: sinon.stub().returnsThis(),
     },
   };
-}
+};
 
 beforeEach(tools.stubConsole);
 afterEach(tools.restoreConsole);

functions/imagemagick/test/index.test.js

@@ -41,7 +41,7 @@ const testFiles = {
   offensive: 'zombie.jpg',
 };
 
-describe('functions/imagemagick tests', async () => {
+describe('functions/imagemagick tests', () => {
   let startFF, stopFF;
 
   before(async () => {