Update python runtime to include its own test artifacts. (#77)

* Remove python 2 tests, no longer maintained.
* Lookup test artifacts relative to project resources.
* Build test artifacts before tests.
* Build action loop proxy from source to get bug fix since last release

Author: rabbah

.gitignore

@@ -61,12 +61,7 @@ ansible/roles/nginx/files/*.csr
 ansible/roles/nginx/files/*cert.pem
 
 # .zip files must be explicited whitelisted
+.built
 *.zip
-!tests/dat/actions/blackbox.zip
-!tests/dat/actions/helloSwift.zip
-!tests/dat/actions/python.zip
-!tests/dat/actions/python2_virtualenv.zip
-!tests/dat/actions/python3_virtualenv.zip
-!tests/dat/actions/python_virtualenv_dir.zip
-!tests/dat/actions/python_virtualenv_name.zip
-!tests/dat/actions/zippedaction.zip
+tests/**/python_virtualenv/virtualenv/
+tests/**/python_virtualenv_invalid_main/virtualenv/

.travis.yml

@@ -18,7 +18,11 @@
 sudo: required
 dist: xenial
 jdk: openjdk8
-language: java
+language:
+  - python
+
+python:
+  - "3.7"
 
 services:
   - docker

README.md

@@ -27,8 +27,6 @@ To use as a docker action using python 3
 ```
 wsk action update myAction myAction.py --docker openwhisk/python3action:1.0.2
 ```
-Replace `python3action` with `python2action` to use python 2.
-
 
 ### To use on deployment that contains the rutime as a kind
 To use as a kind action using python 3
@@ -52,7 +50,6 @@ Build and Push image
 docker login
 ./gradlew core:pythonAction:distDocker -PdockerImagePrefix=$prefix-user -PdockerRegistry=docker.io
 ```
-Replace `core:pythonAction` with `core:python2Action` to build python 2 instead.
 
 Deploy OpenWhisk using ansible environment that contains the kind `python:3` and `python:2`
 Assuming you have OpenWhisk already deploy locally and `OPENWHISK_HOME` pointing to root directory of OpenWhisk core repository.
@@ -86,7 +83,6 @@ Then create the action using your image from dockerhub
 wsk action update myAction myAction.py --docker $user_prefix/python3action
 ```
 The `$user_prefix` is usually your dockerhub user id.
-Replace `python3action` with `python2action` to use python 2
 
 ### Testing
 Install dependencies from the root directory on $OPENWHISK_HOME repository

core/python2Action/CHANGELOG.md

@@ -14,14 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM golang:1.11 as builder
-ENV PROXY_SOURCE=https://github.com/apache/openwhisk-runtime-go/archive/golang1.11@1.13.0-incubating.tar.gz
-RUN curl -L "$PROXY_SOURCE" | tar xzf - \
-  && mkdir -p src/github.com/apache \
-  && mv openwhisk-runtime-go-golang1.11-1.13.0-incubating \
-     src/github.com/apache/incubator-openwhisk-runtime-go \
-  && cd src/github.com/apache/incubator-openwhisk-runtime-go/main \
-  && CGO_ENABLED=0 go build -o /bin/proxy
+FROM golang:1.12 as builder
+RUN env CGO_ENABLED=0 go get github.com/apache/openwhisk-runtime-go/main && mv /go/bin/main /bin/proxy
+#ENV PROXY_SOURCE=https://github.com/apache/openwhisk-runtime-go/archive/golang1.11@1.13.0-incubating.tar.gz
+#RUN curl -L "$PROXY_SOURCE" | tar xzf - \
+#  && mkdir -p src/github.com/apache \
+#  && mv openwhisk-runtime-go-golang1.11-1.13.0-incubating \
+#     src/github.com/apache/incubator-openwhisk-runtime-go \
+#  && cd src/github.com/apache/incubator-openwhisk-runtime-go/main \
+#  && CGO_ENABLED=0 go build -o /bin/proxy
 
 FROM python:3.7-stretch
 

core/python2Action/Dockerfile

@@ -44,5 +44,15 @@ tasks.withType(ScalaCompile) {
 }
 
 task testPython3(type: Test) {
-    exclude 'runtime/actionContainers/Python2**'
 }
+
+task buildArtifacts(type:Exec) {
+    workingDir 'src/test/resources'
+    commandLine './build.sh'
+}
+
+tasks.withType(Test) {
+    dependsOn buildArtifacts
+}
+
+testClasses.dependsOn(buildArtifacts)

core/pythonActionLoop/Dockerfile

@@ -0,0 +1,40 @@
+#!/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.
+#
+
+set -e
+
+if [ -f ".built" ]; then
+  echo "Test zip artifacts already built, skipping"
+  exit 0
+fi
+
+# see what version of python is running
+py=$(python --version 2>&1 | awk -F' ' '{print $2}')
+if [[ $py == 3.7.* ]]; then
+  echo "python version is $py (ok)"
+else
+  echo "python version is $py (not ok)"
+  echo "cannot generated test artifacts and tests will fail"
+  exit -1
+fi
+
+(cd python_virtualenv && ./build.sh && zip ../python_virtualenv.zip -r .)
+(cd python_virtualenv_invalid_main && ./build.sh && zip ../python_virtualenv_invalid_main.zip -r .)
+(cd python_virtualenv_invalid_venv && zip ../python_virtualenv_invalid_venv.zip -r .)
+
+touch .built

tests/build.gradle

@@ -1,3 +1,6 @@
+#!/usr/bin/env python
+"""Python Hello virtualenv test.
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,21 +17,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+"""
 
-ext.dockerImageName = 'python2action'
-apply from: '../../gradle/docker.gradle'
-distDocker.dependsOn 'copyFiles'
-distDocker.finalizedBy 'rmFiles'
-
-def runners = files(
-    new File(project(':core:pythonAction').projectDir, 'pythonrunner.py')
-)
+from random_useragent.random_useragent import Randomize
 
-task copyFiles(type: Copy) {
-    from runners
-    into '.'
-}
+def main(args):
+    return {"agent": Randomize().random_agent('desktop','linux')}
 
-task rmFiles(type: Delete) {
-    delete runners.collect { it.getName() }
-}
+def naim(args):
+    return main(args)

tests/src/test/resources/build.sh

@@ -0,0 +1,22 @@
+#!/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.
+#
+
+virtualenv virtualenv
+source virtualenv/bin/activate
+pip install -r requirements.txt
+deactivate