Add linter rules from serverless. Minor refactor

Author: Andres

.eslintignore

@@ -0,0 +1,2 @@
+coverage
+node_modules

.eslintrc.js

@@ -0,0 +1,16 @@
+module.exports = {
+  "extends": "airbnb",
+  "plugins": [],
+  "rules": {
+    "func-names": "off",
+    "strict": "off",
+    "prefer-rest-params": "off",
+    "react/require-extension" : "off",
+    "import/no-extraneous-dependencies" : "off",
+    "no-console": "off"
+  },
+  "env": {
+       "mocha": true,
+       "jest": true
+   }
+};

.gitignore

@@ -0,0 +1,4 @@
+node_modules
+npm-debug.log
+# ESLint cache
+.eslintcache

deploy/kubelessDeploy.js

@@ -1,8 +1,8 @@
 'use strict';
 
 const BbPromise = require('bluebird');
-const fs = require('fs');
 const Api = require('kubernetes-client');
+const helpers = require('../lib/helpers');
 
 class KubelessDeploy {
   constructor(serverless, options) {
@@ -12,46 +12,50 @@ class KubelessDeploy {
 
     this.hooks = {
       'deploy:deploy': () => BbPromise.bind(this)
-        .then(this.deployFunction)
+        .then(this.validate)
+        .then(this.deployFunction),
     };
   }
 
-  deployFunction() {
-    this.serverless.cli.log(`Deploying function: ${this.serverless.service.service}...`);
+  validate() {
+    helpers.validateEnv();
+    return BbPromise.resolve();
+  }
 
-    var funcs = {
-      apiVersion: `k8s.io/v1`,
+  deployFunction() {
+    const f = this.serverless.service.service;
+    this.serverless.cli.log(`Deploying function: ${f}...`);
+    const funcs = {
+      apiVersion: 'k8s.io/v1',
       kind: 'Function',
       metadata: {
         name: this.serverless.service.service,
         namespace: 'default',
       },
       spec: {
         deps: '',
-        function: fs.readFileSync(this.serverless.service.functions.hello.handler.toString().split(".")[0] + ".py", 'utf8'),
-        handler: this.serverless.service.functions.hello.handler,
+        function: this.serverless.utils.readFileSync(
+          `${this.serverless.service.functions[f].handler.toString().split('.')[0]}.py`
+        ),
+        handler: this.serverless.service.functions[f].handler,
         runtime: this.serverless.service.provider.runtime,
         topic: '',
         type: 'HTTP',
       },
     };
 
-    var thirdPartyResources = new Api.ThirdPartyResources({
-      url: process.env['K8SAPISERVER'],
-      ca: fs.readFileSync(process.env['HOME'] + "/.minikube/ca.crt"),
-      cert: fs.readFileSync(process.env['HOME'] + "/.minikube/apiserver.crt"),
-      key: fs.readFileSync(process.env['HOME'] + "/.minikube/apiserver.key"),
-      group: 'k8s.io',
-    });
+    const thirdPartyResources = new Api.ThirdPartyResources(
+      Object.assign(helpers.getMinikubeCredentials(), {
+        url: process.env.K8SAPISERVER,
+        group: 'k8s.io',
+      })
+    );
 
     thirdPartyResources.addResource('functions');
     // Create function
-    thirdPartyResources.ns.functions.post({body: funcs}, print)
+    thirdPartyResources.ns.functions.post({ body: funcs }, helpers.print);
+    return BbPromise.resolve();
   }
 }
 
-function print(err, result) {
-  console.log(JSON.stringify(err || result, null, 2));
-}
-
 module.exports = KubelessDeploy;

lib/helpers.js

@@ -0,0 +1,30 @@
+'use strict';
+
+const _ = require('lodash');
+const fs = require('fs');
+const path = require('path');
+
+function print(err, result) {
+  console.log(JSON.stringify(err || result, null, 2));
+}
+
+function validateEnv() {
+  if (_.isEmpty(process.env.K8SAPISERVER)) {
+    throw new Error(
+      'Please specify the Kubernetes API server IP as the environment variable K8SAPISERVER'
+    );
+  }
+}
+
+function getMinikubeCredentials() {
+  return {
+    cert: fs.readFileSync(path.join(process.env.HOME, '.minikube/apiserver.crt')),
+    ca: fs.readFileSync(path.join(process.env.HOME, '.minikube/ca.crt')),
+    key: fs.readFileSync(path.join(process.env.HOME, '.minikube/apiserver.key')),
+  };
+}
+module.exports = {
+  validateEnv,
+  getMinikubeCredentials,
+  print,
+};

package.json

@@ -7,6 +7,7 @@
     "example": "examples"
   },
   "scripts": {
+    "lint": "eslint . --cache",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
@@ -18,5 +19,17 @@
   "bugs": {
     "url": "https://github.com/bitnami/kubeless-serverless/issues"
   },
-  "homepage": "https://github.com/bitnami/kubeless-serverless#readme"
+  "homepage": "https://github.com/bitnami/kubeless-serverless#readme",
+  "dependencies": {
+    "bluebird": "^3.5.0",
+    "kubernetes-client": "^3.12.0",
+    "lodash": "^4.17.4"
+  },
+  "devDependencies": {
+    "eslint": "^3.3.1",
+    "eslint-config-airbnb": "^10.0.1",
+    "eslint-config-airbnb-base": "^5.0.2",
+    "eslint-plugin-jsx-a11y": "^2.1.0",
+    "eslint-plugin-react": "^6.1.1"
+  }
 }

remove/kubelessRemove.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const BbPromise = require('bluebird');
-const fs = require('fs');
 const Api = require('kubernetes-client');
+const BbPromise = require('bluebird');
+const helpers = require('../lib/helpers');
 
 class KubelessRemove {
   constructor(serverless, options) {
@@ -12,31 +12,32 @@ class KubelessRemove {
 
     this.hooks = {
       'remove:remove': () => BbPromise.bind(this)
-        .then(this.removeFunction)
+        .then(this.validate)
+        .then(this.removeFunction),
     };
   }
 
-  removeFunction() {
-    this.serverless.cli.log(`Removing function: ${this.serverless.service.service}...`);
+  validate() {
+    helpers.validateEnv();
+    return BbPromise.resolve();
+  }
 
-    var funcName = this.serverless.service.service
+  removeFunction() {
+    const f = this.serverless.service.service;
+    this.serverless.cli.log(`Removing function: ${f}...`);
 
-    var thirdPartyResources = new Api.ThirdPartyResources({
-      url: process.env['K8SAPISERVER'],
-      ca: fs.readFileSync(process.env['HOME'] + "/.minikube/ca.crt"),
-      cert: fs.readFileSync(process.env['HOME'] + "/.minikube/apiserver.crt"),
-      key: fs.readFileSync(process.env['HOME'] + "/.minikube/apiserver.key"),
-      group: 'k8s.io',
-    });
+    const thirdPartyResources = new Api.ThirdPartyResources(
+      Object.assign(helpers.getMinikubeCredentials(), {
+        url: process.env.K8SAPISERVER,
+        group: 'k8s.io',
+      })
+    );
 
     thirdPartyResources.addResource('functions');
     // Delete function
-    thirdPartyResources.ns.functions.delete(funcName, print)
+    thirdPartyResources.ns.functions.delete(f, helpers.print);
+    return BbPromise.resolve();
   }
 }
 
-function print(err, result) {
-  console.log(JSON.stringify(err || result, null, 2));
-}
-
 module.exports = KubelessRemove;