Directory structure updates (#6)

ibm-functions · Feb 22, 2018 · 3c9dd88 · 3c9dd88
1 parent 6ab598a
commit 3c9dd88
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 152 deletions.
diff --git a/runtimes/nodejs-8/actions/helloworld.js b/runtimes/nodejs-8/actions/helloworld.js
diff --git a/runtimes/nodejs-8/manifest.yaml b/runtimes/nodejs-8/manifest.yaml
diff --git a/runtimes/nodejs/manifest.yaml b/runtimes/nodejs/manifest.yaml
@@ -12,3 +12,4 @@ packages:
     actions:
       helloworld:
         function: actions/helloworld.js
+        runtime: nodejs:8
diff --git a/runtimes/php-7.1/actions/helloworld.php b/runtimes/php-7.1/actions/helloworld.php
diff --git a/runtimes/php-7.1/manifest.yaml b/runtimes/php-7.1/manifest.yaml
diff --git a/runtimes/php/manifest.yaml b/runtimes/php/manifest.yaml
@@ -12,3 +12,4 @@ packages:
     actions:
       helloworld:
         function: actions/helloworld.php
+        runtime: php:7.1
diff --git a/runtimes/python-3.6.4/actions/helloworld.py b/runtimes/python-3.6.4/actions/helloworld.py
diff --git a/runtimes/python-3.6.4/manifest.yaml b/runtimes/python-3.6.4/manifest.yaml
diff --git a/runtimes/python/manifest.yaml b/runtimes/python/manifest.yaml
@@ -12,3 +12,4 @@ packages:
     actions:
       helloworld:
         function: actions/helloworld.py
+        runtime: python-jessie:3
diff --git a/runtimes/swift-3.1.1/actions/helloworld.swift b/runtimes/swift-3.1.1/actions/helloworld.swift
diff --git a/runtimes/swift-3.1.1/manifest.yaml b/runtimes/swift-3.1.1/manifest.yaml
diff --git a/tests/src/test/scala/templates/HelloTests.scala b/tests/src/test/scala/templates/HelloTests.scala
@@ -35,11 +35,11 @@ class HelloTests extends TestHelpers
     val wsk = new Wsk()
 
     //set parameters for deploy tests
-    val nodejs8folder = "../runtimes/nodejs-8/actions";
+    val nodejs8folder = "../runtimes/nodejs/actions";
     val nodejs6folder = "../runtimes/nodejs-6/actions";
-    val phpfolder = "../runtimes/php-7.1/actions";
-    val pythonfolder = "../runtimes/python-3.6.4/actions";
-    val swiftfolder = "../runtimes/swift-3.1.1/actions";
+    val phpfolder = "../runtimes/php/actions";
+    val pythonfolder = "../runtimes/python/actions";
+    val swiftfolder = "../runtimes/swift/actions";
 
     behavior of "Hello World Template"
 
@@ -48,9 +48,10 @@ class HelloTests extends TestHelpers
      */
      it should "invoke nodejs 8 helloworld.js and get the result" in withAssetCleaner(wskprops) { (wp, assetHelper) =>
        val name = "helloNode"
+       val kind = Option("nodejs:8")
        val file = Some(new File(nodejs8folder, "helloworld.js").toString());
        assetHelper.withCleaner(wsk.action, name) { (action, _) =>
-         action.create(name, file)
+         action.create(name, file, kind)
        }
 
        withActivation(wsk.activation, wsk.action.invoke(name, Map("name" -> "Mindy".toJson))) {
@@ -59,9 +60,10 @@ class HelloTests extends TestHelpers
      }
       it should "invoke nodejs 8 helloworld.js without input and get stranger" in withAssetCleaner(wskprops) { (wp, assetHelper) =>
         val name = "helloNode"
+        val kind = Option("nodejs:8")
         val file = Some(new File(nodejs8folder, "helloworld.js").toString());
         assetHelper.withCleaner(wsk.action, name) { (action, _) =>
-          action.create(name, file)
+          action.create(name, file, kind)
         }
 
         withActivation(wsk.activation, wsk.action.invoke(name)) {