[incubator-openwhisk] branch master updated: switching vagrant to use cli remote mode (#3651)

2018-05-14 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 403d341  switching vagrant to use cli remote mode (#3651)
403d341 is described below

commit 403d3417f09f145969a936f322c620f6bc5204ff
Author: Carlos Santana 
AuthorDate: Mon May 14 22:16:16 2018 -0400

switching vagrant to use cli remote mode (#3651)
---
 ansible/environments/vagrant/group_vars/all | 2 +-
 tools/vagrant/Vagrantfile   | 9 -
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/ansible/environments/vagrant/group_vars/all 
b/ansible/environments/vagrant/group_vars/all
index 2015f0f..2c76006 100755
--- a/ansible/environments/vagrant/group_vars/all
+++ b/ansible/environments/vagrant/group_vars/all
@@ -37,6 +37,6 @@ env_hosts_dir: "{{ playbook_dir }}/environments/local"
 
 controller_protocol: "http"
 
-cli_installation_mode: "local"
+cli_installation_mode: "remote"
 
 invoker_use_runc: false
diff --git a/tools/vagrant/Vagrantfile b/tools/vagrant/Vagrantfile
index 3d2bae2..4371351 100644
--- a/tools/vagrant/Vagrantfile
+++ b/tools/vagrant/Vagrantfile
@@ -144,15 +144,6 @@ Vagrant.configure('2') do |config|
 su vagrant -c './gradlew distDocker'
 echo "`date`: build-core-end" >> /tmp/vagrant-times.txt
 
-# Clone and Build CLI
-echo "`date`: build-cli-start" >> /tmp/vagrant-times.txt
-cd ${OPENWHISK_HOME}/bin
-rm -rf openwhisk-cli
-su vagrant -c 'git clone --depth=1 
https://github.com/apache/incubator-openwhisk-cli.git openwhisk-cli'
-cd openwhisk-cli
-su vagrant -c './gradlew releaseBinaries'
-echo "`date`: build-cli-end" >> /tmp/vagrant-times.txt
-
 # Deploy OpenWhisk using ansible
 echo "`date`: deploy-start" >> /tmp/vagrant-times.txt
 cd ${ANSIBLE_HOME}

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

[incubator-openwhisk-release] branch master updated: Create detailed list of all ASF license exclusions by file. (#150)

2018-05-14 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 5bf1313  Create detailed list of all ASF license exclusions by file. 
(#150)
5bf1313 is described below

commit 5bf1313e1eda130ac1f2fd5ce12ff526b9b68b20
Author: Matt Rutkowski 
AuthorDate: Mon May 14 18:36:46 2018 -0500

Create detailed list of all ASF license exclusions by file. (#150)

* Create detailed list of all ASF license exclusions by file.

* Create detailed list of all ASF license exclusions by file.
---
 docs/license_compliance.md   | 53 +---
 docs/release_instructions.md |  5 +
 2 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/docs/license_compliance.md b/docs/license_compliance.md
index 194acb3..3ffd683 100644
--- a/docs/license_compliance.md
+++ b/docs/license_compliance.md
@@ -95,10 +95,57 @@ In accordance with Apache LICENSE policies, the table below 
lists general exclus
 | `gradlew.bat` and `gradlew` | Generated by Gradle 
wrapper. See a sample 
[here](https://github.com/apache/incubator-openwhisk/blob/master/gradlew.bat) |
 
 
-## Known Exclusions
+# Known exclusions
 
-For convenience, the Apache OpenWhisk project provides a listing of "Known 
exclusions" of files that do not include an ASF License header by project 
repository:
-- [Apache OpenWhisk "Known exclusions"](license_exclusions.md)
+## License scanning exclusions
+
+The Apache OpenWhisk project enforces and verifies ASF License header 
conformance on all source files using the project's own scanCode utility (on 
all Travis CI builds) and Apache RAT tool (on all automated releases).
+
+In accordance with Apache policy, these utilities exclude specific files from 
the ASF license header requirement which are configured in the following files:
+- scanCode: 
[ASF-Release.cfg](https://github.com/apache/incubator-openwhisk-utilities/blob/master/scancode/ASF-Release.cfg)
+- Apache 
RAT:[pom.xml](https://github.com/apache/incubator-openwhisk-release/blob/master/tools/lib/pom.xml)
 (Apache Rat)
+
+## Bundled and non-Bundled dependencies
+
+In accordance with Apache policy, each of the Apache OpenWhisk project's 
repositories respective LICENSE and NOTICE files contain the full, canonical 
listing of all dependent software licenses.
+
+For convenience, the following table provides links to each project 
repository's LICENSE and NOTICE files, as well as an overview of notable 
software dependencies (non-canonical) and license scanning exclusions.
+
+| Repository | Exclusion | Rationale |
+| --- | --- | --- |
+| [incubator-openwhisk](https://github.com/apache/incubator-openwhisk) | 
[tests/dat/actions/empty.js](https://github.com/apache/incubator-openwhisk/blob/master/tests/dat/actions/empty.js)
 | Empty (zero-length) file for testing |
+|  | 
[performance/wrk_tests/post.lua](https://github.com/apache/incubator-openwhisk/blob/master/performance/wrk_tests/post.lua)
 |  |
+|  | 
[tools/eclipse/java.xml](https://github.com/apache/incubator-openwhisk/blob/master/tools/eclipse/java.xml)
 | Configuration file in XML format. Not much creativity. |
+|  | 
[common/scala/src/main/resources/logback.xml](https://github.com/apache/incubator-openwhisk/blob/master/common/scala/src/main/resources/logback.xml)
 | Configuration file in XML format. Not much creativity. |
+|  | bin/wskadmin | Generated, symbolic link |
+|  | bin/wskdev | Generated, symbolic link |
+| 
[incubator-openwhisk-catalog](https://github.com/apache/incubator-openwhisk-catalog)
 | _None_|  |
+| 
[incubator-openwhisk-apigateway](https://github.com/apache/incubator-openwhisk-apigateway)
 | 
[tests/scripts/lua/management/examples](https://github.com/apache/incubator-openwhisk-apigateway/tree/master/tests/scripts/lua/management/examples)
 | JSON data files |
+| [incubator-openwhisk-cli](https://github.com/apache/incubator-openwhisk-cli) 
| _None_ | _test files?_ |
+| 
[incubator-openwhisk-client-go](https://github.com/apache/incubator-openwhisk-client-go)
 | _None_ | _?_ |
+| 
[incubator-openwhisk-wskdeploy](https://github.com/apache/incubator-openwhisk-wskdeploy)
 | wski18n | **FIX!!!** Too broad, lots of .go files that SHOULD be scanned |
+|  | wski18n/i18n_resources.go | Generated, translation JSON data 
file. |
+|  | wski18n/README.md | **FIX!!!** |
+|  | wski18n/resources | JSON data files |
+| 
[incubator-openwhisk-runtime-nodejs](https://github.com/apache/incubator-openwhisk-runtime-nodejs)
 | tests/src/test/resources/application.conf | Config. file, Not much 
creativity |
+|   | ansible/environments/local/group_vars/all | Config. file, 
Not much creativity |
+|   | ansible/environments/local/hosts  |

[incubator-openwhisk-apigateway] branch master updated: Remove IBM copyright from LICENSE.txt (#299)

2018-05-14 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-apigateway.git


The following commit(s) were added to refs/heads/master by this push:
 new 3009c07  Remove IBM copyright from LICENSE.txt (#299)
3009c07 is described below

commit 3009c07859f503360bf6d222801ec55fbaff87fe
Author: Matt Rutkowski 
AuthorDate: Mon May 14 18:33:45 2018 -0500

Remove IBM copyright from LICENSE.txt (#299)

* Remove IBM copyright from LICENSE.txt

* Fix a few files that have old Bash ASF license header.

* Add udpated hash header to index.html

* Add udpated hash header to test_initialization.t

* Add udpated hash header to test_initialization.t
---
 Dockerfile  | 28 +++-
 LICENSE.txt |  2 +-
 Makefile| 23 ---
 html/index.html | 23 ---
 tests/test_initialization.t | 34 +-
 5 files changed, 57 insertions(+), 53 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2718cc9..9962c92 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,20 @@
 #
-# 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.
 #
+
 # apigateway
 #
 # VERSION   1.13.6.1
@@ -223,8 +225,8 @@ RUN echo " ... installing cjose ... " \
 && rm -rf /tmp/api-gateway
 
 ENV CONFIG_SUPERVISOR_VERSION 1.0.1-RC1
-COPY build_config_supervisor.sh /tmp/build_config_supervisor.sh 
-RUN sh +x /tmp/build_config_supervisor.sh 
+COPY build_config_supervisor.sh /tmp/build_config_supervisor.sh
+RUN sh +x /tmp/build_config_supervisor.sh
 
 COPY init.sh /etc/init-container.sh
 # add the default configuration for the Gateway
diff --git a/LICENSE.txt b/LICENSE.txt
index a2fe52f..0040af4 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -187,7 +187,7 @@
   same "printed page" as the copyright notice for easier
   identification within third-party archives.
 
-   Copyright 2015-2016  IBM Corporation
+   Copyright 2015-2018 The Apache Software Foundation
 
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Makefile b/Makefile
index 91f4517..8411007 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
-#

[incubator-openwhisk-package-kafka] tag 1.4.9 created (now 449bbae)

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

japetrsn pushed a change to tag 1.4.9
in repository 
https://gitbox.apache.org/repos/asf/incubator-openwhisk-package-kafka.git.


  at 449bbae  (commit)
No new revisions were added by this update.

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

[incubator-openwhisk-package-kafka] branch master updated: allow for configuring whisk apihost via optional environment variable (#268)

2018-05-14 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-package-kafka.git


The following commit(s) were added to refs/heads/master by this push:
 new 449bbae  allow for configuring whisk apihost via optional environment 
variable (#268)
449bbae is described below

commit 449bbae13e813ba4dcd11dc33f47ab29d5e3541a
Author: Adnan Baruni 
AuthorDate: Mon May 14 14:31:04 2018 -0500

allow for configuring whisk apihost via optional environment variable (#268)
---
 provider/consumer.py | 17 -
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/provider/consumer.py b/provider/consumer.py
index f9aaef2..3819072 100644
--- a/provider/consumer.py
+++ b/provider/consumer.py
@@ -31,6 +31,7 @@ from database import Database
 from datetime import datetime
 from datetimeutils import secondsSince
 from multiprocessing import Process, Manager
+from urlparse import urlparse
 
 local_dev = os.getenv('LOCAL_DEV', 'False')
 payload_limit = int(os.getenv('PAYLOAD_LIMIT', 90))
@@ -127,7 +128,7 @@ class ConsumerProcess (Process):
 
 self.trigger = trigger
 self.isMessageHub = params["isMessageHub"]
-self.triggerURL = params["triggerURL"]
+self.triggerURL = self.__triggerURL(params["triggerURL"])
 self.brokers = params["brokers"]
 self.topic = params["topic"]
 
@@ -203,6 +204,20 @@ class ConsumerProcess (Process):
 def secondsSinceLastPoll(self):
 return secondsSince(self.lastPoll())
 
+def __triggerURL(self, originalURL):
+apiHost = os.getenv('API_HOST')
+
+if apiHost is not None:
+logging.info('[{}] Environment variable defined for API_HOST. 
Overriding host value defined for trigger in DB with {}'.format(self.trigger, 
apiHost))
+parsed = urlparse(originalURL)
+parts = parsed.netloc.split('@')
+auth = parts[0]
+newURL = parsed._replace(netloc='{}@{}'.format(auth, apiHost))
+
+return newURL.geturl()
+else:
+return originalURL
+
 def run(self):
 try:
 self.consumer = self.__createConsumer()

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

[incubator-openwhisk-release] branch master updated: Add the support to create the release when the git tag is added (#149)

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

mrutkowski 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 f3fcd2d  Add the support to create the release when the git tag is 
added (#149)
f3fcd2d is described below

commit f3fcd2d9d7d743ae84f24a42b320a336ca95225f
Author: Vincent 
AuthorDate: Mon May 14 15:00:46 2018 -0400

Add the support to create the release when the git tag is added (#149)
---
 tools/load_config.sh|  5 +++--
 tools/travis/package_project.sh | 38 ++
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/tools/load_config.sh b/tools/load_config.sh
index e70f7a5..035051d 100755
--- a/tools/load_config.sh
+++ b/tools/load_config.sh
@@ -41,9 +41,10 @@ STAGE_URL=$(json_by_key "$CONFIG" "stage_url")
 RELEASE_URL=$(json_by_key "$CONFIG" "release_url")
 
 version_key="versioning"
-version=$(json_by_key "$CONFIG" ${version_key}.version)
+version_json=$(json_by_key "$CONFIG" ${version_key}.version)
+version=${5:-"$version_json"}
 pre_release_version=$(json_by_key "$CONFIG" ${version_key}.pre_release_version)
-full_version=$version
+full_version=$version_json
 
 if [ ! -z "$pre_release_version" ]; then
 pre_release_version_no_space="$(echo -e "${pre_release_version}" | tr -d 
'[[:space:]]')"
diff --git a/tools/travis/package_project.sh b/tools/travis/package_project.sh
index 6986ed5..9df0258 100755
--- a/tools/travis/package_project.sh
+++ b/tools/travis/package_project.sh
@@ -27,22 +27,28 @@ PARENTDIR="$(dirname "$CURRENTDIR")"
 SVN_USERNAME=$2
 SVN_PASSWORD=$3
 
-source "$PARENTDIR/load_config.sh" "$WORK_DIR" "$SVN_USERNAME" "$SVN_PASSWORD" 
"$PARENTDIR"
-
 "$PARENTDIR/install_dependencies.sh"
-"$PARENTDIR/download_source_code.sh" "$WORK_DIR"
-if [ "$TRAVIS_EVENT_TYPE" == "push" ] && [ "$PUBLISH_STAGE" == "true" ] ; then
-"$PARENTDIR/checkout_svn.sh" "$WORK_DIR" "$SVN_USERNAME" "$SVN_PASSWORD"
-fi
-
 
-"$PARENTDIR/package_source_code.sh" "$WORK_DIR" "$SVN_USERNAME" "$SVN_PASSWORD"
-"$PARENTDIR/package_binaries.sh" "$WORK_DIR" "$SVN_USERNAME" "$SVN_PASSWORD"
-
-if [ "$TRAVIS_EVENT_TYPE" == "push" ] && [ "$PUBLISH_STAGE" == "true" ] ; then
-"$CURRENTDIR/import_pgp_key.sh"
-"$PARENTDIR/sign_artifacts.sh" "$WORK_DIR"
-"$PARENTDIR/upload_artifacts.sh" "$WORK_DIR" "$SVN_USERNAME" 
"$SVN_PASSWORD"
+if [ ! -z "$TRAVIS_TAG" ] ; then
+# The git tag is named after the version to be released.
+release_version=$TRAVIS_TAG
+source "$PARENTDIR/load_config.sh" "$WORK_DIR" "$SVN_USERNAME" 
"$SVN_PASSWORD" "$PARENTDIR" "$release_version"
+"$PARENTDIR/move_stage_to_release.sh" "$WORK_DIR" "$SVN_USERNAME" 
"$SVN_PASSWORD"
+else
+source "$PARENTDIR/load_config.sh" "$WORK_DIR" "$SVN_USERNAME" 
"$SVN_PASSWORD" "$PARENTDIR"
+"$PARENTDIR/download_source_code.sh" "$WORK_DIR"
+if [ "$TRAVIS_EVENT_TYPE" == "push" ] && [ "$PUBLISH_STAGE" == "true" ] ; 
then
+"$PARENTDIR/checkout_svn.sh" "$WORK_DIR" "$SVN_USERNAME" 
"$SVN_PASSWORD"
+fi
+
+"$PARENTDIR/package_source_code.sh" "$WORK_DIR" "$SVN_USERNAME" 
"$SVN_PASSWORD"
+"$PARENTDIR/package_binaries.sh" "$WORK_DIR" "$SVN_USERNAME" 
"$SVN_PASSWORD"
+
+if [ "$TRAVIS_EVENT_TYPE" == "push" ] && [ "$PUBLISH_STAGE" == "true" ] ; 
then
+"$CURRENTDIR/import_pgp_key.sh"
+"$PARENTDIR/sign_artifacts.sh" "$WORK_DIR"
+"$PARENTDIR/upload_artifacts.sh" "$WORK_DIR" "$SVN_USERNAME" 
"$SVN_PASSWORD"
+fi
+
+"$PARENTDIR/verify_source_code.sh" "$WORK_DIR"
 fi
-
-"$PARENTDIR/verify_source_code.sh" "$WORK_DIR"

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

[incubator-openwhisk] branch master updated: Split test jobs in Travis (#3613)

2018-05-14 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 fb5f853  Split test jobs in Travis (#3613)
fb5f853 is described below

commit fb5f85303193ca917ce02e0905d2eb7516f4f3a5
Author: Chetan Mehrotra 
AuthorDate: Mon May 14 11:48:27 2018 -0700

Split test jobs in Travis (#3613)
---
 .travis.yml| 12 +--
 ansible/logs.yml   |  1 +
 .../core/database/memory/MemoryArtifactStore.scala | 13 +++
 tests/README.md| 36 +
 tests/build.gradle | 92 +-
 tools/build/checkLogs.py   | 23 +++---
 tools/build/redo   |  8 +-
 tools/travis/README.md | 36 +
 tools/travis/checkAndUploadLogs.sh | 41 ++
 tools/travis/distDocker.sh | 30 +++
 tools/travis/runSystemTests.sh | 35 
 tools/travis/runTests.sh   | 32 
 tools/travis/runUnitTests.sh   | 35 
 tools/travis/scan.sh   | 52 
 tools/travis/setupPrereq.sh| 35 
 tools/travis/setupSystem.sh| 31 
 16 files changed, 493 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 395d04e..e37432e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,6 @@ notifications:
 before_install:
   - pip install --upgrade pip setuptools six
   - pip3 install --upgrade pip setuptools six
-  - ./tools/travis/flake8.sh  # Check Python files for style and stop the 
build on syntax errors
 
 install:
   - ./tools/travis/setup.sh
@@ -56,10 +55,13 @@ install:
 jobs:
   include:
 - script:
-- ./tools/travis/build.sh
-- ansible-playbook -i ansible/environments/local ansible/logs.yml # 
collect logs regardless of build exit
-- ./tools/travis/box-upload.py "$TRAVIS_BUILD_DIR/logs" 
"$TRAVIS_BUILD_ID-$TRAVIS_BRANCH.tar.gz"
-  env: DESCRIPTION="Execute test suite."
+- ./tools/travis/runUnitTests.sh
+- ./tools/travis/checkAndUploadLogs.sh unit db
+  env: DESCRIPTION="Unit Tests"
+- script:
+   - ./tools/travis/runSystemTests.sh
+   - ./tools/travis/checkAndUploadLogs.sh system
+  env: DESCRIPTION="System Tests"
 - script:
 - ./performance/preparation/deploy.sh
 - TERM=dumb ./performance/wrk_tests/latency.sh 
"https://172.17.0.1:10001; "$(cat ansible/files/auth.guest)" 2m
diff --git a/ansible/logs.yml b/ansible/logs.yml
index 3182199..30c7bd3 100644
--- a/ansible/logs.yml
+++ b/ansible/logs.yml
@@ -72,3 +72,4 @@
   - name: fetch logs from all machines
 synchronize: src="{{ whisk_logs_dir }}/" dest="{{ openwhisk_home }}/logs" 
mode=pull
 when: "'machine' not in exclude_logs_from"
+ignore_errors: true
diff --git 
a/common/scala/src/main/scala/whisk/core/database/memory/MemoryArtifactStore.scala
 
b/common/scala/src/main/scala/whisk/core/database/memory/MemoryArtifactStore.scala
index 0b96d06..e228652 100644
--- 
a/common/scala/src/main/scala/whisk/core/database/memory/MemoryArtifactStore.scala
+++ 
b/common/scala/src/main/scala/whisk/core/database/memory/MemoryArtifactStore.scala
@@ -240,10 +240,16 @@ class MemoryArtifactStore[DocumentAbstraction <: 
DocumentSerializer](dbName: Str
   override protected[core] def readAttachment[T](doc: DocInfo, name: String, 
sink: Sink[ByteString, Future[T]])(
 implicit transid: TransactionId): Future[(ContentType, T)] = {
 //TODO Temporary implementation till MemoryAttachmentStore PR is merged
+val start = transid.started(
+  this,
+  LoggingMarkers.DATABASE_ATT_GET,
+  s"[ATT_GET] '$dbName' finding attachment '$name' of document '$doc'")
+
 artifacts.get(doc.id.id) match {
   case Some(a: Artifact) if a.attachments.contains(name) =>
 val attachment = a.attachments(name)
 val r = Source.single(attachment.bytes).toMat(sink)(Keep.right).run
+transid.finished(this, start, s"[ATT_GET] '$dbName' completed: found 
attachment '$name' of document '$doc'")
 r.map(t => (attachment.contentType, t))
   case None =>
 Future.failed(NoDocumentException("Not found on 'readAttachment'."))
@@ -260,6 +266,11 @@ class MemoryArtifactStore[DocumentAbstraction <: 
DocumentSerializer](dbName: Str
 contentType: ContentType,
 docStream: Source[ByteString, _])(implicit transid: TransactionId): 
Future[DocInfo] = {
 
+val start = transid.started(
+  this,
+  LoggingMarkers.DATABASE_ATT_SAVE,
+  s"[ATT_PUT] '$dbName' uploading attachment '$name' of document

[incubator-openwhisk] branch master updated: Fix last scancode issues with performance directory & increase granularity.

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

houshengbo 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 3c12c2f  Fix last scancode issues with performance directory & 
increase granularity.
3c12c2f is described below

commit 3c12c2f3b8a36d3f9800251ec35aae687916f3f6
Author: Matt Rutkowski 
AuthorDate: Mon May 14 12:27:00 2018 -0500

Fix last scancode issues with performance directory & increase granularity.
---
 performance/README.md  | 23 ---
 performance/wrk_tests/post.lua |  2 +-
 tools/travis/build.sh  |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/performance/README.md b/performance/README.md
index 17ec2ce..71302c1 100644
--- a/performance/README.md
+++ b/performance/README.md
@@ -1,18 +1,19 @@
 
 # :electric_plug: Apache OpenWhisk - Performance Tests
diff --git a/performance/wrk_tests/post.lua b/performance/wrk_tests/post.lua
index e3e664c..ab5401b 100644
--- a/performance/wrk_tests/post.lua
+++ b/performance/wrk_tests/post.lua
@@ -1 +1 @@
-wrk.method = "POST"
\ No newline at end of file
+wrk.method = "POST"
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index 405b854..2a03a48 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -31,7 +31,7 @@ git clone 
https://github.com/apache/incubator-openwhisk-utilities.git
 
 # run the scancode util. against project source code starting at its root
 cd $UTILDIR
-scancode/scanCode.py --config scancode/ASF-Release-v2.cfg $ROOTDIR
+scancode/scanCode.py --config scancode/ASF-Release.cfg $ROOTDIR
 
 # run scalafmt checks
 cd $ROOTDIR

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

[incubator-openwhisk] branch master updated: Allow more special characters in EntityName. (#3644)

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

dubeejw 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 2ef6e4d  Allow more special characters in EntityName. (#3644)
2ef6e4d is described below

commit 2ef6e4d235745ad2f24527482c8f9a58c0ca5ea0
Author: Markus Thömmes 
AuthorDate: Mon May 14 19:37:09 2018 +0200

Allow more special characters in EntityName. (#3644)


* Add `&` to the allowed set of charecters for entities.
---
 .../scala/src/main/scala/whisk/core/entity/EntityPath.scala |  4 ++--
 .../src/test/scala/whisk/core/entity/test/SchemaTests.scala | 13 +++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/common/scala/src/main/scala/whisk/core/entity/EntityPath.scala 
b/common/scala/src/main/scala/whisk/core/entity/EntityPath.scala
index c4836c3..0262f10 100644
--- a/common/scala/src/main/scala/whisk/core/entity/EntityPath.scala
+++ b/common/scala/src/main/scala/whisk/core/entity/EntityPath.scala
@@ -192,10 +192,10 @@ protected[core] object EntityName {
 
   /**
* Allowed path part or entity name format (excludes path separator): first 
character
-   * is a letter|digit|underscore, followed by one or more allowed characters 
in [\w@ .-].
+   * is a letter|digit|underscore, followed by one or more allowed characters 
in [\w@ .&-].
* The name may not have trailing white space.
*/
-  protected[core] val REGEX = raw"\A([\w]|[\w][\w@ 
.-]{0,${ENTITY_NAME_MAX_LENGTH - 2}}[\w@.-])\z"
+  protected[core] val REGEX = raw"\A([\w]|[\w][\w@ 
.&-]{0,${ENTITY_NAME_MAX_LENGTH - 2}}[\w@.&-])\z"
   private val entityNamePattern = REGEX.r.pattern // compile once
   protected[core] def entityNameMatcher(s: String): Matcher = 
entityNamePattern.matcher(s)
 
diff --git a/tests/src/test/scala/whisk/core/entity/test/SchemaTests.scala 
b/tests/src/test/scala/whisk/core/entity/test/SchemaTests.scala
index 99fe131..6ee2b24 100644
--- a/tests/src/test/scala/whisk/core/entity/test/SchemaTests.scala
+++ b/tests/src/test/scala/whisk/core/entity/test/SchemaTests.scala
@@ -235,14 +235,15 @@ class SchemaTests extends FlatSpec with BeforeAndAfter 
with ExecHelpers with Mat
 val paths = Seq(
   "a",
   "a b",
-  "a@b.c",
+  "a@b.c",
+  "a@",
   "_a",
   "_",
   "_ _",
   "a0",
   "a 0",
   "a.0",
-  "a@@",
+  "a@@&",
   "0",
   "0.0",
   "0.0.0",
@@ -265,9 +266,17 @@ class SchemaTests extends FlatSpec with BeforeAndAfter 
with ExecHelpers with Mat
   " /",
   "/ ",
   "0 ",
+  "a=2b",
   "_ ",
+  "a?b",
+  "x#x",
+  "a§b",
   "a  ",
+  "a()b",
+  "a{}b",
   "a \t",
+  "-abc",
+  "",
   "a\n",
   "a" * (EntityName.ENTITY_NAME_MAX_LENGTH + 1))
 paths.foreach { p =>

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

[incubator-openwhisk-external-resources] branch master updated: added RedHat Summit video and O'Reilly ebook (#29)

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

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


The following commit(s) were added to refs/heads/master by this push:
 new fd816e1  added RedHat Summit video and O'Reilly ebook (#29)
fd816e1 is described below

commit fd816e18a612646a3154fc585d1c734c1f29d0c0
Author: Michael Marth 
AuthorDate: Mon May 14 12:08:04 2018 +0200

added RedHat Summit video and O'Reilly ebook (#29)
---
 README.md | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 5908c64..3859553 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,7 @@
 - [Tutorials](#tutorials)
 - [Sample Applications](#sample-applications)
 - [Articles](#articles)
+- [Books](#books)
 - [Media](#media)
 - [Runtimes](#runtimes)
 - [Feed Providers](#feed-providers)
@@ -97,6 +98,10 @@
 - [Lastversion](https://github.com/shaftoe/lastversion)- An HTTP service to 
fetch latest stable version of OpenSource projects, written in Go and running 
as OpenWhisk action
 - [Form processing with 
OpenWhisk](https://github.com/IBM-Bluemix/OpenWhiskContact) - Process contact 
form without a backend using IBM Bluemix OpenWhisk and SendGrid. [See live link 
here](https://ibm-bluemix.github.io/OpenWhiskContact/)
 
+## Books
+
+- [Developing Serverless Applications, A Practical Introduction with Apache 
OpenWhisk]
+(https://www.oreilly.com/programming/free/developing-serverless-applications.csp)
 - free ebook
 
 ## Media
 
@@ -113,6 +118,7 @@
 - [Project OpenFridge](https://www.youtube.com/watch?v=0Sl4rWZYo8w) - 
Improving customer service with IoT and event-driven computing.
 - [Build a cloud native app with Apache 
OpenWhisk](https://developer.ibm.com/tv/build-a-cloud-native-app-with-apache-openwhisk/)
 - An overview of serverless architectures, introduction to the OpenWhisk 
programming model, and deployment of an OpenWhisk application on IBM Bluemix.
 - [Using Serverless Framework & 
OpenWhisk](https://www.youtube.com/watch?v=GJY10W98Itc=3s) - Using the 
framework to build OpenWhisk applications.
+- RedHat Summit 2018 [breakout session on 
OpenWhisk](https://www.youtube.com/watch?v=C2u6wVRI-N0)
 
 ### Presentations
 

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