Add support for 'deploy function' command

Andres · Andres · commit fbb237544541 · 2017-07-26T14:03:20.000+02:00
diff --git a/README.md b/README.md
@@ -112,6 +112,13 @@ $ curl http://127.0.0.1:8001/api/v1/namespaces/default/services/hello/proxy/
 hello world
 ```
 
+If you have a change in your function and you want to redeploy it you can run:
+```
+$ serverless deploy function -f hello
+Serverless: Redeploying hello...
+Serverless: Function hello succesfully deployed
+```
+
 Finally you can remove the function.
 ```
 $ serverless remove
diff --git a/deploy/kubelessDeploy.js b/deploy/kubelessDeploy.js
@@ -80,6 +80,31 @@ class KubelessDeploy {
     );
   }
 
+  getRuntimeFilenames(runtime, handler) {
+    let files = null;
+    if (runtime.match(/python/)) {
+      files = {
+        handler: `${handler.toString().split('.')[0]}.py`,
+        deps: 'requirements.txt',
+      };
+    } else if (runtime.match(/node/)) {
+      files = {
+        handler: `${handler.toString().split('.')[0]}.js`,
+        deps: 'package.json',
+      };
+    } else if (runtime.match(/ruby/)) {
+      files = {
+        handler: `${handler.toString().split('.')[0]}.rb`,
+        deps: 'Gemfile',
+      };
+    } else {
+      throw new Error(
+        `The runtime ${runtime} is not supported yet`
+      );
+    }
+    return files;
+  }
+
   waitForDeployment(funcName, requestMoment) {
     const core = new Api.Core(helpers.getConnectionOptions(helpers.loadKubeConfig()));
     const loop = setInterval(() => {
@@ -118,38 +143,44 @@ class KubelessDeploy {
     }, 2000);
   }
 
+  deployFunctionAndWait(body, thirdPartyResources) {
+    const requestMoment = moment().milliseconds(0);
+    this.serverless.cli.log(
+      `Deploying function ${body.metadata.name}...`
+    );
+    return new BbPromise((resolve, reject) => {
+      thirdPartyResources.ns.functions.post({ body }, (err) => {
+        if (err) {
+          if (err.code === 409) {
+            this.serverless.cli.log(
+              `The function ${body.metadata.name} is already deployed. ` +
+              `If you want to redeploy it execute "sls deploy function -f ${body.metadata.name}".`
+            );
+            resolve();
+          } else {
+            reject(new Error(
+              `Unable to deploy the function ${body.metadata.name}. Received:\n` +
+              `  Code: ${err.code}\n` +
+              `  Message: ${err.message}`
+            ));
+          }
+        } else {
+          this.waitForDeployment(body.metadata.name, requestMoment);
+          resolve();
+        }
+      });
+    });
+  }
+
   deployFunction() {
     const thirdPartyResources = this.getThirdPartyResources();
     thirdPartyResources.addResource('functions');
-    let files = {
-      handler: null,
-      deps: null,
-    };
     const errors = [];
     let counter = 0;
     return new BbPromise((resolve, reject) => {
       _.each(this.serverless.service.functions, (description, name) => {
         const runtime = this.serverless.service.provider.runtime;
-        if (runtime.match(/python/)) {
-          files = {
-            handler: `${description.handler.toString().split('.')[0]}.py`,
-            deps: 'requirements.txt',
-          };
-        } else if (runtime.match(/node/)) {
-          files = {
-            handler: `${description.handler.toString().split('.')[0]}.js`,
-            deps: 'package.json',
-          };
-        } else if (runtime.match(/ruby/)) {
-          files = {
-            handler: `${description.handler.toString().split('.')[0]}.rb`,
-            deps: 'Gemfile',
-          };
-        } else {
-          throw new Error(
-            `The runtime ${this.serverless.service.provider.runtime} is not supported yet`
-          );
-        }
+        const files = this.getRuntimeFilenames(runtime, description.handler);
         this.getFunctionContent(files.handler)
           .then(functionContent => {
             this.getFunctionContent(files.deps)
@@ -173,25 +204,9 @@ class KubelessDeploy {
                     type: 'HTTP',
                   },
                 };
-                // Create function
-                const requestMoment = moment().milliseconds(0);
-                thirdPartyResources.ns.functions.post({ body: funcs }, (err) => {
-                  if (err) {
-                    if (err.code === 409) {
-                      this.serverless.cli.log(
-                        `The function ${name} is already deployed. ` +
-                        'Remove it if you want to deploy it again.'
-                      );
-                    } else {
-                      errors.push(
-                        `Unable to deploy the function ${name}. Received:\n` +
-                        `  Code: ${err.code}\n` +
-                        `  Message: ${err.message}`
-                      );
-                    }
-                  } else {
-                    this.waitForDeployment(name, requestMoment);
-                  }
+                this.deployFunctionAndWait(funcs, thirdPartyResources).catch(err => {
+                  errors.push(err);
+                }).then(() => {
                   counter++;
                   if (counter === _.keys(this.serverless.service.functions).length) {
                     if (_.isEmpty(errors)) {
diff --git a/deployFunction/kubelessDeployFunction.js b/deployFunction/kubelessDeployFunction.js
@@ -0,0 +1,68 @@
+/*
+Copyright 2017 Bitnami.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+'use strict';
+
+const _ = require('lodash');
+const BbPromise = require('bluebird');
+const KubelessDeploy = require('../deploy/kubelessDeploy');
+const moment = require('moment');
+
+class KubelessDeployFunction extends KubelessDeploy {
+  constructor(serverless, options) {
+    super(serverless, options);
+    this.hooks = {
+      'deploy:function:deploy': () => BbPromise.bind(this)
+      .then(this.validate)
+      .then(this.deployFunction),
+    };
+  }
+
+  deployFunctionAndWait(body, thirdPartyResources) {
+    const requestMoment = moment().milliseconds(0);
+    return new BbPromise((resolve, reject) => {
+      thirdPartyResources.ns.functions(body.metadata.name).put({ body }, (err) => {
+        if (err) {
+          reject(new Error(
+            `Unable to update the function ${body.metadata.name}. Received:\n` +
+            `  Code: ${err.code}\n` +
+            `  Message: ${err.message}`
+          ));
+        } else {
+          this.waitForDeployment(body.metadata.name, requestMoment);
+          resolve();
+        }
+      });
+    });
+  }
+
+  deployFunction() {
+    // Pick only the funciton that we are interested in
+    this.serverless.service.functions = _.pick(
+      this.serverless.service.functions,
+      this.options.function
+    );
+    if (_.isEmpty(this.serverless.service.functions)) {
+      throw new Error(
+        `The function ${this.options.function} is not present in the current description`
+      );
+    }
+    this.serverless.cli.log(`Redeploying ${this.options.function}...`);
+    return super.deployFunction();
+  }
+}
+
+module.exports = KubelessDeployFunction;
diff --git a/index.js b/index.js
@@ -24,6 +24,7 @@ whole provider implementation.
 
 const KubelessProvider = require('./provider/kubelessProvider');
 const KubelessDeploy = require('./deploy/kubelessDeploy');
+const KubelessDeployFunction = require('./deployFunction/kubelessDeployFunction');
 const KubelessRemove = require('./remove/kubelessRemove');
 const KubelessInvoke = require('./invoke/kubelessInvoke');
 const KubelessInfo = require('./info/kubelessInfo');
@@ -36,6 +37,7 @@ class KubelessIndex {
 
     this.serverless.pluginManager.addPlugin(KubelessProvider);
     this.serverless.pluginManager.addPlugin(KubelessDeploy);
+    this.serverless.pluginManager.addPlugin(KubelessDeployFunction);
     this.serverless.pluginManager.addPlugin(KubelessRemove);
     this.serverless.pluginManager.addPlugin(KubelessInvoke);
     this.serverless.pluginManager.addPlugin(KubelessInfo);
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless-kubeless",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "This plugin enables support for Kubeless within the [Serverless Framework](https://github.com/serverless).",
   "main": "index.js",
   "directories": {
diff --git a/test/kubelessDeploy.test.js b/test/kubelessDeploy.test.js
@@ -430,7 +430,7 @@ describe('KubelessDeploy', () => {
         kubelessDeploy.deployFunction()
       ).to.be.eventually.rejectedWith(
         'Found errors while deploying the given functions:\n' +
-        'Unable to deploy the function myFunction. Received:\n' +
+        'Error: Unable to deploy the function myFunction. Received:\n' +
         '  Code: 500\n' +
         '  Message: Internal server error'
       );
@@ -469,7 +469,7 @@ describe('KubelessDeploy', () => {
         kubelessDeploy.deployFunction()
       ).to.be.eventually.rejectedWith(
         'Found errors while deploying the given functions:\n' +
-        'Unable to deploy the function myFunction2. Received:\n' +
+        'Error: Unable to deploy the function myFunction2. Received:\n' +
         '  Code: 500\n' +
         '  Message: Internal server error'
       );
diff --git a/test/kubelessDeployFunction.test.js b/test/kubelessDeployFunction.test.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "serverless-kubeless",`
`3`		`- "version": "0.1.4",`
	`3`	`+ "version": "0.1.5",`
`4`	`4`	`"description": "This plugin enables support for Kubeless within the [Serverless Framework](https://github.com/serverless).",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"directories": {`