refactor(linter): Upgrade godaddy-style

* Do a lint pass; and * add lint checks to the test script.
godaddy · May 14, 2017 · ef8cfcb · ef8cfcb
1 parent 087fe38
commit ef8cfcb
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 47 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,7 +1,5 @@
 {
-  "extends": [
-    "./node_modules/godaddy-style/dist/.eslintrc"
-  ],
+  "extends": "godaddy",
   "rules": {
     "strict": 0
   }

diff --git a/lib/api.js b/lib/api.js
@@ -7,9 +7,9 @@ const Batch = require('./batch');
 const Rbac = require('./rbac');
 
 const groups = {
-  extensions: Extensions,
-  apps: Apps,
-  batch: Batch,
+  'extensions': Extensions,
+  'apps': Apps,
+  'batch': Batch,
   'rbac.authorization.k8s.io': Rbac
 };
 

diff --git a/lib/config.js b/lib/config.js
@@ -22,7 +22,7 @@ function getInCluster() {
   const port = process.env.KUBERNETES_SERVICE_PORT;
 
   if (!host || !port) {
-    throw TypeError(
+    throw new TypeError(
       'Unable to load in-cluster configuration, KUBERNETES_SERVICE_HOST' +
       ' and KUBERNETES_SERVICE_PORT must be defined');
   }

diff --git a/lib/replicationcontrollers.js b/lib/replicationcontrollers.js
@@ -90,7 +90,7 @@ class ReplicationControllers extends BaseObject {
       return;
     }
 
-    const patch = { spec: { replicas: 0 } };
+    const patch = { spec: { replicas: 0 }};
     this.api.patch({
       path: [this.path, options.name],
       body: patch

diff --git a/package.json b/package.json
@@ -6,12 +6,10 @@
   "scripts": {
     "check-coverage": "istanbul check-coverage",
     "coverage": "istanbul cover ./node_modules/.bin/_mocha && istanbul report cobertura",
-    "eslint": "godaddy-js-style-eslint -c .eslintrc lib/ test/",
     "jsdoc": "jsdoc -d doc lib",
-    "jscs": "godaddy-js-style-jscs lib/ test/",
-    "lint": "godaddy-js-style-lint lib/ test/",
+    "lint": "eslint-godaddy lib/ test/",
     "release": "standard-version --tag-prefix=''",
-    "test": "mocha",
+    "test": "npm run lint && mocha",
     "test-integration": "TESTING=int mocha -t ${TIMEOUT:-30000} test"
   },
   "repository": "godaddy/kubernetes-client",
@@ -35,7 +33,10 @@
   },
   "devDependencies": {
     "assume": "^1.4.1",
-    "godaddy-style": "^3.1.5",
+    "eslint": "^3.19.0",
+    "eslint-config-godaddy": "^1.1.0",
+    "eslint-plugin-json": "^1.2.0",
+    "eslint-plugin-mocha": "^4.9.0",
     "istanbul": "^0.4.3",
     "jsdoc": "^3.4.0",
     "mocha": "^2.5.3",

diff --git a/test/common.js b/test/common.js
@@ -67,17 +67,19 @@ function newName() {
 
 function injectApis(options) {
   const apis = {
-    api: { cls: Core },
-    apiGroup: { cls: Api },
-    apps: { cls: Apps },
-    batch: { cls: Batch },
-    extensions: { cls: Extensions },
-    rbac: { cls: Rbac },
-    thirdPartyResources: { cls: ThirdPartyResources, options: { group: 'kubernetes-client.com' } }
+    api: { Constructor: Core },
+    apiGroup: { Constructor: Api },
+    apps: { Constructor: Apps },
+    batch: { Constructor: Batch },
+    extensions: { Constructor: Extensions },
+    rbac: { Constructor: Rbac },
+    thirdPartyResources: {
+      Constructor: ThirdPartyResources, options: { group: 'kubernetes-client.com' }
+    }
   };
   Object.keys(apis).forEach(apiName => {
     const api = apis[apiName];
-    module.exports[apiName] = new (api.cls)(Object.assign({}, options, api.options));
+    module.exports[apiName] = new (api.Constructor)(Object.assign({}, options, api.options));
   });
 }
 

diff --git a/test/config.test.js b/test/config.test.js
@@ -54,11 +54,11 @@ describe('Config', () => {
   describe('.fromKubeconfig', () => {
     it('handles username and password', () => {
       const kubeconfig = {
-        apiVersion: 'v1',
-        kind: 'Config',
-        preferences: {},
+        'apiVersion': 'v1',
+        'kind': 'Config',
+        'preferences': {},
         'current-context': 'foo-context',
-        contexts: [
+        'contexts': [
           {
             name: 'foo-context',
             context: {
@@ -67,15 +67,15 @@ describe('Config', () => {
             }
           }
         ],
-        clusters: [
+        'clusters': [
           {
             name: 'foo-cluster',
             cluster: {
               server: 'https://192.168.42.121:8443'
             }
           }
         ],
-        users: [
+        'users': [
           {
             name: 'foo-user',
             user: {
@@ -92,11 +92,11 @@ describe('Config', () => {
 
     it('handles base64 encoded certs and keys', () => {
       const kubeconfig = {
-        apiVersion: 'v1',
-        kind: 'Config',
-        preferences: {},
+        'apiVersion': 'v1',
+        'kind': 'Config',
+        'preferences': {},
         'current-context': 'foo-context',
-        contexts: [
+        'contexts': [
           {
             name: 'foo-context',
             context: {
@@ -105,16 +105,16 @@ describe('Config', () => {
             }
           }
         ],
-        clusters: [
+        'clusters': [
           {
             name: 'foo-cluster',
             cluster: {
               'certificate-authority-data': new Buffer('certificate-authority-data').toString('base64'),
-              server: 'https://192.168.42.121:8443'
+              'server': 'https://192.168.42.121:8443'
             }
           }
         ],
-        users: [
+        'users': [
           {
             name: 'foo-user',
             user: {
@@ -132,11 +132,11 @@ describe('Config', () => {
 
     it('handles token', () => {
       const kubeconfig = {
-        apiVersion: 'v1',
-        kind: 'Config',
-        preferences: {},
+        'apiVersion': 'v1',
+        'kind': 'Config',
+        'preferences': {},
         'current-context': 'foo-context',
-        contexts: [
+        'contexts': [
           {
             name: 'foo-context',
             context: {
@@ -145,15 +145,15 @@ describe('Config', () => {
             }
           }
         ],
-        clusters: [
+        'clusters': [
           {
             name: 'foo-cluster',
             cluster: {
               server: 'https://192.168.42.121:8443'
             }
           }
         ],
-        users: [
+        'users': [
           {
             name: 'foo-user',
             user: {
@@ -168,11 +168,11 @@ describe('Config', () => {
 
     it('handles manually specified current-context', () => {
       const kubeconfig = {
-        apiVersion: 'v1',
-        kind: 'Config',
-        preferences: {},
+        'apiVersion': 'v1',
+        'kind': 'Config',
+        'preferences': {},
         'current-context': 'foo-context-1',
-        contexts: [
+        'contexts': [
           {
             name: 'foo-context-1',
             context: {
@@ -188,7 +188,7 @@ describe('Config', () => {
             }
           }
         ],
-        clusters: [
+        'clusters': [
           {
             name: 'foo-cluster-1',
             cluster: {
@@ -202,7 +202,7 @@ describe('Config', () => {
             }
           }
         ],
-        users: [
+        'users': [
           {
             name: 'foo-user',
             user: {

diff --git a/test/third-party-resources.test.js b/test/third-party-resources.test.js
@@ -90,7 +90,7 @@ describe('lib.ThirdPartyResource', () => {
           .post(`/apis/${ common.thirdPartyDomain }/v1/namespaces/${ common.currentName }/newresources`)
           .reply(200, {})
           .get(`/apis/${ common.thirdPartyDomain }/v1/namespaces/${ common.currentName }/newresources/test`)
-          .reply(200, { metadata: { name: 'test' } });
+          .reply(200, { metadata: { name: 'test' }});
       });
 
       it('creates a resources', done => {