apache · csantanapr · Mar 4, 2019 · Feb 23, 2019 · Feb 24, 2019 · Feb 24, 2019
diff --git a/.gitignore b/.gitignore
@@ -11,8 +11,9 @@ tests/build/
 vendor/
 
 # Go binary proxy
-actionProxyLoop/proxy
-golang1.10/proxy
+common/proxy
+actionloop/proxy
+golang1.11/proxy
 
 # Go test transient files
 openwhisk/_test/exec
@@ -26,6 +27,7 @@ openwhisk/_test/output/
 openwhisk/action/
 openwhisk/compile/
 openwhisk/debug.test
+*.pyc
 
 # Eclipse
 tests/bin/

diff --git a/CHANGES.md b/CHANGES.md
@@ -0,0 +1,33 @@
+<!--
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+#
+-->
+# ActionLoop v1.0.1
+- embedded file type detection
+- now showing the commend
+- librdkafka in golang image
+- showing version numbuer with -debug
+
+# Actionloop v1.0.2
+Versioning
+- renamed actionloop docker image to actionloop-v1.0.2
+Docker Images Support
+- static build of the executable docker image, so actionloop can be used also in alpine images
+ActionLoop for Scripting Languages
+- any script starting with '#!' is recognized as executable
+- now the -compile will zip the entire directory of the `bin` directory after compilation
+- if you upload a folder `src/exec` the entire directory is moved to `bin`, including other uplooaded files
diff --git a/CREDITS.txt b/CREDITS.txt
@@ -1,6 +1,6 @@
-Michele Sciabarra <michele@sciabarra.com>
+Michele Sciabarra <msciabarra@apache.org>
 
-Carlos Santana 
+Carlos Santana <csantana23@gmail.com>
 
 Rodric Rabbah <rodric@gmail.com>
 

