Fix the failing lint rules (#338)

benchmark/.eslintrc.yml

@@ -0,0 +1,3 @@
+---
+rules:
+  no-console: off

benchmark/workload.js

@@ -41,14 +41,14 @@ class Workload {
     this.opCounts = {};
     this.totalOpCount = 0;
 
-    for (let operation of OPERATIONS) {
-      let weight = parseFloat(this.options.get(operation));
+    for (const operation of OPERATIONS) {
+      const weight = parseFloat(this.options.get(operation));
 
       if (weight <= 0) {
         continue;
       }
 
-      let shortOpName = operation.replace('proportion', '');
+      const shortOpName = operation.replace('proportion', '');
 
       this.operations.push(shortOpName);
       this.latencies[shortOpName] = [];
@@ -73,11 +73,11 @@ class Workload {
     const end = timeSpan();
 
     for (let i = 0; i < operationCount; i++) {
-      let randomWeight = Math.random() * this.totalWeight;
+      const randomWeight = Math.random() * this.totalWeight;
 
       for (let j = 0; j < this.weights.length; j++) {
-        let weight = this.weights[j];
-        let operation = this.operations[j];
+        const weight = this.weights[j];
+        const operation = this.operations[j];
 
         if (randomWeight <= weight) {
           this.queue.add(() => this.runOperation(operation));
@@ -91,7 +91,7 @@ class Workload {
 
   runOperation(operation) {
     if (typeof this[operation] !== 'function') {
-      throw new Error(`unsupported operation: ${type}`);
+      throw new Error(`unsupported operation: ${operation.type}`);
     }
 
     const end = timeSpan();

benchmark/ycsb.js

@@ -72,8 +72,6 @@ function parseWorkloadFile(filePath) {
 
 function printMetrics(workload) {
   const numBucket = workload.options.get('numBucket');
-  const operationCount = workload.options.get('operationcount');
-
   let totalOps = 0;
 
   workload.operations.forEach(operation => {
@@ -103,12 +101,12 @@ function printMetrics(workload) {
     );
 
     for (let i = 0; i < numBucket; i++) {
-      let hi = bounds.lt(lats, i + 1);
-      let lo = bounds.le(lats, i);
+      const hi = bounds.lt(lats, i + 1);
+      const lo = bounds.le(lats, i);
       console.log(`${opName}, ${i}, ${hi - lo}`);
     }
 
-    let lo = bounds.le(lats, numBucket);
+    const lo = bounds.le(lats, numBucket);
     console.log(`${opName}, ${numBucket}, ${ops - lo}`);
   });
 }

package.json

@@ -61,7 +61,8 @@
     "system-test": "mocha system-test/*.js --timeout 600000",
     "test-no-cover": "mocha test/*.js",
     "test": "npm run cover",
-    "ycsb": "node ./benchmark/ycsb.js  run -P ./benchmark/workloada -p table=usertable -p cloudspanner.instance=ycsb-instance -p operationcount=100 -p cloudspanner.database=ycsb"
+    "ycsb": "node ./benchmark/ycsb.js  run -P ./benchmark/workloada -p table=usertable -p cloudspanner.instance=ycsb-instance -p operationcount=100 -p cloudspanner.database=ycsb",
+    "fix": "eslint --fix '**/*.js' && npm run prettier"
   },
   "dependencies": {
     "@google-cloud/common-grpc": "^0.8.0",

src/codec.js

@@ -237,11 +237,11 @@ function decode(value, field) {
         break;
       }
       case 'STRUCT': {
-        let struct = new Struct();
-        let fields = type.structType.fields;
+        const struct = new Struct();
+        const fields = type.structType.fields;
 
         fields.forEach((field, index) => {
-          let name = field.name;
+          const name = field.name;
           let value = decoded[name] || decoded[index];
 
           value = decodeValue_(value, field.type);
@@ -353,7 +353,7 @@ function getType(field) {
   }
 
   if (Struct.isStruct(field)) {
-    let fields = field.map(function(field) {
+    const fields = field.map(function(field) {
       return {
         name: field.name,
         type: getType(field.value),
@@ -423,14 +423,14 @@ function encodeQuery(query) {
   query = extend({}, query);
 
   if (query.params) {
-    let fields = {};
+    const fields = {};
 
     if (!query.types) {
       query.types = {};
     }
 
-    for (let prop in query.params) {
-      let field = query.params[prop];
+    for (const prop in query.params) {
+      const field = query.params[prop];
 
       if (!query.types[prop]) {
         query.types[prop] = codec.getType(field);
@@ -443,9 +443,9 @@ function encodeQuery(query) {
   }
 
   if (query.types) {
-    let formattedTypes = {};
+    const formattedTypes = {};
 
-    for (let field in query.types) {
+    for (const field in query.types) {
       formattedTypes[field] = codec.createTypeObject(query.types[field]);
     }
 
@@ -523,14 +523,14 @@ function createTypeObject(config) {
     config = {type: config};
   }
 
-  let type = config.type;
+  const type = config.type;
   let code = TYPES.indexOf(type);
 
   if (code === -1) {
     code = 0; // unspecified
   }
 
-  let typeObject = {code};
+  const typeObject = {code};
 
   if (type === 'array') {
     typeObject.arrayElementType = createTypeObject(config.child);
@@ -539,7 +539,7 @@ function createTypeObject(config) {
   if (type === 'struct') {
     typeObject.structType = {};
     typeObject.structType.fields = arrify(config.fields).map(field => {
-      let fieldConfig = is.object(field.type) ? field.type : field;
+      const fieldConfig = is.object(field.type) ? field.type : field;
 
       return {
         name: field.name,

src/index.js

@@ -163,8 +163,8 @@ class Spanner extends Service {
       gapic.v1.InstanceAdminClient,
       gapic.v1.SpannerClient,
     ];
-    for (let clientClass of clientClasses) {
-      for (let scope of clientClass.scopes) {
+    for (const clientClass of clientClasses) {
+      for (const scope of clientClass.scopes) {
         if (scopes.indexOf(scope) === -1) {
           scopes.push(scope);
         }

src/row-builder.js

@@ -101,7 +101,7 @@ class RowBuilder {
   toJSON(rows) {
     return rows.map(values => {
       const formattedRow = values.map((value, index) => {
-        let field = this.fields[index];
+        const field = this.fields[index];
         return {
           name: field.name,
           value: RowBuilder.formatValue(field, value),

src/session-pool.js

@@ -225,7 +225,7 @@ class SessionPool extends EventEmitter {
     this.database = database;
     this.options = Object.assign({}, DEFAULTS, options);
 
-    let {writes} = this.options;
+    const {writes} = this.options;
 
     if (writes < 0 || writes > 1) {
       throw new WritePercentError();
@@ -556,9 +556,9 @@ class SessionPool extends EventEmitter {
     let evicted = 0;
 
     while (count-- > maxIdle && size - evicted++ > min) {
-      let session = idle.pop();
-      let type = session.type;
-      let index = this._inventory[type].indexOf(session);
+      const session = idle.pop();
+      const type = session.type;
+      const index = this._inventory[type].indexOf(session);
 
       this._inventory[type].splice(index, 1);
       this._destroy(session);
@@ -652,8 +652,8 @@ class SessionPool extends EventEmitter {
     const timeout = this.options.acquireTimeout;
 
     if (!is.infinite(timeout)) {
-      let elapsed = Date.now() - startTime;
-      let remaining = timeout - elapsed;
+      const elapsed = Date.now() - startTime;
+      const remaining = timeout - elapsed;
 
       promises.push(delay.reject(remaining, {value: new TimeoutError()}));
     }

src/transaction.js

@@ -725,7 +725,7 @@ class Transaction extends TransactionRequest {
    * @return {object}
    */
   static createDeadlineError_(err) {
-    let apiError = new common.util.ApiError({
+    const apiError = new common.util.ApiError({
       message: 'Deadline for Transaction exceeded.',
       code: DEADLINE_EXCEEDED,
       errors: [err],

src/v1/database_admin_client.js

@@ -202,7 +202,7 @@ class DatabaseAdminClient {
       'getIamPolicy',
       'testIamPermissions',
     ];
-    for (let methodName of databaseAdminStubMethods) {
+    for (const methodName of databaseAdminStubMethods) {
       this._innerApiCalls[methodName] = gax.createApiCall(
         databaseAdminStub.then(
           stub =>

src/v1/instance_admin_client.js

@@ -225,7 +225,7 @@ class InstanceAdminClient {
       'getIamPolicy',
       'testIamPermissions',
     ];
-    for (let methodName of instanceAdminStubMethods) {
+    for (const methodName of instanceAdminStubMethods) {
       this._innerApiCalls[methodName] = gax.createApiCall(
         instanceAdminStub.then(
           stub =>

src/v1/spanner_client.js

@@ -168,7 +168,7 @@ class SpannerClient {
       'partitionQuery',
       'partitionRead',
     ];
-    for (let methodName of spannerStubMethods) {
+    for (const methodName of spannerStubMethods) {
       this._innerApiCalls[methodName] = gax.createApiCall(
         spannerStub.then(
           stub =>

test/database.js

@@ -192,7 +192,6 @@ describe('Database', function() {
     });
 
     it('should inherit from ServiceObject', function(done) {
-      let database;
       const options = {};
 
       const instanceInstance = extend({}, INSTANCE, {
@@ -203,7 +202,7 @@ describe('Database', function() {
         },
       });
 
-      database = new Database(instanceInstance, NAME);
+      const database = new Database(instanceInstance, NAME);
       assert(database instanceof FakeGrpcServiceObject);
 
       const calledWith = database.calledWith_[0];

test/instance.js

@@ -128,9 +128,7 @@ describe('Instance', function() {
     });
 
     it('should inherit from ServiceObject', function(done) {
-      let instance;
       const options = {};
-
       const spannerInstance = extend({}, SPANNER, {
         createInstance: function(name, options_, callback) {
           assert.strictEqual(name, instance.formattedName_);
@@ -139,7 +137,7 @@ describe('Instance', function() {
         },
       });
 
-      instance = new Instance(spannerInstance, NAME);
+      const instance = new Instance(spannerInstance, NAME);
       assert(instance instanceof FakeGrpcServiceObject);
 
       const calledWith = instance.calledWith_[0];

test/session.js

@@ -198,7 +198,7 @@ describe('Session', function() {
     });
 
     it('should pass the transaction options', function(done) {
-      let OPTIONS = {};
+      const OPTIONS = {};
 
       session.transaction = function(options) {
         assert.strictEqual(options, OPTIONS);
@@ -222,7 +222,7 @@ describe('Session', function() {
     });
 
     it('should return any api errors', function(done) {
-      let ERROR = new Error('err');
+      const ERROR = new Error('err');
 
       TRANSACTION.begin = function(callback) {
         callback(ERROR, RESPONSE);

test/transaction.js

@@ -752,7 +752,6 @@ describe('Transaction', function() {
       it('should retry the transaction for UNKNOWN', function(done) {
         const error = {code: 2};
         const fakeDelay = 123;
-        let stream;
         const getRetryDelay = Transaction.getRetryDelay_;
 
         Transaction.getRetryDelay_ = function(err) {
@@ -774,7 +773,7 @@ describe('Transaction', function() {
           done();
         };
 
-        stream = transaction.requestStream(config);
+        const stream = transaction.requestStream(config);
         stream.on('error', done); // should not be called
 
         fakeStream.emit('error', error);
@@ -783,8 +782,6 @@ describe('Transaction', function() {
       it('should retry the transaction for ABORTED', function(done) {
         const error = {code: 10};
         const fakeDelay = 123;
-        let stream;
-
         const getRetryDelay = Transaction.getRetryDelay_;
 
         Transaction.getRetryDelay_ = function(err) {
@@ -806,16 +803,14 @@ describe('Transaction', function() {
           done();
         };
 
-        stream = transaction.requestStream(config);
+        const stream = transaction.requestStream(config);
         stream.on('error', done); // should not be called
 
         fakeStream.emit('error', error);
       });
 
       it('should send a deadline error to the runFn', function(done) {
         const error = {code: 10};
-        let stream;
-
         const deadlineError = {};
         const createDeadlineError = Transaction.createDeadlineError_;
 
@@ -839,9 +834,8 @@ describe('Transaction', function() {
           done();
         };
 
-        stream = transaction.requestStream(config);
+        const stream = transaction.requestStream(config);
         stream.on('error', done); // should not be called
-
         fakeStream.emit('error', error);
       });
     });