[incubator-openwhisk-release] branch master updated: Update ASF license exlcusion table with latest info. (#151)

2018-05-15 Thread pdesai 
This is an automated email from the ASF dual-hosted git repository.

pdesai pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-openwhisk-release.git


The following commit(s) were added to refs/heads/master by this push:
 new 92fe887  Update ASF license exlcusion table with latest info. (#151)
92fe887 is described below

commit 92fe8872540702b8df01a55064d06dba06f45b6f
Author: Matt Rutkowski 
AuthorDate: Tue May 15 19:20:16 2018 -0500

Update ASF license exlcusion table with latest info. (#151)

* Update ASF license exlcusion table with latest info.

* Update ASF license exlcusion table with latest info.

* Update general exclusion table.

* Use mini headers in all .js and .yaml test files.

* Update inclusion/exclusion tables with more information.

* Update inclusion/exclusion tables with more information.

* Update inclusion/exclusion tables with more information.

* Update inclusion/exclusion tables with more information.

* Update inclusion/exclusion tables with more information.

* Update inclusion/exclusion tables with more information.

* Update inclusion/exclusion tables with more information.

* Update inclusion/exclusion tables with more information.

* Update inclusion/exclusion tables with more information.

* Update inclusion/exclusion tables with more information.
---
 docs/license_compliance.md   |  58 +--
 docs/license_exclusions.md   | 223 +--
 docs/release_instructions.md |   2 +-
 3 files changed, 77 insertions(+), 206 deletions(-)

diff --git a/docs/license_compliance.md b/docs/license_compliance.md
index 3ffd683..6f9aeca 100644
--- a/docs/license_compliance.md
+++ b/docs/license_compliance.md
@@ -45,24 +45,26 @@ For convenience, we provide a summary listing of all 
project LICENSE and NOTICE
 
 In accordance with Apache LICENSE policies, the table below lists files/file 
types that the community affirms MUST have an Apache LICENSE header since they 
are creating works representing Intellectual Property.
 
-In addition, the type of header used (i.e., "full" ASF header or ASF approved 
"minified" header) is noted along with the justification as is allowed by 
Apache policy.
+In addition, the recommended type of approved ASF license header (i.e., "full" 
or "minified" header) is noted as best practice.
 
 | File type | ASF Header Type | Rationale |
 | --- | --- | --- |
-| Source Code (e.g., .scala, .go, .java, .py, etc.) | Full ASF license header 
| |
-| Action Functions (source) (e.g., .js, .py, .swift, etc, particularly under 
`tests/dat` folder.) | Mini ASF license header | Needs IP protection; Use 
"Mini" header as best practice for performance reasons. |
-| Documentation (e.g., `*.md`, `.html`) | Full ASF license header | |
-| YAML files (`*.yaml`, `*.yml`) | Full or Mini ASF license header | |
-| XML files (`*.xml`) | Full or Mini ASF license header | |
-| Docker file (`dockerfile`) | Full ASF license header | |
-| Script files (`*.sh`) | Mini ASF license header | |
-| Makefile | Full ASF license header | |
-| `build.gradle` and `settings.gradle` | Full ASF license header | build 
script and configuration for building with Gradle |
-| `gradle/docker.gradle` | Full ASF license header | build script to generate 
docker image using Gradle |
-| `*.conf` | Full or Mini ASF license header | Configuration file |
+| Source Code (e.g., *.scala, *.go, *.java, *.py, etc.) | Full | |
+| Documentation (e.g., `*.md`) | Full | |
+| Web Content (e.g., `*.html`, `.css`) | Full | |
+| Scala Configurations (`*.conf`) | Full | Scala (Java)  configuration files 
may contain code or interfaces. |
+| Action Functions (source) (e.g., .js, .py, .swift, etc, particularly under 
`tests/dat` folder.) | Mini | Needs IP protection; Use "Mini" header as best 
practice for performance reasons. |
+| Makefile | Full | May contain functional code |
+| Docker file (`dockerfile`) | Mini | |
+| Script files (`*.sh`) | Mini | Contains functional scripting code |
+| YAML files (`*.yaml`, `*.yml`) | Mini | |
+| XML files (`*.xml`) | Mini | |
+| `build.gradle` and `settings.gradle` | Full | Contains build script and 
configuration for building with Gradle |
+| `gradle/docker.gradle` | Full | build script to generate docker image using 
Gradle |
 
 
  Notes
+- Full ASF License headers are always accepted regardless if a "Mini" header 
is recommended as best practice.
 - Action source files used in performance testing may be added to "[Known 
exclusions](#known-exclusions)" when justified.
 
 
@@ -72,18 +74,17 @@ In accordance with Apache LICENSE policies, the table below 
lists general exclus
 
 | File type | Rationale |
 | --- | --- |
-| Git configuration files (`.gitattributes`, `.gitignore`) | Not much 
creativity |
-| Gradle files | Not much

[incubator-openwhisk] branch master updated: Assure all Dockerfiles have ASF header. (#3659)

2018-05-15 Thread pdesai 
This is an automated email from the ASF dual-hosted git repository.

pdesai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
 new 6397912  Assure all Dockerfiles have ASF header. (#3659)
6397912 is described below

commit 6397912386537056b295300a7c262218047d60ae
Author: Matt Rutkowski 
AuthorDate: Tue May 15 17:47:25 2018 -0500

Assure all Dockerfiles have ASF header. (#3659)

* Assure all Dockerfiles have ASF header.

* Use mini header for all Dockerfiles
---
 actionRuntimes/actionProxy/Dockerfile  |  3 +++
 actionRuntimes/javaAction/Dockerfile   |  3 +++
 actionRuntimes/nodejs6Action/Dockerfile|  3 +++
 actionRuntimes/nodejs8Action/Dockerfile|  3 +++
 actionRuntimes/php7.1Action/Dockerfile |  3 +++
 actionRuntimes/python2Action/Dockerfile|  3 +++
 actionRuntimes/pythonAction/Dockerfile |  3 +++
 actionRuntimes/swift3.1.1Action/Dockerfile |  3 +++
 actionRuntimes/swift4.1Action/Dockerfile   |  3 +++
 common/scala/Dockerfile| 15 +--
 core/controller/Dockerfile | 15 +--
 core/invoker/Dockerfile| 15 +--
 sdk/docker/Dockerfile  |  4 +++-
 13 files changed, 33 insertions(+), 43 deletions(-)

diff --git a/actionRuntimes/actionProxy/Dockerfile 
b/actionRuntimes/actionProxy/Dockerfile
index 5ca674f..32bf71b 100644
--- a/actionRuntimes/actionProxy/Dockerfile
+++ b/actionRuntimes/actionProxy/Dockerfile
@@ -1,2 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
 # Dockerfile for docker skeleton (useful for running blackbox binaries, 
scripts, or Python 3 actions) .
 FROM openwhisk/dockerskeleton:1.3.0
diff --git a/actionRuntimes/javaAction/Dockerfile 
b/actionRuntimes/javaAction/Dockerfile
index 4fd54cb..8c5c1ac 100644
--- a/actionRuntimes/javaAction/Dockerfile
+++ b/actionRuntimes/javaAction/Dockerfile
@@ -1 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
 FROM openwhisk/java8action:1.1.0
diff --git a/actionRuntimes/nodejs6Action/Dockerfile 
b/actionRuntimes/nodejs6Action/Dockerfile
index 17541e0..1a382ff 100644
--- a/actionRuntimes/nodejs6Action/Dockerfile
+++ b/actionRuntimes/nodejs6Action/Dockerfile
@@ -1 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
 FROM openwhisk/nodejs6action:1.9.0
diff --git a/actionRuntimes/nodejs8Action/Dockerfile 
b/actionRuntimes/nodejs8Action/Dockerfile
index 2853c5b..4ae3778 100644
--- a/actionRuntimes/nodejs8Action/Dockerfile
+++ b/actionRuntimes/nodejs8Action/Dockerfile
@@ -1 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
 FROM openwhisk/action-nodejs-v8:1.6.0
diff --git a/actionRuntimes/php7.1Action/Dockerfile 
b/actionRuntimes/php7.1Action/Dockerfile
index 0b69414..885c6ba 100644
--- a/actionRuntimes/php7.1Action/Dockerfile
+++ b/actionRuntimes/php7.1Action/Dockerfile
@@ -1 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
 FROM openwhisk/action-php-v7.1:1.0.0
diff --git a/actionRuntimes/python2Action/Dockerfile 
b/actionRuntimes/python2Action/Dockerfile
index a3ff63e..f06d8c4 100644
--- a/actionRuntimes/python2Action/Dockerfile
+++ b/actionRuntimes/python2Action/Dockerfile
@@ -1 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
 FROM openwhisk/python2action:1.0.0
diff --git a/actionRuntimes/pythonAction/Dockerfile 
b/actionRuntimes/pythonAction/Dockerfile
index 1f67c38..ccc727f 100644
--- a/actionRuntimes/pythonAction/Dockerfile
+++ b/actionRuntimes/pythonAction/Dockerfile
@@ -1 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
 FROM openwhisk/python3action:1.0.0
diff --git a/actionRuntimes/swift3.1.1Action/Dockerfile 
b/actionRuntimes/swift3.1.1Action/Dockerfile
index 1f1de15..f735d27 100755
--- a/actionRuntimes/swift3.1.1Action/Dockerfile
+++ b/actionRuntimes/swift3.1.1Action/Dockerfile
@@ -1 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
 FROM openwhisk/action-swift-v3.1.1:1.0.0
diff --git a/actionRuntimes/swift4.1Action/Dockerfile

[incubator-openwhisk] branch master updated: Use ‘docker.host’ java property as a way to set Docker access for Runtime unit tests (#3616)

2018-05-15 Thread csantanapr 
This is an automated email from the ASF dual-hosted git repository.

csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
 new 8e7fc3e  Use ‘docker.host’ java property as a way to set Docker access 
for Runtime unit tests (#3616)
8e7fc3e is described below

commit 8e7fc3ea716cf40b1b5857a55407d60c0bf09aae
Author: Jonathan Springer 
AuthorDate: Tue May 15 18:18:59 2018 -0400

Use ‘docker.host’ java property as a way to set Docker access for Runtime 
unit tests (#3616)
---
 .../scala/actionContainers/ActionContainer.scala   | 45 +-
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/tests/src/test/scala/actionContainers/ActionContainer.scala 
b/tests/src/test/scala/actionContainers/ActionContainer.scala
index cba29d9..3ee1f47 100644
--- a/tests/src/test/scala/actionContainers/ActionContainer.scala
+++ b/tests/src/test/scala/actionContainers/ActionContainer.scala
@@ -30,13 +30,13 @@ import scala.concurrent.duration.DurationInt
 import scala.sys.process.ProcessLogger
 import scala.sys.process.stringToProcess
 import scala.util.Random
+import scala.util.{Failure, Success}
 
 import org.apache.commons.lang3.StringUtils
 import org.scalatest.FlatSpec
 import org.scalatest.Matchers
 
 import akka.actor.ActorSystem
-import common.WhiskProperties
 import spray.json._
 import whisk.core.entity.Exec
 
@@ -88,14 +88,38 @@ object ActionContainer {
   }
 
   private lazy val dockerCmd: String = {
-val version = WhiskProperties.getProperty("whisk.version.name")
-// Check if we are running on docker-machine env.
-val hostStr = if (version.toLowerCase().contains("mac")) {
-  s" --host tcp://${WhiskProperties.getMainDockerEndpoint} "
-} else {
-  " "
+/*
+ * The docker host is set to a provided property 'docker.host' if it's
+ * available; otherwise by the environment variable DOCKER_HOST
+ * (which is usually set, especially for DOCKER_MACHINE).
+ *
+ * The plan is to move builds to using 'gradle-docker-plugin', which know
+ * its docker socket and to have it pass the docker socket implicitly using
+ * 'systemProperty "docker.host", docker.url'.  Eventually, we will also
+ * need to handle TLS certificates here.  Again, 'gradle-docker-plugin'
+ * knows where they are; we will just add system properties to get the
+ * information onto the docker command line.
+ */
+val dockerCmdString = dockerBin +
+  sys.props
+.get("docker.host")
+.orElse(sys.env.get("DOCKER_HOST"))
+.map(" --host " + _)
+.getOrElse("")
+// Test here that this actually works, otherwise throw a somewhat 
understandable error message
+proc(s"$dockerCmdString info").onComplete {
+  case Success((v, _, _)) if (v != 0) =>
+throw new RuntimeException(s"""Unable to connect to docker host using 
$dockerCmdString as command string.
+  |The docker host is determined using the Java property 'docker.host' 
or
+  |the envirnoment variable 'DOCKER_HOST'. Please verify that one or 
the
+  |other is set for your build/test process.""".stripMargin)
+  case Success((v, _, _)) if (v == 0) =>
+  // Do nothing
+  case Failure(t) =>
+throw t
 }
-s"$dockerBin $hostStr"
+
+dockerCmdString
   }
 
   private def docker(command: String): String = s"$dockerCmd $command"
@@ -145,8 +169,9 @@ object ActionContainer {
 
 // ...find out its IP address...
 val (ip, port) =
-  if (WhiskProperties.getProperty("whisk.version.name") == "local" &&
-  WhiskProperties.onMacOSX()) {
+  if (System.getProperty("os.name").toLowerCase().contains("mac") && 
!sys.env
+.get("DOCKER_HOST")
+.exists(_.trim.nonEmpty)) {
 // on MacOSX, where docker for mac does not permit communicating with 
container directly
 val p = 8988 // port must be available or docker run will fail
 createContainer(Some(p))

-- 
To stop receiving notification emails like this one, please contact
csantan...@apache.org.

[incubator-openwhisk-wskdeploy] annotated tag latest updated (647db37 -> f976758)

2018-05-15 Thread houshengbo 
This is an automated email from the ASF dual-hosted git repository.

houshengbo pushed a change to annotated tag latest
in repository 
https://gitbox.apache.org/repos/asf/incubator-openwhisk-wskdeploy.git.


*** WARNING: tag latest was modified! ***

from 647db37  (commit)
  to f976758  (tag)
 tagging 647db3731706bef533f479577cae115ad37b8635 (commit)
 replaces 0.9.3
  by Travis CI
  on Tue May 15 17:03:56 2018 -0500

- Log -
Generated tag from Travis CI build 2168
---


No new revisions were added by this update.

Summary of changes:

-- 
To stop receiving notification emails like this one, please contact
houshen...@apache.org.

[incubator-openwhisk-wskdeploy] branch master updated: Fix makefile ASF header & use ICF as example of curl usage. (#907)

2018-05-15 Thread pdesai 
This is an automated email from the ASF dual-hosted git repository.

pdesai pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-openwhisk-wskdeploy.git


The following commit(s) were added to refs/heads/master by this push:
 new 647db37  Fix makefile ASF header & use ICF as example of curl usage. 
(#907)
647db37 is described below

commit 647db3731706bef533f479577cae115ad37b8635
Author: Matt Rutkowski 
AuthorDate: Tue May 15 17:03:56 2018 -0500

Fix makefile ASF header & use ICF as example of curl usage. (#907)

* Fix makefile ASF header & use ICF as example of curl usage.

* Fix Dockerfile hash license header

* Fix Dockerfile hash license header

* Fix README.md hash license header uner wski18n

* Use mini headers in all .js and .yaml test files.

* Fix bad hash headers in yaml and js test files.
---
 Dockerfile | 23 +++---
 Makefile   | 23 +++---
 ...eployment_hello_world_triggerrule_bindings.yaml | 15 +-
 ...deployment_hello_world_triggerrule_unbound.yaml | 15 +-
 docs/examples/manifest_hello_world.yaml| 15 +-
 .../manifest_hello_world_advanced_parms.yaml   | 15 +-
 docs/examples/manifest_hello_world_apigateway.yaml | 15 +-
 .../manifest_hello_world_env_var_parms.yaml| 15 +-
 .../examples/manifest_hello_world_fixed_parms.yaml | 15 +-
 docs/examples/manifest_hello_world_runtime.yaml| 15 +-
 .../examples/manifest_hello_world_triggerrule.yaml | 15 +-
 .../manifest_hello_world_triggerrule_unbound.yaml  | 15 +-
 .../examples/manifest_hello_world_typed_parms.yaml | 15 +-
 docs/examples/manifest_package_minimal.yaml| 15 +-
 docs/examples/manifest_sequence_basic.yaml | 15 +-
 docs/wskdeploy_action_runtime.md   |  8 ++--
 tests/dat/manifest_data_compose_packages.yaml  | 17 ++--
 .../random-name-1.yaml | 15 +-
 .../random-name-2.yaml | 15 +-
 .../yaml-deployment-with-yml-manifest.yaml | 15 +-
 .../yaml-manifest-with-yml-deployment.yaml | 15 +-
 .../validate-packages-in-manifest/deployment.yaml  | 15 +-
 .../validate-packages-in-manifest/manifest.yaml| 15 +-
 .../integration/validate-project/deployment.yaml   | 15 +-
 .../src/integration/validate-project/manifest.yaml | 15 +-
 .../actions/helloworld.js  | 22 ++---
 .../validatePackagesInDeployment/deployment.yaml   | 15 +-
 .../validatePackagesInDeployment/manifest.yaml | 15 +-
 .../validateSequencesCreation/actions/function.js  | 22 ++---
 tests/src/integration/webaction/src/greeting.js| 22 ++---
 tests/src/integration/websequence/manifest.yaml| 17 ++--
 tests/src/integration/websequence/src/greeting.js  | 22 ++---
 .../zipaction/actions/cat/node_modules/cat/bin.js  | 22 -
 .../actions/cat/node_modules/cat/example.js| 21 
 .../actions/cat/node_modules/cat/index.js  | 21 
 tests/usecases/api-gateway/actions/fire/index.js   | 22 ++---
 .../usecases/api-gateway/simple_api_manifest.yaml  | 15 +-
 tests/usecases/badyaml/deployment.yaml | 15 +-
 tests/usecases/badyaml/manifest.yaml   | 15 +-
 tests/usecases/dependency/manifest.yaml| 15 +-
 tests/usecases/github/deployment.yaml  | 15 +-
 tests/usecases/github/manifest.yaml| 15 +-
 tests/usecases/github/src/print-github-commits.js  | 22 ++---
 tests/usecases/slack/actions/post-to-slack.js  | 22 ++---
 tests/usecases/slack/deployment.yaml   | 15 +-
 tests/usecases/slack/manifest.yaml | 15 +-
 tests/usecases/triggerrule/src/greeting.js | 22 ++---
 tools/travis/docker/Dockerfile | 15 +-
 wski18n/README.md  | 23 +++---
 49 files changed, 94 insertions(+), 737 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a2a04c1..2c5123b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,18 @@
 #
-# 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

[incubator-openwhisk-wskdeploy] annotated tag latest deleted (was 5bfb83f)

2018-05-15 Thread houshengbo 
This is an automated email from the ASF dual-hosted git repository.

houshengbo pushed a change to annotated tag latest
in repository 
https://gitbox.apache.org/repos/asf/incubator-openwhisk-wskdeploy.git.


*** WARNING: tag latest was deleted! ***

   tag was  5bfb83f

The revisions that were on this annotated tag are still contained in
other references; therefore, this change does not discard any commits
from the repository.

-- 
To stop receiving notification emails like this one, please contact
houshen...@apache.org.

[incubator-openwhisk-wskdeploy] annotated tag latest updated (b3aa03b -> f7fce66)

2018-05-15 Thread houshengbo 
This is an automated email from the ASF dual-hosted git repository.

houshengbo pushed a change to annotated tag latest
in repository 
https://gitbox.apache.org/repos/asf/incubator-openwhisk-wskdeploy.git.


*** WARNING: tag latest was modified! ***

from b3aa03b  (commit)
  to f7fce66  (tag)
 tagging b3aa03b3312cad275e7b7dee68f38df25a07bff3 (commit)
 replaces 0.9.3
  by Travis CI
  on Tue May 15 22:54:05 2018 +0300

- Log -
Generated tag from Travis CI build 2164
---


No new revisions were added by this update.

Summary of changes:

-- 
To stop receiving notification emails like this one, please contact
houshen...@apache.org.

[incubator-openwhisk-wskdeploy] branch master updated: Resolves issue #899 (#906)

2018-05-15 Thread pdesai 
This is an automated email from the ASF dual-hosted git repository.

pdesai pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-openwhisk-wskdeploy.git


The following commit(s) were added to refs/heads/master by this push:
 new b3aa03b  Resolves issue #899 (#906)
b3aa03b is described below

commit b3aa03b3312cad275e7b7dee68f38df25a07bff3
Author: Pavel Kravchenko 
AuthorDate: Tue May 15 22:54:05 2018 +0300

Resolves issue #899 (#906)

* resolves issue #899

* bug fix
---
 parsers/yamlparser.go   |  1 +
 tests/src/integration/common/wskdeploy.go   |  4 
 tests/src/integration/export/export_test.go | 29 +++--
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/parsers/yamlparser.go b/parsers/yamlparser.go
index 0b7c158..77f35da 100644
--- a/parsers/yamlparser.go
+++ b/parsers/yamlparser.go
@@ -403,6 +403,7 @@ func (yaml *YAML) ComposeParsersAction(wskact whisk.Action) 
*Action {
action.Name = wskact.Name
action.Namespace = wskact.Namespace
action.Version = wskact.Version
+   action.Main = wskact.Exec.Main
 
action.Inputs = make(map[string]Parameter)
for _, keyval := range wskact.Parameters {
diff --git a/tests/src/integration/common/wskdeploy.go 
b/tests/src/integration/common/wskdeploy.go
index abcbc3a..32938a2 100644
--- a/tests/src/integration/common/wskdeploy.go
+++ b/tests/src/integration/common/wskdeploy.go
@@ -171,6 +171,10 @@ func (Wskdeploy *Wskdeploy) 
ManagedDeploymentOnlyManifest(manifestPath string) (
return Wskdeploy.RunCommand("sync", "-m", manifestPath)
 }
 
+func (Wskdeploy *Wskdeploy) ManagedDeploymentManifestAndProject(manifestPath 
string, projectName string) (string, error) {
+   return Wskdeploy.RunCommand("sync", "-m", manifestPath, 
"--projectname", projectName)
+}
+
 func (Wskdeploy *Wskdeploy) ManagedDeployment(manifestPath string, 
deploymentPath string) (string, error) {
return Wskdeploy.RunCommand("sync", "-m", manifestPath, "-d", 
deploymentPath)
 }
diff --git a/tests/src/integration/export/export_test.go 
b/tests/src/integration/export/export_test.go
index 6cc0124..63f8fce 100644
--- a/tests/src/integration/export/export_test.go
+++ b/tests/src/integration/export/export_test.go
@@ -62,6 +62,29 @@ func TestExport(t *testing.T) {
assert.Equal(t, nil, err, "Failed to undeploy the lib2.")
 }
 
+func TestExportHelloWorld(t *testing.T) {
+   projectName := "HELLO_WORLD"
+   wskdeploy := common.NewWskdeploy()
+
+   _, err := 
wskdeploy.ManagedDeploymentManifestAndProject(manifestHelloWorldPath, 
projectName)
+   assert.Equal(t, nil, err, "Failed to deploy manifest file.")
+
+   _, err = wskdeploy.ExportProject(projectName, 
targetManifestHelloWorldPath)
+   assert.Equal(t, nil, err, "Failed to export project.")
+
+   _, err = os.Stat(targetManifestHelloWorldPath)
+   assert.Equal(t, nil, err, "Missing exported manifest file")
+
+   _, err = wskdeploy.UndeployManifestPathOnly(manifestHelloWorldPath)
+   assert.Equal(t, nil, err, "Failed to undeploy")
+
+   _, err = 
wskdeploy.ManagedDeploymentManifestAndProject(targetManifestHelloWorldPath, 
projectName)
+   assert.Equal(t, nil, err, "Failed to redeploy exported project.")
+
+   _, err = 
wskdeploy.UndeployManifestPathOnly(targetManifestHelloWorldPath)
+   assert.Equal(t, nil, err, "Failed to undeploy exported project")
+}
+
 func TestExport2Pack(t *testing.T) {
projectName := "2pack"
wskdeploy := common.NewWskdeploy()
@@ -93,6 +116,8 @@ var (
targetManifestFolder = os.Getenv("GOPATH") + 
"/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/export/tmp/"
targetManifestPath   = targetManifestFolder + "manifest.yaml"
 
-   manifest2PackPath   = os.Getenv("GOPATH") + 
"/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/export/manifest_2pack.yaml"
-   target2PackManifestPath = targetManifestFolder + 
"exported2packmanifest.yaml"
+   manifestHelloWorldPath   = os.Getenv("GOPATH") + 
"/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/helloworld/manifest.yaml"
+   targetManifestHelloWorldPath = targetManifestFolder + "manifest.yaml"
+   manifest2PackPath= os.Getenv("GOPATH") + 
"/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/export/manifest_2pack.yaml"
+   target2PackManifestPath  = targetManifestFolder + 
"exported2packmanifest.yaml"
 )

-- 
To stop receiving notification emails like this one, please contact
pde...@apache.org.

[incubator-openwhisk-client-go] branch master updated: Fix Makefile to use latest Hash ASF license header. (#85)

2018-05-15 Thread pdesai 
This is an automated email from the ASF dual-hosted git repository.

pdesai pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-openwhisk-client-go.git


The following commit(s) were added to refs/heads/master by this push:
 new a951ed9  Fix Makefile to use latest Hash ASF license header. (#85)
a951ed9 is described below

commit a951ed9ca18b2725ba889558b201c508d525aa2e
Author: Matt Rutkowski 
AuthorDate: Tue May 15 13:00:25 2018 -0500

Fix Makefile to use latest Hash ASF license header. (#85)
---
 Makefile | 23 ---
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 397ba6b..e4cde07 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,18 @@
 #
-# 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:
+# 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
+# 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.
+# 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.
 #
 
 deps:

-- 
To stop receiving notification emails like this one, please contact
pde...@apache.org.

[incubator-openwhisk-catalog] branch master updated: Use websocket.org for WebSocket tests (#276)

2018-05-15 Thread japetrsn 
This is an automated email from the ASF dual-hosted git repository.

japetrsn pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-openwhisk-catalog.git


The following commit(s) were added to refs/heads/master by this push:
 new ab57787  Use websocket.org for WebSocket tests (#276)
ab57787 is described below

commit ab5778751df0961a73751e2e15fbbcb2f08655d1
Author: James Dubee 
AuthorDate: Tue May 15 12:34:22 2018 -0400

Use websocket.org for WebSocket tests (#276)

* Use websocket.org for WebSocket tests
---
 .../scala/packages/websocket/WebSocketTests.scala  | 73 +-
 1 file changed, 1 insertion(+), 72 deletions(-)

diff --git a/tests/src/test/scala/packages/websocket/WebSocketTests.scala 
b/tests/src/test/scala/packages/websocket/WebSocketTests.scala
index 54353eb..c870c1b 100644
--- a/tests/src/test/scala/packages/websocket/WebSocketTests.scala
+++ b/tests/src/test/scala/packages/websocket/WebSocketTests.scala
@@ -17,7 +17,6 @@
 
 package packages.websocket
 
-import java.io.File
 import java.net.URI
 
 import scala.concurrent.duration.DurationInt
@@ -37,18 +36,12 @@ class WebSocketTests extends TestHelpers with 
WskTestHelpers with BeforeAndAfter
 
   val websocketSendAction = "/whisk.system/websocket/send"
 
-  val containerName = "websocketServerOW"
-  val userDir: String = System.getProperty("user.dir")
-  val websocketDir: String = userDir + "/dat/websocket"
-  val websocketHost: String = wskprops.apihost
-  val websocketPort = "20002"
-
   behavior of "Websocket action"
 
   /**
* This test requires a websocket server running on the given URI.
*/
-  val serverURI: URI = new URI(s"ws://$websocketHost:$websocketPort")
+  val serverURI: URI = new URI("ws://echo.websocket.org")
 
   it should "Use the websocket action to send a payload" in {
 val uniquePayload = s"The cow says ${System.currentTimeMillis()}".toJson
@@ -90,68 +83,4 @@ class WebSocketTests extends TestHelpers with WskTestHelpers 
with BeforeAndAfter
 }
   }
 
-  override def beforeAll() {
-
-val websocketServer =
-  """
- | const WebSocket = require("ws");
- | const wss = new WebSocket.Server({ port: 8080 });
- | wss.on("connection", function connection(ws) {
- |  ws.on("message", function incoming(message) {
- |ws.send(message);
- |  });
- | });
- """.replace("\r", "").stripMargin.lines.mkString
-TestUtils.runCmd(TestUtils.DONTCARE_EXIT, new File("."), "docker", "kill", 
containerName)
-TestUtils.runCmd(TestUtils.DONTCARE_EXIT, new File("."), "docker", "rm", 
containerName)
-TestUtils.runCmd(
-  0,
-  new File("."),
-  "docker",
-  "run",
-  "-d",
-  "-p",
-  "20002:8080",
-  "--name",
-  containerName,
-  "node",
-  "sh",
-  "-c",
-  s"npm install ws; echo '$websocketServer' | node")
-sleepUntilContainerRunning()
-
-  }
-
-  def sleepUntilContainerRunning() {
-var counter = 12
-var running = false
-do {
-  counter = counter - 1
-  val isdb2Running = TestUtils
-.runCmd(
-  TestUtils.DONTCARE_EXIT,
-  new File("."),
-  "docker",
-  "exec",
-  "-t",
-  containerName,
-  "curl",
-  "http://localhost:8080;,
-  "--connect-timeout",
-  "5")
-
-  if (isdb2Running.exitCode != 0) {
-println("sleeping 5 seconds to wait for websocket server")
-Thread.sleep(5000)
-  } else {
-running = true
-  }
-} while (counter > 0 && !running)
-running shouldBe true
-  }
-
-  override def afterAll() {
-TestUtils.runCmd(TestUtils.DONTCARE_EXIT, new File("."), "docker", "kill", 
containerName)
-TestUtils.runCmd(TestUtils.DONTCARE_EXIT, new File("."), "docker", "rm", 
containerName)
-  }
 }

-- 
To stop receiving notification emails like this one, please contact
japet...@apache.org.

[incubator-openwhisk-deploy-kube] branch master updated: helm improvements (#199)

2018-05-15 Thread csantanapr 
This is an automated email from the ASF dual-hosted git repository.

csantanapr pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-openwhisk-deploy-kube.git


The following commit(s) were added to refs/heads/master by this push:
 new 97f4f4b  helm improvements (#199)
97f4f4b is described below

commit 97f4f4b6c4eb3b07af611297936dc662996045c7
Author: David Grove 
AuthorDate: Tue May 15 09:48:49 2018 -0400

helm improvements (#199)

1. uniform definition of service hostnames throughout
2. define file name for runtimes.json in values.yaml
3. make nginx and apigw service NodePort configurable via values.yaml
4. Define db provider and prototcol in values.yaml
5. install /whisk.system/apimgmt actions
6. check for successful completion of install-catalog install-routemgmt jobs
7. rename affinity.controlPlane to affinity.core and add affinity.edge and 
affinity.provider
---
 helm/README.md |  8 -
 helm/templates/_affinity.tpl   | 33 ++---
 helm/templates/_helpers.tpl| 42 --
 helm/templates/_readiness.tpl  |  8 ++---
 helm/templates/apigateway.yaml |  7 ++--
 helm/templates/controller.yaml |  4 +--
 helm/templates/couchdb.yaml|  2 +-
 helm/templates/install_catalog_job.yaml|  2 +-
 ...catalog_job.yaml => install_routemgmt_job.yaml} | 14 +---
 helm/templates/invoker.yaml|  4 +--
 helm/templates/kafka.yaml  |  4 +--
 helm/templates/nginx.yaml  |  4 ++-
 helm/templates/nginx_configmap.yaml|  2 +-
 helm/templates/zookeeper.yaml  |  2 +-
 helm/values.yaml   | 11 +++---
 tools/travis/build-helm.sh | 20 ---
 16 files changed, 113 insertions(+), 54 deletions(-)

diff --git a/helm/README.md b/helm/README.md
index eff997d..c774a2e 100644
--- a/helm/README.md
+++ b/helm/README.md
@@ -88,7 +88,13 @@ where `minikube ip` returns `192.168.99.100`.
 whisk:
   ingress:
 api_host: 192.168.99.100:31001
-apigw_url: 192.168.99.100:31004
+apigw_url: http://192.168.99.100:31004
+
+nginx:
+  httpsNodePort: 31001
+
+apigw:
+  apiNodePort: 31004
 ```
 
 Deployment can be done by using the following single command:
diff --git a/helm/templates/_affinity.tpl b/helm/templates/_affinity.tpl
index 8f3267d..efa0d73 100644
--- a/helm/templates/_affinity.tpl
+++ b/helm/templates/_affinity.tpl
@@ -1,7 +1,7 @@
 # This file defines template snippets for scheduler affinity and anti-affinity
 
-{{/* Generic control-plane affinity */}}
-{{- define "affinity.controlPlane" -}}
+{{/* Generic core affinity */}}
+{{- define "affinity.core" -}}
 # prefer to not run on an invoker node (only prefer because of single node 
clusters)
 nodeAffinity:
   preferredDuringSchedulingIgnoredDuringExecution:
@@ -12,7 +12,7 @@ nodeAffinity:
 operator: NotIn
 values:
 - {{ .Values.affinity.invokerNodeLabel }}
-# prefer to run on a control-plane node
+# prefer to run on a core node
 nodeAffinity:
   preferredDuringSchedulingIgnoredDuringExecution:
   - weight: 80
@@ -21,7 +21,32 @@ nodeAffinity:
   - key: openwhisk-role
 operator: In
 values:
-- {{ .Values.affinity.controlPlaneNodeLabel }}
+- {{ .Values.affinity.coreNodeLabel }}
+{{- end -}}
+
+
+{{/* Generic edge affinity */}}
+{{- define "affinity.edge" -}}
+# prefer to not run on an invoker node (only prefer because of single node 
clusters)
+nodeAffinity:
+  preferredDuringSchedulingIgnoredDuringExecution:
+  - weight: 100
+preference:
+  matchExpressions:
+  - key: openwhisk-role
+operator: NotIn
+values:
+- {{ .Values.affinity.invokerNodeLabel }}
+# prefer to run on a edge node
+nodeAffinity:
+  preferredDuringSchedulingIgnoredDuringExecution:
+  - weight: 80
+preference:
+  matchExpressions:
+  - key: openwhisk-role
+operator: In
+values:
+- {{ .Values.affinity.edgeNodeLabel }}
 {{- end -}}
 
 
diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl
index 19dc021..917d311 100644
--- a/helm/templates/_helpers.tpl
+++ b/helm/templates/_helpers.tpl
@@ -1,28 +1,34 @@
-{{/* Generate kafka url without port */}}
-{{- define "kafka_url_without_port" -}}
-{{ .Values.kafka.name }}.{{ .Release.Namespace }}
+{{/* hostname for apigateway */}}
+{{- define "apigw_host" -}}
+{{ .Values.apigw.name }}.{{ .Release.Namespace }}.svc.cluster.local
 {{- end -}}
 
-{{/* Generate Zookeeper service address */}}
-{{- define "zookeeper_service_address" -}}
-{{ .Values.zookeeper.name }}.{{ .Release.Namespace }}:{{ 
.Values.zookeeper.port }}
+{{/* hostname for controller */}}
+{{- define