Merge pull request #70 from ijin/node

nodejs4.3 runtime support
marcy-terui · Mar 3, 2017 · c662a53 · c662a53
2 parents a2136ad + 62fbe7b
commit c662a53
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -47,3 +47,13 @@ coverage.xml
 
 .venv
 *.zip
+### https://raw.github.com/github/gitignore/be3333655bffe9507d66cc864aee95ed6052b4ed/Global/vim.gitignore
+
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+*.un~
+Session.vim
+.netrwhist
+*~
+
+
diff --git a/lamvery/clients/function.py b/lamvery/clients/function.py
@@ -2,6 +2,7 @@
 
 import botocore
 import hashlib
+import lamvery.config
 
 from lamvery.clients.base import BaseClient
 from lamvery.utils import previous_alias
@@ -26,10 +27,13 @@ def get_function_conf(self, name, alias=None):
         except botocore.exceptions.ClientError:
             return {}
 
+    def _get_runtime(self, conf):
+        return lamvery.config.DEFAULT_RUNTIME_NODE_JS if conf['runtime'] == 'nodejs' else conf['runtime']
+
     def create_function(self, zipfile, conf, publish):
         kwargs = {}
         kwargs['FunctionName'] = conf['name']
-        kwargs['Runtime'] = conf['runtime']
+        kwargs['Runtime'] = self._get_runtime(conf)
         kwargs['Role'] = conf['role']
         kwargs['Handler'] = conf['handler']
         kwargs['Code'] = {'ZipFile': zipfile.read()}
@@ -76,6 +80,7 @@ def update_function_code(self, zipfile, conf, publish):
     def update_function_conf(self, conf):
         kwargs = {}
         kwargs['FunctionName'] = conf['name']
+        kwargs['Runtime'] = self._get_runtime(conf)
         kwargs['Role'] = conf['role']
         kwargs['Handler'] = conf['handler']
 

diff --git a/lamvery/config.py b/lamvery/config.py
@@ -11,10 +11,13 @@
 
 RUNTIME_PY_27 = 'python2.7'
 RUNTIME_NODE_JS = 'nodejs'
+RUNTIME_NODE_JS_43 = 'nodejs4.3'
+DEFAULT_RUNTIME_NODE_JS = RUNTIME_NODE_JS_43
 
 RUNTIME_AND_EXTENSION = {
     RUNTIME_PY_27: 'py',
-    RUNTIME_NODE_JS: 'js'
+    RUNTIME_NODE_JS: 'js',
+    RUNTIME_NODE_JS_43: 'js'
 }
 
 
@@ -118,7 +121,10 @@ def unescape(self, txt):
         return txt
 
     def get_configuration(self):
-        return self.load_conf().get('configuration')
+        config = self.load_conf().get('configuration')
+        if config['runtime'] == 'nodejs':
+            config['runtime'] = DEFAULT_RUNTIME_NODE_JS
+        return config
 
     def get_vpc_configuration(self):
         vpc_config = self.get_configuration().get('vpc_config')

diff --git a/tests/lamvery/clients/function_test.py b/tests/lamvery/clients/function_test.py
@@ -21,6 +21,9 @@
     }
 }
 
+NODE_CONF = dict(TEST_CONF, runtime='nodejs')
+NODE43_CONF = dict(TEST_CONF, runtime='nodejs4.3')
+
 
 class LambdaClientTestCase(TestCase):
 
@@ -36,6 +39,11 @@ def test_get_function_conf(self):
             side_effect=botocore.exceptions.ClientError({'Error': {}}, 'bar'))
         eq_(self.client.get_function_conf('test'), {})
 
+    def test_get_runtime(self):
+        eq_(self.client._get_runtime(TEST_CONF), 'python2.7')
+        eq_(self.client._get_runtime(NODE_CONF), 'nodejs4.3')
+        eq_(self.client._get_runtime(NODE43_CONF), 'nodejs4.3')
+
     def test_create_function(self):
         self.client.create_function(Mock(), TEST_CONF, True)
 

diff --git a/tests/lamvery/config_test.py b/tests/lamvery/config_test.py
@@ -89,6 +89,7 @@
 """
 
 NODE_CONF = DEFAULT_CONF.replace('python2.7', 'nodejs')
+NODE43_CONF = DEFAULT_CONF.replace('python2.7', 'nodejs4.3')
 
 
 class FunctionsTestCase(TestCase):
@@ -156,6 +157,16 @@ def test_get_runtime(self):
         config = Config(self.conf_file)
         eq_(config.get_runtime(), 'python2.7')
 
+        open(self.conf_file, 'w').write(NODE_CONF)
+        config = Config(self.conf_file)
+        runtime = config.get_configuration().get('runtime')
+        eq_(runtime, 'nodejs4.3')
+
+        open(self.conf_file, 'w').write(NODE43_CONF)
+        config = Config(self.conf_file)
+        runtime = config.get_configuration().get('runtime')
+        eq_(runtime, 'nodejs4.3')
+
     def test_get_handler(self):
         config = Config(self.conf_file)
         eq_(config.get_handler(), 'lambda_function.lambda_handler')
@@ -199,8 +210,10 @@ def test_get_function_filename(self):
 
         open(self.conf_file, 'w').write(NODE_CONF)
         config = Config(self.conf_file)
-        runtime = config.get_configuration().get('runtime')
-        eq_(runtime, 'nodejs')
+        eq_(config.get_function_filename(), 'lambda_function.js')
+
+        open(self.conf_file, 'w').write(NODE43_CONF)
+        config = Config(self.conf_file)
         eq_(config.get_function_filename(), 'lambda_function.js')
 
     def test_get_archive_name(self):