diff --git a/LICENSE-filetype.txt b/LICENSE-filetype.txt
diff --git a/README.md b/README.md
@@ -39,6 +39,10 @@ This repository containst both the OpenWhisk runtime for Golang Actions, as well
 - Deployment for [Generic](docs/DEPLOY.md#generic) actions
 - The [ActionLoop](docs/ACTION.md#actionloop) protocol for generic actions
 
+# Change Log
+
+[CHANGES.md](Here.)
+
 # License
 [Apache 2.0](LICENSE.txt)
 

diff --git a/actionProxyLoop/Dockerfile → actionloop/Dockerfile b/actionProxyLoop/Dockerfile → actionloop/Dockerfile
diff --git a/actionProxyLoop/build.gradle → actionloop/build.gradle b/actionProxyLoop/build.gradle → actionloop/build.gradle
@@ -15,5 +15,19 @@
  * limitations under the License.
  */
 
-ext.dockerImageName = 'actionloop'
+ext.dockerImageName = 'actionloop-v1.0.2'
 apply from: '../gradle/docker.gradle'
+
+distDocker.dependsOn 'copyProxy'
+distDocker.finalizedBy('cleanup')
+
+task copyProxy(type: Copy) {
+    from '../common/proxy'
+    into '.'
+}
+
+task cleanup(type: Delete) {
+    delete 'proxy'
+    delete 'gobuild.py'
+    delete 'gobuild.py.launcher.go'
+}
diff --git a/build.gradle b/build.gradle
@@ -46,10 +46,13 @@ golang {
   goVersion = '1.11.5'
 }
 
-
 build.dependsOn vendor
 
 build {
   targetPlatform = ['linux-amd64']
-  go 'build -o actionProxyLoop/proxy main/proxy.go'
+  go """build -o common/proxy -ldflags '-extldflags "-static"'  main/proxy.go"""
+}
+
+task cleanup(type: Delete) {
+    delete 'common/proxy'
 }
diff --git a/examples/Makefile b/examples/Makefile
@@ -3,6 +3,8 @@ IMAGES?=openwhisk
 
 all: .PHONY
 
+.PHONY: bash-hello golang-hello-single golang-main-single golang-main-standalone golang-main-package golang-main-vendor golang-hello-vendor 
+
 bash-hello:
 	cd $@ && OW_USER=$(IMAGES) make clean deploy test
 
@@ -30,5 +32,4 @@ golang-hello-vendor:
 	cd $@ && OW_USER=$(IMAGES) make clean devel test
 	cd $@ && OW_USER=$(IMAGES) make clean deploy test
 
-.PHONY: bash-hello golang-hello-single golang-main-single golang-main-standalone golang-main-package golang-main-vendor golang-hello-vendor 
 
diff --git a/examples/bash-hello/Makefile b/examples/bash-hello/Makefile
@@ -1,6 +1,6 @@
 WSK?=wsk
 OW_USER?=openwhisk
-OW_RUNTIME?=$(OW_USER)/actionloop
+OW_RUNTIME?=$(OW_USER)/actionloop-v1.0.2
 NAME=bash-hello
 PACKAGE=test
 SRC=hello.sh

diff --git a/examples/golang-hello-single/Makefile b/examples/golang-hello-single/Makefile
@@ -1,5 +1,5 @@
 OW_USER?=openwhisk
-OW_RUNTIME?=$(OW_USER)/actionloop
+OW_RUNTIME?=$(OW_USER)/actionloop-v1.0.2
 OW_COMPILER?=$(OW_USER)/actionloop-golang-v1.11
 WSK?=wsk
 MAIN=hello
@@ -19,7 +19,7 @@ $(ZIP): $(SRC)
 
 clean:
 	-$(WSK) action delete $(PACKAGE)/$(NAME)
-	-rm $(ZIP) package.done test.json
+	-rm $(ZIP) package.done test.json 2>/dev/null
 
 test: test.json
 	$(WSK) action invoke test/$(NAME) -r

diff --git a/examples/golang-hello-vendor/Makefile b/examples/golang-hello-vendor/Makefile
@@ -1,5 +1,5 @@
 OW_USER?=openwhisk
-OW_RUNTIME?=$(OW_USER)/actionloop
+OW_RUNTIME?=$(OW_USER)/actionloop-v1.0.2
 OW_COMPILER?=$(OW_USER)/actionloop-golang-v1.11
 WSK?=wsk
 MAIN=hello
@@ -23,14 +23,14 @@ $(BINZIP): $(SRCS) $(VENDORS) $(SRCZIP)
 	docker run -i $(OW_COMPILER) -compile $(MAIN) <$(SRCZIP) >$(BINZIP)
 
 $(SRCZIP): $(SRCS) $(VENDORS)
-	cd src ; zip ../$(SRCZIP) -r *
+	cd src ; zip ../$(SRCZIP) -qr *
 
 clean:
 	-$(WSK) action delete $(PACKAGE)/$(NAME)
-	-rm $(BINZIP) $(SRCZIP) package.done test.json
+	-rm $(BINZIP) $(SRCZIP) package.done test.json 2>/dev/null
 
 clean_vendor:
-	-rm -r $(VENDORS)
+	-rm -r $(VENDORS) 
 
 test: test.json
 	$(WSK) action invoke test/$(NAME) -r

diff --git a/examples/golang-main-package/Makefile b/examples/golang-main-package/Makefile
@@ -1,5 +1,5 @@
 OW_USER?=openwhisk
-OW_RUNTIME?=$(OW_USER)/actionloop
+OW_RUNTIME?=$(OW_USER)/actionloop-v1.0.2
 OW_COMPILER?=$(OW_USER)/actionloop-golang-v1.11
 WSK?=wsk
 MAIN=main
@@ -16,14 +16,14 @@ devel: package.done $(SRCZIP)
 	$(WSK) action update $(PACKAGE)/$(NAME) $(SRCZIP) --main $(MAIN) --docker $(OW_COMPILER)
 
 $(BINZIP): $(SRCS)
-	cd src ; zip - -r * | docker run -i $(OW_COMPILER) -compile $(MAIN) >../$(BINZIP)
+	cd src ; zip - -qr * | docker run -i $(OW_COMPILER) -compile $(MAIN) >../$(BINZIP)
 
 $(SRCZIP): $(SRCS)
-	cd src ; zip ../$(SRCZIP) -r *
+	cd src ; zip ../$(SRCZIP) -qr *
 
 clean:
 	-$(WSK) action delete $(PACKAGE)/$(NAME)
-	-rm  $(BINZIP) $(SRCZIP) package.done test.json
+	-rm $(BINZIP) $(SRCZIP) package.done test.json 2>/dev/null
 
 test: test.json
 	$(WSK) action invoke test/$(NAME) -r

diff --git a/examples/golang-main-single/Makefile b/examples/golang-main-single/Makefile
@@ -1,5 +1,5 @@
 OW_USER?=openwhisk
-OW_RUNTIME?=$(OW_USER)/actionloop
+OW_RUNTIME?=$(OW_USER)/actionloop-v1.0.2
 OW_COMPILER?=$(OW_USER)/actionloop-golang-v1.11
 WSK?=wsk
 MAIN=main
@@ -19,7 +19,7 @@ $(ZIP): $(SRC)
 
 clean:
 	-$(WSK) action delete $(PACKAGE)/$(NAME)
-	-rm $(ZIP) package.done test.json
+	-rm $(ZIP) package.done test.json 2>/dev/null
 
 test: test.json
 	$(WSK) action invoke test/$(NAME) -r

diff --git a/examples/golang-main-standalone/Makefile b/examples/golang-main-standalone/Makefile
@@ -1,5 +1,5 @@
 OW_USER?=openwhisk
-OW_RUNTIME?=$(OW_USER)/actionloop
+OW_RUNTIME?=$(OW_USER)/actionloop-v1.0.2
 OW_COMPILER?=$(OW_USER)/actionloop-golang-v1.11
 WSK?=wsk
 MAIN=main

diff --git a/examples/golang-main-vendor/Makefile b/examples/golang-main-vendor/Makefile
@@ -1,5 +1,5 @@
 OW_USER?=openwhisk
-OW_RUNTIME?=$(OW_USER)/actionloop
+OW_RUNTIME?=$(OW_USER)/actionloop-v1.0.2
 OW_COMPILER?=$(OW_USER)/actionloop-golang-v1.11
 WSK?=wsk
 MAIN=main
@@ -23,7 +23,7 @@ $(BINZIP): $(SRCS) $(VENDORS) $(SRCZIP)
 	docker run -i $(OW_COMPILER) -compile $(MAIN) <$(SRCZIP) >$(BINZIP)
 
 $(SRCZIP): $(SRCS) $(VENDORS)
-	cd src ; zip ../$(SRCZIP) -r *
+	cd src ; zip ../$(SRCZIP) -qr *
 
 clean:
 	-$(WSK) action delete $(PACKAGE)/$(NAME)

diff --git a/golang1.11/build.gradle b/golang1.11/build.gradle
@@ -23,9 +23,8 @@ distDocker.dependsOn 'copyCompiler'
 distDocker.dependsOn 'copyEpilogue'
 distDocker.finalizedBy('cleanup')
 
-
 task copyProxy(type: Copy) {
-    from '../actionProxyLoop/proxy'
+    from '../common/proxy'
     into '.'
 }
 

diff --git a/main/proxy.go b/main/proxy.go
@@ -17,11 +17,8 @@
 package main
 
 import (
-	"archive/zip"
-	"bytes"
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 
@@ -44,32 +41,6 @@ func fatalIf(err error) {
 	}
 }
 
-// use the runtime as a compiler "on-the-fly"
-func extractAndCompile(ap *openwhisk.ActionProxy) {
-
-	// read the std input
-	in, err := ioutil.ReadAll(os.Stdin)
-	fatalIf(err)
-
-	// extract and compile it
-	file, err := ap.ExtractAndCompile(&in, *compile)
-	fatalIf(err)
-
-	// read the file, zip it and write it to stdout
-	buf := new(bytes.Buffer)
-	zwr := zip.NewWriter(buf)
-	zf, err := zwr.Create("exec")
-	fatalIf(err)
-	filedata, err := ioutil.ReadFile(file)
-	fatalIf(err)
-	_, err = zf.Write(filedata)
-	fatalIf(err)
-	fatalIf(zwr.Flush())
-	fatalIf(zwr.Close())
-	_, err = os.Stdout.Write(buf.Bytes())
-	fatalIf(err)
-}
-
 func main() {
 	flag.Parse()
 
@@ -91,7 +62,7 @@ func main() {
 
 	// compile on the fly upon request
 	if *compile != "" {
-		extractAndCompile(ap)
+		ap.ExtractAndCompileIO(os.Stdin, os.Stdout, *compile)
 		return
 	}
 

diff --git a/openwhisk/_test/build.sh b/openwhisk/_test/build.sh
@@ -35,15 +35,15 @@ function build_main {
 
 
 build hi
-zip hi.zip exec
+zip -q hi.zip exec
 cp exec hi
 
 build_main hello_message
-zip hello_message.zip exec
+zip -q hello_message.zip exec
 cp exec hello_message
 
 build_main hello_greeting
-zip hello_greeting.zip exec
+zip -q hello_greeting.zip exec
 cp exec hello_greeting
 
 test -e hello.zip && rm hello.zip

diff --git a/openwhisk/_test/compile.py b/openwhisk/_test/compile.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+import os, sys
+os.rename(sys.argv[2], sys.argv[3]+"/action")
+with open(sys.argv[3]+"/exec", "w") as f:
+    f.write("""#!/bin/bash
+cd "$(dirname $0)"
+export PYTHONPATH=$PWD/action
+python action/exec.py
+""")
diff --git a/openwhisk/_test/find.sh b/openwhisk/_test/find.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+#
+find "$1" | sort
diff --git a/openwhisk/_test/pysample/exec b/openwhisk/_test/pysample/exec
@@ -0,0 +1,6 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+cd "$(dirname $0)"
+export PYTHONPATH=$PWD/lib
+python lib/exec.py
diff --git a/openwhisk/_test/pysample/lib/action/__init__.py b/openwhisk/_test/pysample/lib/action/__init__.py
@@ -0,0 +1,2 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
diff --git a/openwhisk/_test/pysample/lib/action/main.py b/openwhisk/_test/pysample/lib/action/main.py
@@ -0,0 +1,7 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+def main(args):
+    name = "world"
+    if "name" in args:
+        name = args["name"]
+    return {"python": "Hello, %s" % name }