[openwhisk-cli] annotated tag latest updated (fb5d77d -> c662ae9)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git. *** WARNING: tag latest was modified! *** from fb5d77d (commit) to c662ae9 (tag) tagging fb5d77d7592acc78b886ec39c77263497a07e066 (commit) replaces 1.1.0 by Travis CI on Thu Mar 11 00:19:46 2021 +1000 - Log - Generated tag from Travis CI build 2378 --- No new revisions were added by this update. Summary of changes:
[openwhisk-cli] annotated tag latest updated (fcac2ac -> 55dac03)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git. *** WARNING: tag latest was modified! *** from fcac2ac (commit) to 55dac03 (tag) tagging fcac2ac4265ec3ec7f844da95e6197b45474b407 (commit) replaces 1.1.0 by Travis CI on Wed Mar 10 02:23:24 2021 +1000 - Log - Generated tag from Travis CI build 2375 --- No new revisions were added by this update. Summary of changes:
[openwhisk-cli] annotated tag latest updated (2d98247 -> 760623f)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git. *** WARNING: tag latest was modified! *** from 2d98247 (commit) to 760623f (tag) tagging 2d9824708ba7bd43ca49584d6dee071ef276a653 (commit) replaces 1.1.0 by Travis CI on Wed Mar 3 14:00:41 2021 -0600 - Log - Generated tag from Travis CI build 2366 --- No new revisions were added by this update. Summary of changes:
[openwhisk-cli] annotated tag latest updated (9cbb032 -> 51ed5d0)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git. *** WARNING: tag latest was modified! *** from 9cbb032 (commit) to 51ed5d0 (tag) tagging 9cbb032885b4225e6c802fec041bd91e57a5e7f7 (commit) replaces 1.1.0 by Travis CI on Tue Mar 2 12:09:25 2021 -0600 - Log - Generated tag from Travis CI build 2358 --- No new revisions were added by this update. Summary of changes:
[openwhisk-runtime-deno] branch master updated: Initial implementation of the Deno runtime. (#5)
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/openwhisk-runtime-deno.git
The following commit(s) were added to refs/heads/master by this push:
new d442f19 Initial implementation of the Deno runtime. (#5)
d442f19 is described below
commit d442f197bb901b904fade621793cf74e43a498f3
Author: rodric rabbah
AuthorDate: Mon Mar 1 20:26:54 2021 -0500
Initial implementation of the Deno runtime. (#5)
---
.travis.yml| 15 +++
README.md | 51 ++
deno1.3.0/Dockerfile | 57 +++
deno1.3.0/Makefile | 57 +++
.travis.yml => deno1.3.0/bin/compile | 13 +--
deno1.3.0/bin/compile.js | 87
settings.gradle => deno1.3.0/build.gradle | 20 +---
settings.gradle => deno1.3.0/deps.js | 25 ++---
deno1.3.0/lib/launcher.js | 68 +
tools/travis/build.sh => example/Makefile | 39 +++
example/main.ts| 5 +
settings.gradle| 1 +
settings.gradle => tests/build.gradle | 37 ---
.../actionContainers/ActionDenoBasicTests.scala| 113 +
.../runtime/actionContainers/SingleTest.scala | 54 ++
tools/travis/build.sh | 4 +
tools/travis/test.sh | 3 +
17 files changed, 572 insertions(+), 77 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 79ddba2..bf9aa8d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,3 +25,18 @@ before_install:
install: true
script:
- "./tools/travis/scan.sh && ./tools/travis/build.sh && ./tools/travis/test.sh"
+
+deploy:
+- provider: script
+ skip_cleanup: true
+ script: "./tools/travis/publish.sh openwhisk deno1.3.0 ${TRAVIS_TAG}"
+ on:
+tags: true
+all_branches: true
+repo: apache/openwhisk-runtime-deno
+- provider: script
+ skip_cleanup: true
+ script: "./tools/travis/publish.sh openwhisk deno1.3.0 nightly"
+ on:
+branch: dev
+repo: apache/openwhisk-runtime-deno
diff --git a/README.md b/README.md
index 57f6b69..77ea2e2 100644
--- a/README.md
+++ b/README.md
@@ -26,3 +26,54 @@ This repository contains sources files needed to build the
Deno
runtimes for Apache OpenWhisk. The build system will produce an Docker
image for each runtime version. These images are used in the platform
to execute Deno actions.
+
+Try it out using Docker image:
+
+```sh
+wsk action create hello main.ts --docker=openwhisk/action-deno-1.3.0
+```
+
+The content of the `main.ts` is shown below.
+```ts
+export default (args: any) => {
+ return {
+message: `Hello, ${args.name || 'World'}!`
+ }
+}
+```
+
+## Development
+
+A Dockerfile for each runtime image is defined in its respective
+runtime version directory. Modify this file if you need to add extra
+dependencies to a runtime version.
+
+### Build
+
+- Run the `distDocker` command to generate local Docker images for the
different runtime versions.
+
+```
+./gradlew distDocker
+```
+
+### Test
+
+1. Build the local Docker images for the Deno runtime (see the instructions
above).
+
+2. Install project dependencies from the top-level Apache OpenWhisk
+[project](https://github.com/apache/openwhisk), which ensures correct
+versions of dependent libraries are available in the Maven cache.
+
+```
+./gradlew install
+```
+
+*This command **MUST BE** run from the directory containing the main
+ Apache OpenWhisk [repository](https://github.com/apache/openwhisk),
+ not this repository's directory.*
+
+3. Run the project tests.
+
+```
+./gradlew :tests:test
+```
diff --git a/deno1.3.0/Dockerfile b/deno1.3.0/Dockerfile
new file mode 100644
index 000..ef2c101
--- /dev/null
+++ b/deno1.3.0/Dockerfile
@@ -0,0 +1,57 @@
+#
+# 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.
+#
+
+# build go proxy from source
+FROM golang:1.15 AS bui
[openwhisk-runtime-deno] branch master updated: notifications are a top-level entry (not a child of github) (#6)
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/openwhisk-runtime-deno.git The following commit(s) were added to refs/heads/master by this push: new bc813f0 notifications are a top-level entry (not a child of github) (#6) bc813f0 is described below commit bc813f017fbd4ce83ee4278e37cd61fcc364bb36 Author: David Grove AuthorDate: Mon Mar 1 20:15:39 2021 -0500 notifications are a top-level entry (not a child of github) (#6) --- .asf.yaml | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 0748d3a..8100aec 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -43,7 +43,9 @@ github: merge: false rebase: false - notifications: -commits: commits@openwhisk.apache.org -issues: iss...@openwhisk.apache.org -pullrequests: iss...@openwhisk.apache.org +notifications: + commits: commits@openwhisk.apache.org + issues_status: iss...@openwhisk.apache.org + issues_comment: iss...@openwhisk.apache.org + pullrequests_status: iss...@openwhisk.apache.org + pullrequests_comment: iss...@openwhisk.apache.org
[openwhisk-cli] annotated tag latest updated (e3f41f9 -> 540f19f)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git. *** WARNING: tag latest was modified! *** from e3f41f9 (commit) to 540f19f (tag) tagging e3f41f9c0a9617774f473b12d1c379557a928bb4 (commit) replaces 1.1.0 by Travis CI on Tue Feb 16 22:59:55 2021 -0500 - Log - Generated tag from Travis CI build 2325 --- No new revisions were added by this update. Summary of changes:
[openwhisk-cli] annotated tag latest updated (23b5790 -> 71a443e)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git. *** WARNING: tag latest was modified! *** from 23b5790 (commit) to 71a443e (tag) tagging 23b579054221434f74db50d82304fd184e717042 (commit) replaces 1.1.0 by Travis CI on Thu Jan 7 16:23:45 2021 +0100 - Log - Generated tag from Travis CI build 2299 --- No new revisions were added by this update. Summary of changes:
[openwhisk-cli] annotated tag latest updated (caeaac7 -> 9e5c619)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git. *** WARNING: tag latest was modified! *** from caeaac7 (commit) to 9e5c619 (tag) tagging caeaac717d1019f385f44766433947b1d00a8654 (commit) replaces 1.1.0 by Travis CI on Thu Jan 7 20:52:56 2021 +0530 - Log - Generated tag from Travis CI build 2298 --- No new revisions were added by this update. Summary of changes:
[openwhisk-cli] annotated tag latest updated (678deee -> e2b21d0)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git. *** WARNING: tag latest was modified! *** from 678deee (commit) to e2b21d0 (tag) tagging 678deee9510abac72b84c7f3ad98a0f58b97443e (commit) replaces 1.1.0 by Travis CI on Sun Dec 13 08:00:57 2020 -0500 - Log - Generated tag from Travis CI build 2278 --- No new revisions were added by this update. Summary of changes:
[openwhisk-cli] annotated tag latest updated (d4307b7 -> 6f741f1)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git. *** WARNING: tag latest was modified! *** from d4307b7 (commit) to 6f741f1 (tag) tagging d4307b767c69a36ee824ada959edb3454b239d1d (commit) replaces 1.0.0 by Travis CI on Sun Sep 27 11:23:30 2020 -0400 - Log - Generated tag from Travis CI build 2224 --- No new revisions were added by this update. Summary of changes:
[openwhisk-cli] annotated tag latest updated (b2d4972 -> 0ed833c)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git. *** WARNING: tag latest was modified! *** from b2d4972 (commit) to 0ed833c (tag) tagging b2d4972ba674927a6feb88875acf7580ea450207 (commit) replaces 1.0.0 by Travis CI on Wed Sep 2 14:14:12 2020 -0500 - Log - Generated tag from Travis CI build 2206 --- No new revisions were added by this update. Summary of changes:
[openwhisk-cli] annotated tag latest updated (53cb108 -> 3d49b6e)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git. *** WARNING: tag latest was modified! *** from 53cb108 (commit) to 3d49b6e (tag) tagging 53cb1084ebc540200a63af5fff42e927deac4253 (commit) replaces 1.0.0 by Travis CI on Tue Aug 25 11:07:23 2020 -0500 - Log - Generated tag from Travis CI build 2199 --- No new revisions were added by this update. Summary of changes:
[openwhisk-package-kafka] branch master updated: Update README.md (#368)
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/openwhisk-package-kafka.git The following commit(s) were added to refs/heads/master by this push: new 7cb333b Update README.md (#368) 7cb333b is described below commit 7cb333bbcb3b0dccef56fdbb5c725c907e772812 Author: Steven R. Loomis AuthorDate: Fri May 22 17:14:36 2020 -0700 Update README.md (#368) Fixes: https://github.com/apache/openwhisk-package-kafka/issues/281 Updates deprecation notice in e6a2c2e219ef65f8932579a201567574aff0c6bf (#265) with a suggested alternative on these actions: - `/messaging/kafkaProduce` - `/messaging/messageHubProduce` --- README.md | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1941537..620a16f 100644 --- a/README.md +++ b/README.md @@ -327,9 +327,9 @@ $ wsk trigger update myTopicTrigger -p isJSONData false -p isBinaryKey true -p i ### Producing messages to Message Hub -The `/messaging/messageHubProduce` Action is deprecated and will be removed at a future date. To maintain optimal performance, migrate your usage of the `/messaging/messageHubProduce` Action to use a persistent connection when data is produced to Message Hub. +The `/messaging/messageHubProduce` Action is deprecated and will be removed at a future date. To maintain optimal performance, migrate your usage of the `/messaging/messageHubProduce` Action to use a persistent connection, for example, by deploying a non-OpenWhisk component which contains a Message Hub client. -If you would like to use an OpenWhisk action to conveniently produce a message to Message Hub, you can use the `/messaging/messageHubProduce` action. This action takes the following parameters: +The deprecated `/messaging/messageHubProduce` takes the following parameters: |Name|Type|Description| |---|---|---| @@ -350,9 +350,9 @@ wsk action invoke /messaging/messageHubProduce -p kafka_brokers_sasl "[\"kafka01 ### Producing messages to a generic Kafka instance -The `/messaging/kafkaProduce` Action is deprecated and will be removed at a future date. To maintain optimal performance, migrate your usage of the `/messaging/kafkaProduce` Action to use a persistent connection when data is produced to Kafka. +> :point_right: **Note** The `/messaging/kafkaProduce` Action is deprecated and will be removed at a future date. To maintain optimal performance, migrate your usage of the `/messaging/kafkaProduce` Action to use a persistent connection, for example, by deploying a non-OpenWhisk component which contains a Kafka Producer. -If you would like to use an OpenWhisk action to conveniently produce a message to a generic Kafka instance, you can use the `/messaging/kafkaProduce` action. This action takes the following parameters: +The deprecated `/messaging/kafkaProduce` takes the following parameters: |Name|Type|Description| |---|---|---|
[openwhisk-cli] annotated tag latest updated (3529787 -> caa4207)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git. *** WARNING: tag latest was modified! *** from 3529787 (commit) to caa4207 (tag) tagging 352978782dd62ddca80cc4b3a757150cc10bb94f (commit) replaces 1.0.0 by Travis CI on Mon May 4 12:20:46 2020 +0800 - Log - Generated tag from Travis CI build 2114 --- No new revisions were added by this update. Summary of changes:
[openwhisk-runtime-nodejs] branch master updated: Support exports.main for simple files. (#165)
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/openwhisk-runtime-nodejs.git
The following commit(s) were added to refs/heads/master by this push:
new d2fbb5d Support exports.main for simple files. (#165)
d2fbb5d is described below
commit d2fbb5d30eef0d85cc9b4073aeb95f77a9544c5a
Author: rodric rabbah
AuthorDate: Sat Apr 11 13:49:35 2020 -0400
Support exports.main for simple files. (#165)
---
core/nodejsActionBase/runner.js| 13 ++-
.../NodeJsActionContainerTests.scala | 45 ++
2 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/core/nodejsActionBase/runner.js b/core/nodejsActionBase/runner.js
index 25cdc6c..43f758b 100644
--- a/core/nodejsActionBase/runner.js
+++ b/core/nodejsActionBase/runner.js
@@ -53,8 +53,17 @@ function initializeActionHandler(message) {
})
.catch(error => Promise.reject(error));
} else try {
-// The code is a plain old JS file.
-let handler = eval('(function(){' + message.code + '\nreturn ' +
message.main + '})()');
+let handler = eval(
+ `(function(){
+ ${message.code}
+ try {
+ return ${message.main}
+ } catch (e) {
+ if (e.name === 'ReferenceError') {
+return module.exports.${message.main} ||
exports.${message.main}
+ } else throw e
+ }
+ })()`);
return assertMainIsFunction(handler, message.main);
} catch (e) {
return Promise.reject(e);
diff --git
a/tests/src/test/scala/runtime/actionContainers/NodeJsActionContainerTests.scala
b/tests/src/test/scala/runtime/actionContainers/NodeJsActionContainerTests.scala
index 4122309..1f58fcb 100644
---
a/tests/src/test/scala/runtime/actionContainers/NodeJsActionContainerTests.scala
+++
b/tests/src/test/scala/runtime/actionContainers/NodeJsActionContainerTests.scala
@@ -344,6 +344,51 @@ abstract class NodeJsActionContainerTests extends
BasicActionRunnerTests with Ws
}
}
+ it should "support exports.main for single files" in {
+val (out, err) = withNodeJsContainer { c =>
+ val code =
+"""
+ | exports.main = function (params) {
+ | return params
+ | }
+""".stripMargin
+
+ c.init(initPayload(code))._1 should be(200)
+ val (runCode, out) = c.run(runPayload(JsObject("payload" ->
JsString("Hello exports!"
+
+ runCode should be(200)
+ out should be(Some(JsObject("payload" -> JsString("Hello exports!"
+}
+
+checkStreams(out, err, {
+ case (o, e) =>
+o shouldBe empty
+e shouldBe empty
+})
+ }
+
+ it should "support module.exports.main for single files" in {
+val (out, err) = withNodeJsContainer { c =>
+ val code =
+"""
+ | module.exports.main = function (params) {
+ | return params
+ | }
+""".stripMargin
+
+ c.init(initPayload(code))._1 should be(200)
+ val (runCode, out) = c.run(runPayload(JsObject("payload" ->
JsString("Hello exports!"
+
+ runCode should be(200)
+ out should be(Some(JsObject("payload" -> JsString("Hello exports!"
+}
+
+checkStreams(out, err, {
+ case (o, e) =>
+o shouldBe empty
+e shouldBe empty
+})
+ }
it should "error when requiring a non-existent package" in {
// NPM package names cannot start with a dot, and so there is no danger
// of the package below ever being valid.
[openwhisk-cli] annotated tag latest updated (c5daef0 -> 0a0fd89)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git. *** WARNING: tag latest was modified! *** from c5daef0 (commit) to 0a0fd89 (tag) tagging c5daef0c036930e7f0c05b2dc65d3fba89c6dca0 (commit) replaces 1.0.0 by Travis CI on Tue Feb 25 12:35:16 2020 -0500 - Log - Generated tag from Travis CI build 2071 --- No new revisions were added by this update. Summary of changes:
[openwhisk-cli] annotated tag latest updated (9228b60 -> a0a592c)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git. *** WARNING: tag latest was modified! *** from 9228b60 (commit) to a0a592c (tag) tagging 9228b600f21e47b8eceee3e3205003b7f770df77 (commit) replaces 1.0.0 by Travis CI on Tue Jan 14 12:55:58 2020 -0500 - Log - Generated tag from Travis CI build 1996 --- No new revisions were added by this update. Summary of changes:
[openwhisk-cli] annotated tag latest updated (d8a6735 -> ffd031b)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git. *** WARNING: tag latest was modified! *** from d8a6735 (commit) to ffd031b (tag) tagging d8a673595efed862a48573c34a24489863b54835 (commit) replaces 1.0.0 by Travis CI on Tue Jan 7 14:40:23 2020 -0500 - Log - Generated tag from Travis CI build 1982 --- No new revisions were added by this update. Summary of changes:
[openwhisk-cli] annotated tag latest updated (368da5b -> c2d23e5)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git. *** WARNING: tag latest was modified! *** from 368da5b (commit) to c2d23e5 (tag) tagging 368da5bf3d34b4a9b64204a0876618d79e014146 (commit) replaces 1.0.0 by Travis CI on Thu Nov 21 21:14:25 2019 -0500 - Log - Generated tag from Travis CI build 1927 --- No new revisions were added by this update. Summary of changes:
[openwhisk-cli] annotated tag latest updated (d0f5736 -> 1e8f23f)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git. *** WARNING: tag latest was modified! *** from d0f5736 (commit) to 1e8f23f (tag) tagging d0f57365f31cf6ffe3befe5ff4abc2ae4378b5d5 (commit) replaces 1.0.0 by Travis CI on Thu Oct 17 09:39:27 2019 +0530 - Log - Generated tag from Travis CI build 1896 --- No new revisions were added by this update. Summary of changes:
[openwhisk-cli] annotated tag latest updated (07993fd -> b3da65e)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git. *** WARNING: tag latest was modified! *** from 07993fd (commit) to b3da65e (tag) tagging 07993fd22c5618ee153eade186369d7d6084d1b7 (commit) replaces 0.10.0-incubating by Travis CI on Fri Aug 9 18:54:59 2019 -0500 - Log - Generated tag from Travis CI build 1841 --- No new revisions were added by this update. Summary of changes:
[openwhisk-cli] annotated tag latest deleted (was d4a80c2)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was d4a80c2 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.
[incubator-openwhisk-cli] annotated tag latest updated (bca476d -> d4a80c2)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was modified! *** from bca476d (commit) to d4a80c2 (tag) tagging bca476db192e2c1b6ed0660f3f576dccaa73f37e (commit) replaces 0.10.0-incubating by Travis CI on Wed Jul 31 21:20:02 2019 -0400 - Log - Generated tag from Travis CI build 1830 --- No new revisions were added by this update. Summary of changes:
[incubator-openwhisk-cli] annotated tag latest deleted (was 40d7c42)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was 40d7c42 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.
[incubator-openwhisk-cli] annotated tag latest deleted (was 5c3cf96)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was 5c3cf96 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.
[incubator-openwhisk-cli] annotated tag latest updated (d75e6d9 -> 40d7c42)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was modified! *** from d75e6d9 (commit) to 40d7c42 (tag) tagging d75e6d969a215d4bac19092378d076d24216cccb (commit) replaces 0.10.0-incubating by Travis CI on Mon Jul 22 06:18:09 2019 -0400 - Log - Generated tag from Travis CI build 1823 --- No new revisions were added by this update. Summary of changes:
[incubator-openwhisk-cli] annotated tag latest updated (76203e8 -> 5c3cf96)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was modified! *** from 76203e8 (commit) to 5c3cf96 (tag) tagging 76203e838eb3db88f9a53361b9c0d787a27c4435 (commit) replaces 0.10.0-incubating by Travis CI on Tue Jul 9 15:57:12 2019 +0200 - Log - Generated tag from Travis CI build 1815 --- No new revisions were added by this update. Summary of changes:
[incubator-openwhisk-cli] annotated tag latest deleted (was 0950df1)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was 0950df1 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.
[incubator-openwhisk-cli] annotated tag latest deleted (was 62f806e)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was 62f806e 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.
[incubator-openwhisk-cli] annotated tag latest updated (2fc2389 -> 0950df1)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was modified! *** from 2fc2389 (commit) to 0950df1 (tag) tagging 2fc238957cd136d51972eaf7abdc4aa0a9fe7f97 (commit) replaces 0.10.0-incubating by Travis CI on Thu Jul 4 19:03:18 2019 -0400 - Log - Generated tag from Travis CI build 1810 --- No new revisions were added by this update. Summary of changes:
[incubator-openwhisk-cli] annotated tag latest updated (0f96fa4 -> 62f806e)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was modified! *** from 0f96fa4 (commit) to 62f806e (tag) tagging 0f96fa458175849aef00caccdd46815eee750a93 (commit) replaces 0.10.0-incubating by Travis CI on Sat Jun 29 10:18:23 2019 -0400 - Log - Generated tag from Travis CI build 1803 --- No new revisions were added by this update. Summary of changes:
[incubator-openwhisk-cli] annotated tag latest deleted (was a9a75c9)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was a9a75c9 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.
[incubator-openwhisk-client-js] branch master updated: Remove unnecessary node-proxy-agent dependency (#175)
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-client-js.git
The following commit(s) were added to refs/heads/master by this push:
new 15276c7 Remove unnecessary node-proxy-agent dependency (#175)
15276c7 is described below
commit 15276c7d9d863e0b13903d3d30e32b5ffe7ebef9
Author: James Thomas
AuthorDate: Wed Jun 26 17:31:13 2019 +0100
Remove unnecessary node-proxy-agent dependency (#175)
Maintain proxy feature using needle's built-in proxy support.
Added ability to set custom agent using constructor option.
Fixes #158
---
README.md| 14 --
lib/client.js| 32 ++--
package.json | 3 +--
test/unit/client.test.js | 45 ++---
4 files changed, 61 insertions(+), 33 deletions(-)
diff --git a/README.md b/README.md
index f31e6d3..73b71ca 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
# limitations under the License.
#
-->
-# OpenWhisk Client for JavaScript
+# Apache OpenWhisk Client for JavaScript
[](https://travis-ci.org/apache/incubator-openwhisk-client-js)
[](http://www.apache.org/licenses/LICENSE-2.0)
@@ -117,6 +117,8 @@ _Client constructor supports the following mandatory
parameters:_
- **apigw_space_guid**. API Gateway space identifier. This is optional when
using an API gateway service, defaults to the authentication uuid.
- **cert**. Client cert to use when connecting to the `apihost` (if
`nginx_ssl_verify_client` is turned on in your apihost)
- **key**. Client key to use when connecting to the `apihost` (if
`nginx_ssl_verify_client` is turned on in your apihost)
+- **proxy.** HTTP(s) URI for proxy service to forwards requests through. Uses
Needle's [built-in proxy
support](https://github.com/tomas/needle#request-options).
+- **agent.** Provide custom
[http.Agent](https://nodejs.org/api/http.html#http_class_http_agent)
implementation.
### environment variables
@@ -155,13 +157,13 @@ ow.actions.invoke({ noUserAgent: true, name, params })
### Working with a Proxy
- If you are working behind a firewall, you could use the following environment
variables to proxy your HTTP/HTTPS requests
+If you are working behind a firewall, HTTP(s) proxy details can be set by
using the `proxy` option in the constructor parameters with the proxy service
URI, e.g. `http://proxy-server.com:3128`. The proxy URI can also be set using
the following environment parameters (to set a proxy without changing
application code):
- - *http_proxy/HTTP_PROXY*
-- *https_proxy/HTTPS_proxy*
+ - *proxy or PROXY*
+ - *http_proxy or HTTP_PROXY*
+- *https_proxy or HTTPS_proxy*
- The openwhisk-client-js SDK supports the use of above mentioned proxies
through third-party
- HTTP agent such as
[proxy-agent](https://github.com/TooTallNate/node-proxy-agent "proxy-agent
Github page")
+If you need more advanced proxy behaviour, rather than using Needle's default
[built-in HTTP agent](https://github.com/tomas/needle), the `agent` constructor
parameter can be used to set a custom `http.Agent` implementation, e.g
[proxy-agent](https://github.com/TooTallNate/node-proxy-agent "proxy-agent
Github page")
## Examples
diff --git a/lib/client.js b/lib/client.js
index 7e4e10d..94ab447 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -8,7 +8,7 @@ const OpenWhiskError = require('./openwhisk_error')
const needle = require('needle')
const url = require('url')
const http = require('http')
-const ProxyAgent = require('proxy-agent')
+
/**
* This implements a request-promise-like facade over the needle
* library. There are two gaps between needle and rp that need to be
@@ -36,18 +36,6 @@ const rp = opts => {
// this situation than needle
opts.json = true
- // gather proxy settings if behind a firewall
- var proxyUri = process.env.proxy ||
- process.env.HTTP_PROXY ||
- process.env.http_proxy ||
- process.env.HTTPS_PROXY ||
- process.env.https_proxy
-
- if (proxyUri !== undefined) {
-// set the agent with corresponding proxy
-opts.agent = new ProxyAgent(proxyUri)
- }
-
return needle(opts.method.toLowerCase(), // needle takes e.g. 'put' not 'PUT'
opts.url,
opts.body || opts.params,
@@ -95,6 +83,14 @@ class Client {
? process.env['__OW_IGNORE_CERTS'].toLowerCase() === 'true'
: false)
+// gather proxy settings if behind a firewall
+const proxy = options.proxy || process.env.PROXY || process.env.proxy ||
+ process.env.HTTP_PROXY || process.env.http_proxy ||
+ process.env.HTTPS_PROXY || process.env.https_proxy
+
+// custom HTTP agent
+c
[incubator-openwhisk-cli] annotated tag latest deleted (was b01c1d8)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was b01c1d8 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.
[incubator-openwhisk-cli] annotated tag latest updated (e186e92 -> a9a75c9)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was modified! *** from e186e92 (commit) to a9a75c9 (tag) tagging e186e922f6fa42dd6b133431a3ffba754dd0dd1b (commit) replaces 0.10.0-incubating by Travis CI on Thu Jun 13 16:13:39 2019 -0500 - Log - Generated tag from Travis CI build 1789 --- No new revisions were added by this update. Summary of changes:
[incubator-openwhisk-cli] annotated tag latest updated (ec69b20 -> b01c1d8)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was modified! *** from ec69b20 (commit) to b01c1d8 (tag) tagging ec69b2046639f8236082f0d22fa5a877554e2281 (commit) replaces 0.10.0-incubating by Travis CI on Wed Jun 5 18:41:35 2019 -0400 - Log - Generated tag from Travis CI build 1780 --- No new revisions were added by this update. Summary of changes:
[incubator-openwhisk-cli] annotated tag latest deleted (was e6dd332)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was e6dd332 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.
[incubator-openwhisk-runtime-java] branch master updated: push java8 actionloop (#85)
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-runtime-java.git
The following commit(s) were added to refs/heads/master by this push:
new e41459d push java8 actionloop (#85)
e41459d is described below
commit e41459d164c78f63fac3111e3661f1ea4b773327
Author: Michele Sciabarra <30654959+sciabarra...@users.noreply.github.com>
AuthorDate: Mon May 20 00:43:06 2019 +0200
push java8 actionloop (#85)
---
.travis.yml | 5 +
tools/travis/publish.sh | 2 ++
2 files changed, 7 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 936b1ef..99aa983 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,6 +37,11 @@ deploy:
on:
branch: master
repo: apache/incubator-openwhisk-runtime-java
+ - provider: script
+script: "./tools/travis/publish.sh openwhisk 8a latest"
+on:
+ branch: master
+ repo: apache/incubator-openwhisk-runtime-java
env:
global:
- secure:
D4kU9O6bs63Myb4jaEgw1O2Kuy6aTAUKEX1qZ0eYMDouLnPOPnZaFWmpISKTrJyz7hJH7yY8Cj7xl5qwsLB6JZZMtqT6yj5J/jkUJjyLKdQH81PrYy22rH99xS2t5A1dsC0A/Bf39R/qNc5tx1wCMVDF4O2rFsUtn+8vE+rn0nXsiPeWhhZagk/Hrq8YbwzDJHOGHfWe1nZIcU8MORzTriX7J2VAF0AcirPandMxff4FgzNLk432DN2GvgZIlNtZGT1DWLtJV/Sp3unD9abXr5xqNDIW+fHrMq8j/JdHC6+PFtZRFrl0Vr6X8c61PkB/ELGF2MyzNgBTnEaJixl1pianr91WK4y0oLUwpSJCz4yoQGVimAAtqMgNXjEyFMcpLClzS5TjMXKaUfi9mBn9GMCwLi3VAuVtMtH2IRW03PxIPyxkbj1j8Nrd0jh408MuMpuzyECgb+E5ffbd+0YD5XUNlTkYLFi4
[...]
diff --git a/tools/travis/publish.sh b/tools/travis/publish.sh
index 601d950..26fd15f 100755
--- a/tools/travis/publish.sh
+++ b/tools/travis/publish.sh
@@ -34,6 +34,8 @@ if [ ${RUNTIME_VERSION} == "8" ]; then
RUNTIME="java8"
elif [ ${RUNTIME_VERSION} == "10" ]; then
RUNTIME="java10"
+elif [ ${RUNTIME_VERSION} == "8a" ]; then
+ RUNTIME="java8actionloop"
fi
if [[ ! -z ${DOCKER_USER} ]] && [[ ! -z ${DOCKER_PASSWORD} ]]; then
[incubator-openwhisk-runtime-php] branch master updated: Adapt to current actionloop tag. (#57)
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-runtime-php.git The following commit(s) were added to refs/heads/master by this push: new 91cc1dc Adapt to current actionloop tag. (#57) 91cc1dc is described below commit 91cc1dc8c44cfcb0a7dd6f3293f0c0c511cfac03 Author: falkzoll AuthorDate: Fri May 17 17:35:14 2019 +0200 Adapt to current actionloop tag. (#57) The release tag of the actionloop is set to '1.11@1.13.0-incubating'. Adjusted the old value to this new value to unblock the travis build. --- core/php7.3Action/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/php7.3Action/Dockerfile b/core/php7.3Action/Dockerfile index 67fcd5d..8477326 100644 --- a/core/php7.3Action/Dockerfile +++ b/core/php7.3Action/Dockerfile @@ -16,10 +16,10 @@ # FROM golang:1.11 as builder -ENV PROXY_SOURCE=https://github.com/apache/incubator-openwhisk-runtime-go/archive/golang1...@v1.13.0-incubating.tar.gz +ENV PROXY_SOURCE=https://github.com/apache/incubator-openwhisk-runtime-go/archive/1...@1.13.0-incubating.tar.gz RUN curl -L "$PROXY_SOURCE" | tar xzf - \ && mkdir -p src/github.com/apache \ - && mv incubator-openwhisk-runtime-go-golang1.11-v1.13.0-incubating \ + && mv incubator-openwhisk-runtime-go-1.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
[incubator-openwhisk-cli] annotated tag latest deleted (was c45bc6a)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was c45bc6a 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.
[incubator-openwhisk-cli] annotated tag latest updated (04dfe81 -> e6dd332)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was modified! *** from 04dfe81 (commit) to e6dd332 (tag) tagging 04dfe816655e96075b10f747cc7f51f522196593 (commit) replaces 0.10.0-incubating by Travis CI on Tue May 14 11:22:26 2019 -0400 - Log - Generated tag from Travis CI build 1762 --- No new revisions were added by this update. Summary of changes:
[incubator-openwhisk-cli] annotated tag latest updated (23de5a3 -> c45bc6a)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was modified! *** from 23de5a3 (commit) to c45bc6a (tag) tagging 23de5a312c5d2332cb5ebd87c90c09da24db1938 (commit) replaces 0.10.0-incubating by Travis CI on Wed Apr 17 21:11:41 2019 +0530 - Log - Generated tag from Travis CI build 1721 --- No new revisions were added by this update. Summary of changes:
[incubator-openwhisk-cli] annotated tag latest deleted (was 6c8c622)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was 6c8c622 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.
[incubator-openwhisk-runtime-rust] branch master updated: .travis.yml to build the image (#8)
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-runtime-rust.git
The following commit(s) were added to refs/heads/master by this push:
new 17baf3e .travis.yml to build the image (#8)
17baf3e is described below
commit 17baf3ed182fb528f3efdaaaea1d53c6829d9a9f
Author: Michele Sciabarra <30654959+sciabarra...@users.noreply.github.com>
AuthorDate: Fri Apr 12 04:53:03 2019 +0200
.travis.yml to build the image (#8)
update to rust 1.34 and setup travis for CI testing and image publish
Co-authored-by: Michele Sciabarra
Co-authored-by: Carlos Santana
---
.gitignore | 8 +
.travis.yml| 35 ++
README.md | 30 +++
{rust1.32 => rust1.34}/Dockerfile | 6 ++--
{rust1.32 => rust1.34}/Makefile| 0
{rust1.32 => rust1.34}/build.gradle| 2 +-
{rust1.32 => rust1.34}/compile | 0
{rust1.32 => rust1.34}/src/Cargo.lock | 0
{rust1.32 => rust1.34}/src/Cargo.toml | 0
{rust1.32 => rust1.34}/src/action_loop/Cargo.toml | 0
{rust1.32 => rust1.34}/src/action_loop/src/main.rs | 0
{rust1.32 => rust1.34}/src/actions/.gitignore | 0
{rust1.32 => rust1.34}/src/actions/Cargo.toml | 0
{rust1.32 => rust1.34}/src/actions/src/lib.rs | 0
settings.gradle| 2 +-
.../ActionLoopRustBasicTests.scala | 17 +--
tools/travis/publish.sh| 22 ++
tools/travis/{test.sh => scan.sh} | 10 +++
tools/travis/setup.sh | 2 +-
tools/travis/test.sh | 2 +-
20 files changed, 84 insertions(+), 52 deletions(-)
diff --git a/.gitignore b/.gitignore
index 514b1e1..c5218e3 100755
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,14 @@ node_modules
# Vagrant
.vagrant*
+# Eclipse
+tests/bin/
+**/.project
+.settings/
+.classpath
+.cache-main
+.cache-tests
+
# IntelliJ
.idea
*.class
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000..6572f2c
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,35 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
+sudo: required
+services:
+- docker
+notifications:
+ webhooks:
+urls:
+ # travis2slack webhook to enable DMs on openwhisk-team.slack.com to PR
authors with TravisCI results
+ secure:
"pbZEezFpR0lM2xakTVWEd0Lkx4QMBSdcrZBrvpXSVc55rmWTghOvzz0Rie4zlRO8M1QH5vSwGHxwbkGSog0i4DF7rSIY9yIRd4wDb3r2V4zNEhgWHwUznkxUsH/nNgnpB8MVegezOldWCmct2KC+eg/K/zGyzYXX+ZhVR8niu+FZsWYgC/K/TblldNzdKEk3PzeYFgHmxBVOeIOXkXyTnqpBzPotgFQ+pLAeUgghVtGnOii2z6PYLj0OHS0Si6sq5BfZ19FFGOIBbqbyiSCp4bvCn04r979ZgTJENF+4F/r7zN5B+FDk03bBsqr5XnWT7L7E35RqWYWK1jkbi4VFLJ5gc9tzIKhzU4xHlsuF8ZvH29NqAvRWoGflKyCBMaXV6RaSlfWUmQ8tBXLXa4ORcJHpzB8JPiADWjy47gfxlK9kz/T+yN9FsYTU9uaKnb82c8Re0x+7gxLyvcVFEBrvfgb7nAblE
[...]
+
+before_install:
+- "./tools/travis/setup.sh"
+install: true
+script:
+- "./tools/travis/scan.sh && ./tools/travis/build.sh && ./tools/travis/test.sh"
+deploy:
+- provider: script
+ skip_cleanup: true
+ script: "./tools/travis/publish.sh openwhisk ${TRAVIS_TAG%@*}
${TRAVIS_TAG##*@}"
+ on:
+tags: true
+all_branches: true
+repo: apache/incubator-openwhisk-runtime-rust
+- provider: script
+ skip_cleanup: true
+ script: "./tools/travis/publish.sh openwhisk rust1.34 latest"
+ on:
+branch: master
+repo: apache/incubator-openwhisk-runtime-rust
+env:
+ global:
+ - secure:
0Zk7istlUWhzCAMQvNSYEewgQmOF4uexJH/yh+35sifvX60tM2Hpq2ieZCgvTNgLhHPZmEJnRxldAgWGnwax4ROQyzJR+Qbu481KatwPEw5j+PpBP1rFUA5evYJC7gCG1INffliji0yd6WyoUMlwasMEyeyaqfRmdw3W4wMUXF/z1ya6cgAR9HxKegiOxtp4qjeFGk5PcyfxY5PoWroLeE3gpr5mjb7KoW6UzkkSlhJEsI9iMHyoUTln9ZTsLmBiGCmWC1cp6vaKq/K0t1p4bFm5Hg0vJMbb230jcdP9NyvLJJd9UX2eH0G/ER+QzkSM94OQwhQjTzPppC6YAluxUg5ZYr+Ik5ASHXc4WJXag4MRIrur24d60YI0iwodZe05c8ZA/Ksj41RscrbMBv3tIxDalJtY8DNfdfSL3qP3vZEFPyyAIs9jpUm36nY+VYlW0rP2AiEQNcv7rNNGCLqKVQnlbVR4ccCY
[...]
+ - secure:
wwxICr/9NXNF1xTijUW2187d/EuHsjN6QhFW0wkF8hoJALl5MYvJ5FAfInPHchcZaiqt8p9fAgcnNaUiQ4jDmDomDVDQUzxw/Vkr3jOPleM/qeL7RJUHWXnBgKbEU2R89HWPSBCc2KUcyGihJcjPGs9banx41heiTDteXIq/P/+bmOjn3DW4wuazTum3fpZD3r/GE/1zhJN3WvGGJoei2BypSI41FXVdrl5kdkQGWU/XFPhV6ER6G8Y2OIPx/9iOpy8mvhKBDR5HKelDz5xTDUYn5c8V7/Mi5IyXWVzDPFovurlN3pf9Mkqyf0Pc5uGgy9UU+Lkq/PsA/jXaRKq3tJm5idD2VuAAGQpyPh0RHKdckX2xM551q1sWr4UVgFPBtCumguRi8jXBRQh4BkxJWm5UaHJh/i6eN634d/qUGJKw0sktWYFOkoY2mebkMMfFhu1a0dPzBB2D8uqRv/7oLDgx16RI4eGC
[...]
diff --git a/README.md b/
[incubator-openwhisk-cli] annotated tag latest deleted (was 7706337)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was 7706337 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.
[incubator-openwhisk-cli] annotated tag latest updated (67fcbc1 -> 7706337)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was modified! *** from 67fcbc1 (commit) to 7706337 (tag) tagging 67fcbc1cb84153eaae468992e5deeebcfe61e232 (commit) replaces 0.10.0-incubating by Travis CI on Wed Apr 10 11:12:22 2019 -0400 - Log - Generated tag from Travis CI build 1709 --- No new revisions were added by this update. Summary of changes:
[incubator-openwhisk-cli] annotated tag latest deleted (was 5157b06)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was 5157b06 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.
[incubator-openwhisk-package-alarms] branch master updated: bug fix: give both tags to `docker tag` (#186)
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-package-alarms.git
The following commit(s) were added to refs/heads/master by this push:
new 0efc3e3 bug fix: give both tags to `docker tag` (#186)
0efc3e3 is described below
commit 0efc3e35f7c9f9dac90e24f0de1057950a689df1
Author: David Grove
AuthorDate: Tue Apr 9 22:06:35 2019 -0400
bug fix: give both tags to `docker tag` (#186)
---
tools/travis/deploy.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/travis/deploy.sh b/tools/travis/deploy.sh
index 007e244..9f1389d 100755
--- a/tools/travis/deploy.sh
+++ b/tools/travis/deploy.sh
@@ -37,7 +37,7 @@ if [ ${dockerhub_image_tag} == "latest" ]; then
dockerhub_githash_image="${dockerhub_image_prefix}/${dockerhub_image_name}:${short_commit}"
echo docker tag ${dockerhub_image} ${dockerhub_githash_image}
- docker tag ${dockerhub_githash_image}
+ docker tag ${dockerhub_image} ${dockerhub_githash_image}
echo docker push ${dockerhub_githash_image}
docker push ${dockerhub_githash_image}
[incubator-openwhisk-utilities] branch master updated: If a cycle is detected, ignore it rather than raise an exception. (#61)
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-utilities.git
The following commit(s) were added to refs/heads/master by this push:
new 42a8f98 If a cycle is detected, ignore it rather than raise an
exception. (#61)
42a8f98 is described below
commit 42a8f9843fc655e677fb8e9fb1e53e1992fe1cb3
Author: rodric rabbah
AuthorDate: Tue Apr 9 18:41:57 2019 -0400
If a cycle is detected, ignore it rather than raise an exception. (#61)
---
scancode/lib/util.py | 20 +++-
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/scancode/lib/util.py b/scancode/lib/util.py
index c5bcd7b..ac6e0a9 100644
--- a/scancode/lib/util.py
+++ b/scancode/lib/util.py
@@ -32,7 +32,7 @@ _registered_patterns = {}
registered pattern factory (``callable``).
"""
-def iter_tree(root, on_error=None, follow_links=None):
+def iter_tree(root, on_error=None, follow_links=None, ignore_cycles=True):
"""
Walks the specified directory for all files.
@@ -48,7 +48,11 @@ def iter_tree(root, on_error=None, follow_links=None):
to walk symbolik links that resolve to directories. Default is
:data:`None` for :data:`True`.
- Raises :exc:`RecursionError` if recursion is detected.
+ *ignore_cycles* (:class:`bool`) ignores any detected cycles during tree
+ discovery. Default is :data:`True`.
+
+ Raises :exc:`RecursionError` if recursion is detected and
*ignore_cycles*
+ is :data:`False`.
Returns an :class:`~collections.abc.Iterable` yielding the path to
each file (:class:`str`) relative to *root*.
@@ -59,10 +63,10 @@ def iter_tree(root, on_error=None, follow_links=None):
if follow_links is None:
follow_links = True
- for file_rel in _iter_tree_next(os.path.abspath(root), '', {},
on_error, follow_links):
+ for file_rel in _iter_tree_next(os.path.abspath(root), '', {},
on_error, follow_links, ignore_cycles):
yield file_rel
-def _iter_tree_next(root_full, dir_rel, memo, on_error, follow_links):
+def _iter_tree_next(root_full, dir_rel, memo, on_error, follow_links,
ignore_cycles):
"""
Scan the directory for all descendant files.
@@ -80,6 +84,9 @@ def _iter_tree_next(root_full, dir_rel, memo, on_error,
follow_links):
*follow_links* (:class:`bool`) is whether to walk symbolik links that
resolve to directories.
+
+ *ignore_cycles* (:class:`bool`) skips any detected cycles, otherwise
+ raises an exception.
"""
dir_full = os.path.join(root_full, dir_rel)
dir_real = os.path.realpath(dir_full)
@@ -89,6 +96,9 @@ def _iter_tree_next(root_full, dir_rel, memo, on_error,
follow_links):
# recursion has occurred.
if dir_real not in memo:
memo[dir_real] = dir_rel
+ elif ignore_cycles:
+ return
+ yield
else:
raise RecursionError(real_path=dir_real,
first_path=memo[dir_real], second_path=dir_rel)
@@ -119,7 +129,7 @@ def _iter_tree_next(root_full, dir_rel, memo, on_error,
follow_links):
if stat.S_ISDIR(node_stat.st_mode) and (follow_links or not
is_link):
# Child node is a directory, recurse into it and yield
its
# decendant files.
- for file_rel in _iter_tree_next(root_full, node_rel,
memo, on_error, follow_links):
+ for file_rel in _iter_tree_next(root_full, node_rel,
memo, on_error, follow_links, ignore_cycles):
yield file_rel
elif stat.S_ISREG(node_stat.st_mode):
[incubator-openwhisk-runtime-go] branch master updated: fixes the push (#81)
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-runtime-go.git The following commit(s) were added to refs/heads/master by this push: new 566d4ff fixes the push (#81) 566d4ff is described below commit 566d4ffb1785852c5964735b60aa70d252ac1e36 Author: Michele Sciabarra <30654959+sciabarra...@users.noreply.github.com> AuthorDate: Sun Apr 7 20:49:01 2019 +0200 fixes the push (#81) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7938e89..22ab2b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ deploy: repo: apache/incubator-openwhisk-runtime-go - provider: script skip_cleanup: true -script: "./tools/travis/publish.sh openwhisk actionloop latest" +script: "./tools/travis/publish.sh openwhisk actionloop-v2 latest" on: branch: master repo: apache/incubator-openwhisk-runtime-go
[incubator-openwhisk-utilities] branch master updated: Fix exclusion directory and file matching and add support for reading a top level gitignore file (#57)
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-utilities.git The following commit(s) were added to refs/heads/master by this push: new e1faec9 Fix exclusion directory and file matching and add support for reading a top level gitignore file (#57) e1faec9 is described below commit e1faec929990f9107238c5287bae2209eca1b1a2 Author: rodric rabbah AuthorDate: Tue Apr 2 22:36:42 2019 -0400 Fix exclusion directory and file matching and add support for reading a top level gitignore file (#57) --- .gitignore| 3 + LICENSE.txt | 12 ++ README.md | 4 +- licenses/LICENSE-pathspec.txt | 374 ++ scancode/lib/compat.py| 45 + scancode/lib/gitwildmatch.py | 325 scancode/lib/pathspec.py | 146 + scancode/lib/pattern.py | 155 + scancode/lib/util.py | 359 scancode/scanCode.py | 57 --- scancode/travis.cfg | 3 + 11 files changed, 1455 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index 23c57c9..fd8ce7c 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,6 @@ ansible/roles/nginx/files/*cert.pem # .zip files must be explicited whitelisted *.zip + +# .pyc files +*.pyc diff --git a/LICENSE.txt b/LICENSE.txt index a2fe52f..23fba0a 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -200,3 +200,15 @@ 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. + + + +Mozilla Public License 2.0 + + +This distribution bundles the following component, which is +available under an Mozilla Public License 2.0 +(https://www.mozilla.org/en-US/MPL/2.0/). + +Pathspec 0.5.9 (https://pypi.org/project/pathspec/) under scanCode/lib. +License included at licenses/LICENSE-pathspec.txt. diff --git a/README.md b/README.md index 93c7de3..fecac52 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Scan detected 3 error(s) in 1 file(s): To make sure this never happens to you, you can run the same tests on your local machine every time you commit changes. -1. Clone the OpenWhisk utilities project repo.: +1. Clone the OpenWhisk utilities project: ```bash $ git clone https://github.com/apache/incubator-openwhisk-utilities.git ``` @@ -66,7 +66,7 @@ $ cat /path/to/openwhisk/.git/hooks/pre-commit # determine openwhisk base directory root="$(git rev-parse --show-toplevel)" -python /path/to/incubator-openwhisk-utilities/scancode/scanCode.py . --config $root/tools/ +python /path/to/incubator-openwhisk-utilities/scancode/scanCode.py . --config $root/tools/ --gitignore $root/.gitignore ``` _Note_: A hook a locally installed, so if you check out the repository again, you will need to reinstall it. diff --git a/licenses/LICENSE-pathspec.txt b/licenses/LICENSE-pathspec.txt new file mode 100644 index 000..52d1351 --- /dev/null +++ b/licenses/LICENSE-pathspec.txt @@ -0,0 +1,374 @@ +Mozilla Public License Version 2.0 +== + +1. Definitions +-- + +1.1. "Contributor" +means each individual or legal entity that creates, contributes to +the creation of, or owns Covered Software. + +1.2. "Contributor Version" +means the combination of the Contributions of others (if any) used +by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" +means Covered Software of a particular Contributor. + +1.4. "Covered Software" +means Source Code Form to which the initial Contributor has attached +the notice in Exhibit A, the Executable Form of such Source Code +Form, and Modifications of such Source Code Form, in each case +including portions thereof. + +1.5. "Incompatible With Secondary Licenses" +means + +(a) that the initial Contributor has attached the notice described +in Exhibit B to the Covered Software; or + +(b) that the Covered Software was made available under the terms of +version 1.1 or earlier of the License, but not also under the +terms of a Secondary License. + +1.6. "Executable Form" +means any form of the work other than Source Code Form. + +1.7. "Larger Work" +means a work that combines Covered Software with other material, in +a separate file or files, that is not Covered Software. + +1.8. "License" +means this document. + +1.9. "Licensable" +means having the right to
[incubator-openwhisk-devtools] branch master updated: adding support for lean openwhisk setup (#220)
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-devtools.git
The following commit(s) were added to refs/heads/master by this push:
new 1e4cf0e adding support for lean openwhisk setup (#220)
1e4cf0e is described below
commit 1e4cf0e077e44b8f1d0a5debcd43e0b7a89aa024
Author: Pavel Kravchenko
AuthorDate: Tue Apr 2 07:56:04 2019 +0300
adding support for lean openwhisk setup (#220)
---
docker-compose/Makefile| 24 +---
docker-compose/README.md | 8 +++
docker-compose/docker-compose-lean.yml | 107 +
3 files changed, 132 insertions(+), 7 deletions(-)
diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index 033b329..ac9a4d4 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -26,6 +26,8 @@ WSK_CONFIG_FILE=$(CURDIR)/.wskprops
OPEN_WHISK_DB_PREFIX ?= local_
DOCKER_KERNEL ?= $(shell docker version --format "{{.Server.KernelVersion}}")
+DOCKER_COMPOSE_FILE=docker-compose.yml
+
ifeq ("$(UNAME_STR)","Linux")
DOCKER_BINARY ?= $(shell (which docker))
else
@@ -41,6 +43,9 @@ endif
# 3. it runs a sample hello-world function
# To stop and cleanup the environment use: make destroy
+lean: DOCKER_COMPOSE_FILE=docker-compose-lean.yml
+lean: download-src download-cli docker-pull-lean run hello-world
quick-start-info
+
quick-start: download-src download-cli docker-pull run quick-start-pause
hello-world quick-start-info
add-catalog: download-catalog init-catalog
@@ -104,14 +109,17 @@ docker-build:
cd $(OPENWHISK_PROJECT_HOME) && \
./gradlew distDocker -PdockerImagePrefix=$(DOCKER_IMAGE_PREFIX)
-.PHONY: docker-pull
-docker-pull:
- echo "pulling the docker images short list... "
+.PHONY: docker-pull-lean
+docker-pull-lean:
docker pull $(DOCKER_IMAGE_PREFIX)/controller
- docker pull $(DOCKER_IMAGE_PREFIX)/invoker
docker pull $(DOCKER_IMAGE_PREFIX)/nodejs6action
docker pull $(DOCKER_IMAGE_PREFIX)/dockerskeleton
+.PHONY: docker-pull
+docker-pull: docker-pull-lean
+ echo "pulling the docker images short list... "
+ docker pull $(DOCKER_IMAGE_PREFIX)/invoker
+
.PHONY: docker-pull-full
docker-pull-full:
echo "pulling the docker images full list ... "
@@ -213,6 +221,8 @@ setup:
mkdir -p ~/tmp/openwhisk/minio
cp -r ./apigateway/* ~/tmp/openwhisk/api-gateway-config/api-gateway/
cp -r ./apigateway/rclone ~/tmp/openwhisk
+
+
$(shell cat ~/tmp/openwhisk/local.env) docker-compose --project-name
openwhisk up minio 2>&1 > ~/tmp/openwhisk/setup.log &
echo "pinging minio..."
until (curl --silent http://$(DOCKER_HOST_IP):9001/ > /dev/null); do
printf '.'; sleep 5; done
@@ -259,7 +269,7 @@ restart-invoker:
.PHONY: start-docker-compose
start-docker-compose:
- $(shell cat ~/tmp/openwhisk/local.env) docker-compose --project-name
openwhisk up --abort-on-container-exit 2>&1 >
~/tmp/openwhisk/docker-compose.log &
+ $(shell cat ~/tmp/openwhisk/local.env) docker-compose --project-name
openwhisk -f $(DOCKER_COMPOSE_FILE) up --abort-on-container-exit 2>&1 >
~/tmp/openwhisk/docker-compose.log &
.PHONY: wait-for-docker-compose-up
wait-for-docker-compose-up:
@@ -268,7 +278,7 @@ wait-for-docker-compose-up:
@trycount=0; \
trycounttimeout=30; \
up=`$(shell cat ~/tmp/openwhisk/local.env) docker-compose
--project-name openwhisk ps | grep Up -c`; \
- servicescount=`$(shell cat ~/tmp/openwhisk/local.env) docker-compose
config --services | wc -l | xargs`; \
+ servicescount=`$(shell cat ~/tmp/openwhisk/local.env) docker-compose -f
$(DOCKER_COMPOSE_FILE) config --services | wc -l | xargs`; \
docker_ps() { \
docker ps --format 'table {{.Image}}\t{{.Status}}' --filter
"label=com.docker.compose.project=openwhisk" -a; \
}; \
@@ -352,7 +362,7 @@ init-catalog:
.PHONY: destroy
destroy: stop rm
echo "cleaning other OpenWhisk containers started by the invoker ... "
- docker ps | grep whisk | awk '{print $$1}' | xargs docker stop | xargs
docker rm
+ -docker ps | grep whisk | awk '{print $$1}' | xargs docker stop | xargs
docker rm
echo "cleaning dangling docker volumes ... "
docker volume ls -qf dangling=true | xargs docker volume rm
if [ "$(UNAME_STR)" = "Linux" ]; then \
diff --git a/docker-compose/README.md b/docker-compose/README.md
index cfabb8a..f2ac189 100644
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -252,3 +252,11 @@ These 2 variable allow you to execute a JS action using
the container `registry.
By default this setup use
[incubator-openwhisk-cli] annotated tag latest deleted (was 4751302)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was 4751302 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.
[incubator-openwhisk-cli] annotated tag latest updated (46bddcf -> 5157b06)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was modified! *** from 46bddcf (commit) to 5157b06 (tag) tagging 46bddcf9bccd4d05fad2fbe099af7d66b92eb8cc (commit) replaces 0.9.0-incubating by Travis CI on Wed Mar 20 14:31:12 2019 -0400 - Log - Generated tag from Travis CI build 1675 --- No new revisions were added by this update. Summary of changes:
[incubator-openwhisk-cli] annotated tag latest updated (eaf64ae -> 4751302)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was modified! *** from eaf64ae (commit) to 4751302 (tag) tagging eaf64aef74deaf61a1eaa5d93ce1102d3d91407f (commit) replaces 0.9.0-incubating by Travis CI on Sat Mar 16 08:32:57 2019 -0400 - Log - Generated tag from Travis CI build 1667 --- No new revisions were added by this update. Summary of changes:
[incubator-openwhisk-cli] annotated tag latest deleted (was 4635345)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was 4635345 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.
[incubator-openwhisk-cli] annotated tag latest updated (c59c5ce -> 4635345)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was modified! *** from c59c5ce (commit) to 4635345 (tag) tagging c59c5ce54e377aa8cfb05ab90928f27ce259fa22 (commit) replaces 0.9.0-incubating by Travis CI on Fri Mar 15 03:14:55 2019 -0400 - Log - Generated tag from Travis CI build 1664 --- No new revisions were added by this update. Summary of changes:
[incubator-openwhisk-cli] annotated tag latest deleted (was e0f1ea3)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was e0f1ea3 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.
[incubator-openwhisk-deploy-kube] branch master updated: document minimum memory/CPU for running default OpenWhisk config (#441)
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 e39f75a document minimum memory/CPU for running default OpenWhisk config (#441) e39f75a is described below commit e39f75a4b3b29197f0a7d3df4c6269453670d77b Author: David Grove AuthorDate: Tue Mar 12 16:30:18 2019 -0400 document minimum memory/CPU for running default OpenWhisk config (#441) --- README.md | 15 +++ 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d4f891c..69c9f4e 100644 --- a/README.md +++ b/README.md @@ -68,8 +68,9 @@ acceptable. The simplest way to get a small Kubernetes cluster suitable for development and testing is to use one of the Docker-in-Docker approaches for running Kubernetes directly on top of Docker on your -development machine. Depending on your host operating system, we -recommend the following: +development machine. Configuring Docker with 4GB of memory and +2 virtual CPUs is sufficient for the default settings of OpenWhisk. +Depending on your host operating system, we recommend the following: 1. MacOS: Use the built-in Kubernetes support in Docker for Mac version 18.06 or later. Please follow our [setup instructions](docs/k8s-docker-for-mac.md) to initially create @@ -88,14 +89,20 @@ your cluster. Minikube provides a Kubernetes cluster running inside a virtual machine (for example VirtualBox). It can be used on MacOS, Linux, or Windows to run OpenWhisk, but is somewhat less flexible than the -docker-in-docker options described above. For details on setting up +docker-in-docker options described above. Configuring the Minikube VM +with 4GB of memory and 2 virtual CPUs is sufficient for the default +settings of OpenWhisk. For details on setting up Minikube, see these [setup instructions](docs/k8s-minikube.md). ### Using a Kubernetes cluster from a cloud provider You can also provision a Kubernetes cluster from a cloud provider, subject to the cluster meeting the [technical -requirements](docs/k8s-technical-requirements.md). We have +requirements](docs/k8s-technical-requirements.md). You will need at least +1 worker node with 4GB of memory and 2 virtual CPUs to deploy the default +configuration of OpenWhisk. You can deploy to significantly larger clusters +by scaling up the replica count of the various components and labeling multiple +nodes as invoker nodes. We have detailed documentation on using Kubernetes clusters from the following major cloud providers: * [IBM (IKS)](docs/k8s-ibm-public.md) and [IBM (ICP)](docs/k8s-ibm-private.md)
[incubator-openwhisk-deploy-kube] branch master updated: Get dind-cluster.sh from kubeadm-dind 0.1 release (#442)
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 7abe30c Get dind-cluster.sh from kubeadm-dind 0.1 release (#442)
7abe30c is described below
commit 7abe30c201d512220262540178f416f205fe8a57
Author: David Grove
AuthorDate: Mon Mar 11 20:19:27 2019 -0400
Get dind-cluster.sh from kubeadm-dind 0.1 release (#442)
* Get dind-cluster.sh from kubeadm-dind 0.1 release
* patch around bug in dind-cluster-v1.12.sh
---
tools/travis/dind-cluster-v12.patch | 11 +++
tools/travis/start-kubeadm-dind.sh | 6 +-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/tools/travis/dind-cluster-v12.patch
b/tools/travis/dind-cluster-v12.patch
new file mode 100644
index 000..dfb51ff
--- /dev/null
+++ b/tools/travis/dind-cluster-v12.patch
@@ -0,0 +1,11 @@
+--- dind-cluster.sh2019-03-11 17:37:22.0 -0400
dind-cluster.sh2019-03-11 17:38:23.0 -0400
+@@ -1099,7 +1099,7 @@
+ --server="http://${host}:$(dind::apiserver-port)" \
+ --insecure-skip-tls-verify=true
+ "${kubectl}" config set-context "$context_name" --cluster="$cluster_name"
+- if [[ ${DIND_LABEL} = ${DEFAULT_DIND_LABEL} ]]; then
++ if [[ "${DIND_LABEL}" = "${DEFAULT_DIND_LABEL}" ]]; then
+ # Single cluster mode
+ "${kubectl}" config use-context "$context_name"
+ fi
diff --git a/tools/travis/start-kubeadm-dind.sh
b/tools/travis/start-kubeadm-dind.sh
index 0f18dfd..bdcd889 100755
--- a/tools/travis/start-kubeadm-dind.sh
+++ b/tools/travis/start-kubeadm-dind.sh
@@ -5,7 +5,11 @@
set -x
# Install kubernetes-dind-cluster and boot it
-wget
https://cdn.rawgit.com/kubernetes-sigs/kubeadm-dind-cluster/master/fixed/dind-cluster-v$TRAVIS_KUBE_VERSION.sh
-O $HOME/dind-cluster.sh && chmod +x $HOME/dind-cluster.sh && USE_HAIRPIN=true
$HOME/dind-cluster.sh up
+wget
https://github.com/kubernetes-sigs/kubeadm-dind-cluster/releases/download/v0.1.0/dind-cluster-v$TRAVIS_KUBE_VERSION.sh
-O $HOME/dind-cluster.sh && chmod +x $HOME/dind-cluster.sh
+if [[ "$TRAVIS_KUBE_VERSION" == "1.12" ]]; then
+patch $HOME/dind-cluster.sh ./tools/travis/dind-cluster-v12.patch
+fi
+USE_HAIRPIN=true $HOME/dind-cluster.sh up
# Install kubectl in /usr/local/bin so subsequent scripts can find it
sudo cp $HOME/.kubeadm-dind-cluster/kubectl-v$TRAVIS_KUBE_VERSION*
/usr/local/bin/kubectl
[incubator-openwhisk-cli] branch master updated: Update wskdeploy dependency (#421)
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-cli.git
The following commit(s) were added to refs/heads/master by this push:
new b18f5f0 Update wskdeploy dependency (#421)
b18f5f0 is described below
commit b18f5f0a86c3975c2e2872678b67a42621dda809
Author: David Grove
AuthorDate: Mon Mar 11 17:13:52 2019 -0400
Update wskdeploy dependency (#421)
---
build.gradle | 2 +-
vendor/vendor.json | 72 ++
2 files changed, 73 insertions(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 0dd5ffd..b561451 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,7 +58,7 @@ dependencies {
build(['name':'gopkg.in/yaml.v2',
'version':'eb3733d160e74a9c7e442f435eb3bea458e1d19f', 'transitive':false])
build(['name':'github.com/ghodss/yaml',
'version':'0ca9ea5df5451ffdf184b4428c902747c2c11cd7', 'transitive':false])
build(['name':'github.com/apache/incubator-openwhisk-client-go/whisk','version':'c7013c9f456f35be34b3bf166535aaa03b834331','transitive':false])
-
build(['name':'github.com/apache/incubator-openwhisk-wskdeploy','version':'fc8de6454cc83ecd24b1fa2f8685f1512e6d5de5','transitive':false])
+
build(['name':'github.com/apache/incubator-openwhisk-wskdeploy','version':'7d79fd74ca1045658196e5004f8820b67570734c','transitive':false])
// END - Imported from Godeps
test name:'github.com/stretchr/testify',
version:'b91bfb9ebec76498946beb6af7c0230c7cc7ba6c', transitive:false //, tag:
'v1.2.0'
test name:'github.com/spf13/viper',
version:'aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5', transitive:false
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 6291858..793f88c 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -15,6 +15,78 @@
"revisionTime": "2019-01-21T12:59:58Z"
},
{
+ "checksumSHA1": "Vxd1iFfdoXjzG+wvixFlR6o+fOk=",
+ "path":
"github.com/apache/incubator-openwhisk-wskdeploy/cmd",
+ "revision": "7d79fd74ca1045658196e5004f8820b67570734c",
+ "revisionTime": "2019-03-05T19:40:48Z"
+ },
+ {
+ "checksumSHA1": "zoY15nrCfmU+4Xsk2dzrpviEPuU=",
+ "path":
"github.com/apache/incubator-openwhisk-wskdeploy/conductor",
+ "revision": "7d79fd74ca1045658196e5004f8820b67570734c",
+ "revisionTime": "2019-03-05T19:40:48Z"
+ },
+ {
+ "checksumSHA1": "o7oqPbymhiZ4x/ajT3zHKYmizkU=",
+ "path":
"github.com/apache/incubator-openwhisk-wskdeploy/dependencies",
+ "revision": "7d79fd74ca1045658196e5004f8820b67570734c",
+ "revisionTime": "2019-03-05T19:40:48Z"
+ },
+ {
+ "checksumSHA1": "3M3Dd5jXZUAYrHdKjAbTGhQpx2c=",
+ "path":
"github.com/apache/incubator-openwhisk-wskdeploy/deployers",
+ "revision": "7d79fd74ca1045658196e5004f8820b67570734c",
+ "revisionTime": "2019-03-05T19:40:48Z"
+ },
+ {
+ "checksumSHA1": "SF2iutNA9FZqcK2RKBhMWvZWyec=",
+ "path":
"github.com/apache/incubator-openwhisk-wskdeploy/parsers",
+ "revision": "7d79fd74ca1045658196e5004f8820b67570734c",
+ "revisionTime": "2019-03-05T19:40:48Z"
+ },
+ {
+ "checksumSHA1": "0pxUt7OAYYSxhEzJAmRyUgwTW4Q=",
+ "path":
"github.com/apache/incubator-openwhisk-wskdeploy/runtimes",
+ "revision": "7d79fd74ca1045658196e5004f8820b67570734c",
+ "revisionTime": "2019-03-05T19:40:48Z"
+ },
+ {
+ "checksumSHA1": "PA2NcJNNMitJcdgSwNhXC3w4EiA=",
+ "path":
"github.com/apache/incubator-openwhisk-wskdeploy/utils",
+ "revision": "7d79fd74ca1045658196e5004f8820b67570734c",
+ "revisionTime": "2019-03-05T19:40:48Z"
+
[incubator-openwhisk-client-js] branch master updated: Fix scancode issues (#153)
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-client-js.git
The following commit(s) were added to refs/heads/master by this push:
new 5d41cd1 Fix scancode issues (#153)
5d41cd1 is described below
commit 5d41cd15621dbef82a748d8308d79b1f7af38a19
Author: Shazron Abdullah
AuthorDate: Mon Mar 11 21:47:00 2019 +0800
Fix scancode issues (#153)
---
.travis.yml | 3 +++
CONTRIBUTING.md | 35
README.md| 22 ++--
test/integration/README.md | 20 +-
test/integration/prepIntegrationTests.sh | 4
test/integration/utils.js| 3 +++
tools/merge-coverage.sh | 3 +++
tools/travis/build.sh| 2 ++
tools/travis/scancode.sh | 3 +++
tools/travis/setup.sh| 3 +++
tools/travis/setupscan.sh| 2 ++
11 files changed, 80 insertions(+), 20 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 71fde45..558f905 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
language: node_js
node_js:
- '6'
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9167b53..12b89b1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,21 +1,22 @@
-[](http://www.apache.org/licenses/LICENSE-2.0)
+[](http://www.apache.org/licenses/LICENSE-2.0)
# Contributing to Apache OpenWhisk
@@ -36,18 +37,18 @@ Instructions on how to do this can be found here:
[http://www.apache.org/licenses/#clas](http://www.apache.org/licenses/#clas)
Once submitted, you will receive a confirmation email from the Apache Software
Foundation (ASF) and be added to
-the following list: http://people.apache.org/unlistedclas.html.
+the following list: http://people.apache.org/unlistedclas.html.
Project committers will use this list to verify pull requests (PRs) come from
contributors that have signed a CLA.
-We look forward to your contributions!
+We look forward to your contributions!
## Raising issues
-Please raise any bug reports on the respective project repository's GitHub
issue tracker. Be sure to search the
+Please raise any bug reports on the respective project repository's GitHub
issue tracker. Be sure to search the
list to see if your issue has already been raised.
-A good bug report is one that make it easy for us to understand what you were
trying to do and what went wrong.
+A good bug report is one that make it easy for us to understand what you were
trying to do and what went wrong.
Provide as much context as possible so we can try to recreate the issue.
### Discussion
@@ -65,4 +66,4 @@ code base. Some basic rules include:
- all files must have the Apache license in the header.
- all PRs must have passing builds for all operating systems.
- - follow the [standard](https://standardjs.com) style rules. Linter run on CI
and automatically as [pre-commit hook](http://githooks.com/). For automatic
fixing run `npm run standard-fix`.
+ - follow the [standard](https://standardjs.com) style rules. Linter run on CI
and automatically as [pre-commit hook](http://githooks.com/). For automatic
fixing run `npm run standard-fix`.
diff --git a/README.md b/README.md
index 29f8c5d..ab36696 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,21 @@
+
# OpenWhisk Client for JavaScript
[](https://travis-ci.org/apache/incubator-openwhisk-client-js)
@@ -79,7 +97,7 @@ var options = {
}
var ow = openwhisk(options)
ow.actions.invoke('sample').then(result => console.log(result))
-```
+```
### constructor options
@@ -138,7 +156,7 @@ ow.actions.invoke({ noUserAgent: true, name, params })
- *http_proxy/HTTP_PROXY*
- *https_proxy/HTTPS_proxy*
- The openwhisk-client-js SDK supports the use of above mentioned proxies
through third-party
+ The openwhisk-client-js SDK supports the use of above mentioned proxies
through third-party
HTTP agent such as
[proxy-agent](https://github.com/TooTallNate/node-proxy-agent "proxy-agent
Github page")
## Examples
diff --git a/test/integration/README.md b/test/integration/README.md
index c7f3e2a..c23a1da 100644
--- a/test/integration/README.md
+++ b/test/integration/README.md
@@ -1,3 +1,21 @@
+
Integrations Test
--
@@ -12,4 +30,4 @@ You can retrieve these settings from the `.wskprops` file.
*Note:* If the tests fail, you might need to remove the created artifa
[incubator-openwhisk-runtime-rust] branch master updated: Added the "hello" to the example, added badges to README (#5)
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-runtime-rust.git
The following commit(s) were added to refs/heads/master by this push:
new 7a75366 Added the "hello" to the example, added badges to README (#5)
7a75366 is described below
commit 7a753666b73cce0c944e052ce550f137fec5df38
Author: Michele Sciabarra <30654959+sciabarra...@users.noreply.github.com>
AuthorDate: Sun Mar 10 12:41:42 2019 +0100
Added the "hello" to the example, added badges to README (#5)
* modified action signature and changed example action
* format code
* changed response error message for action loop
* change error msg
* refactored error messages
* Update README.md
* updated the example
* badges - closes #1
* ops
---
README.md| 4
example/hello/Cargo.toml | 4 +++-
example/hello/src/lib.rs | 33 ++---
rust1.32/compile | 4
4 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/README.md b/README.md
index d4e48bc..6b71be7 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,17 @@
# incubator-openwhisk-runtime-rust
Work in Progress! Do not use yet...
+It will be awesome.
+[](http://www.apache.org/licenses/LICENSE-2.0)
+[](https://travis-ci.org/apache/incubator-openwhisk-runtime-rust)
# Work Done
- implemented the actionloop
- implemented the Docker image
- implemented the action compiler
+- refactored to a more rustacean form
# Work to do
diff --git a/example/hello/Cargo.toml b/example/hello/Cargo.toml
index 315401c..86a58df 100644
--- a/example/hello/Cargo.toml
+++ b/example/hello/Cargo.toml
@@ -2,7 +2,9 @@
name = "actions"
version = "0.1.0"
authors = ["Roberto Diaz "]
+edition = "2018"
[dependencies]
serde_json = "1.0"
-
+serde = "1.0"
+serde_derive = "1.0"
diff --git a/example/hello/src/lib.rs b/example/hello/src/lib.rs
index 5f43e8d..732e23b 100644
--- a/example/hello/src/lib.rs
+++ b/example/hello/src/lib.rs
@@ -1,16 +1,27 @@
extern crate serde_json;
-use std::collections::HashMap;
-use serde_json::Value;
+use serde_derive::{Deserialize, Serialize};
+use serde_json::{Error, Value};
-pub fn main(args: HashMap) -> HashMap {
-let name_opt = args.get("name");
-let name = if name_opt.is_some() {
-name_opt.unwrap().as_str().unwrap()
-} else {
-"stranger"
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+struct Input {
+#[serde(default = "stranger")]
+name: String,
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+struct Output {
+greeting: String,
+}
+
+fn stranger() -> String {
+"stranger".to_string()
+}
+
+pub fn main(args: Value) -> Result {
+let input: Input = serde_json::from_value(args)?;
+let output = Output {
+greeting: format!("Hello, {}", input.name),
};
-let mut out = HashMap::new();
-out.insert("greeting".to_string(), Value::String(format!("Hello, {}",
name)));
-out
+serde_json::to_value(output)
}
diff --git a/rust1.32/compile b/rust1.32/compile
index 650904e..88a05d7 100755
--- a/rust1.32/compile
+++ b/rust1.32/compile
@@ -43,9 +43,13 @@ def copy_replace(src, dst, match=None, replacement=""):
cargo_action = """[package]
name = "actions"
version = "0.1.0"
+authors = ["Roberto Diaz "]
+edition = "2018"
[dependencies]
serde_json = "1.0"
+serde = "1.0"
+serde_derive = "1.0"
"""
def build(tgt_dir):
[incubator-openwhisk-runtime-go] branch master updated: Static Build, Versioning and Support for More Languages (#72)
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-runtime-go.git
The following commit(s) were added to refs/heads/master by this push:
new c3e94d5 Static Build, Versioning and Support for More Languages (#72)
c3e94d5 is described below
commit c3e94d5f755b7b52b2a6e09e53154d06bde74505
Author: Michele Sciabarra <30654959+sciabarra...@users.noreply.github.com>
AuthorDate: Mon Mar 4 17:42:01 2019 +0100
Static Build, Versioning and Support for More Languages (#72)
---
.gitignore | 6 +-
openwhisk/_test/build.sh => CHANGES.md | 57 ---
CREDITS.txt| 4 +-
LICENSE-filetype.txt | 25 -
README.md | 4 +
{actionProxyLoop => actionloop}/Dockerfile | 0
{actionProxyLoop => actionloop}/build.gradle | 16 +++-
build.gradle | 7 +-
examples/Makefile | 3 +-
examples/bash-hello/Makefile | 2 +-
examples/golang-hello-single/Makefile | 4 +-
examples/golang-hello-vendor/Makefile | 8 +-
examples/golang-main-package/Makefile | 8 +-
examples/golang-main-single/Makefile | 4 +-
examples/golang-main-standalone/Makefile | 2 +-
examples/golang-main-vendor/Makefile | 4 +-
golang1.11/build.gradle| 3 +-
main/proxy.go | 33 +--
openwhisk/_test/build.sh | 6 +-
openwhisk/_test/compile.py | 11 +++
openwhisk/_test/{build.sh => find.sh} | 40 +---
openwhisk/_test/pysample/exec | 6 ++
openwhisk/_test/pysample/lib/action/__init__.py| 2 +
openwhisk/_test/pysample/lib/action/main.py| 7 ++
openwhisk/_test/pysample/lib/exec.py | 20
openwhisk/actionProxy.go | 34 ++-
openwhisk/actionProxy_test.go | 44 +
openwhisk/compiler_test.go | 2 +-
openwhisk/extractor.go | 56 +--
openwhisk/extractor_test.go| 2 +-
openwhisk/filetype.go | 10 +-
openwhisk/filetype_test.go | 6 ++
openwhisk/initHandler.go | 24 ++---
openwhisk/initHandler_test.go | 17
openwhisk/util_test.go | 19 ++--
openwhisk/version.go | 2 +-
openwhisk/zip.go | 104 +
openwhisk/{version.go => zip_test.go} | 26 +-
settings.gradle| 3 +-
.../actionContainers/ActionLoopBasicTests.scala| 2 +-
.../ActionLoopContainerTests.scala | 6 +-
41 files changed, 379 insertions(+), 260 deletions(-)
diff --git a/.gitignore b/.gitignore
index d490e01..7eacee2 100644
--- 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/openwhisk/_test/build.sh b/CHANGES.md
old mode 100755
new mode 100644
similarity index 54%
copy from openwhisk/_test/build.sh
copy to CHANGES.md
index 58f80e8..c9a557b
--- a/openwhisk/_test/build.sh
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-#!/bin/bash
+
+# ActionLoop v1.0.1
+- embedded file type detection
+- now showing the commend
+- librdkafka in golang image
+- showing version numbuer with -debug
+
+# Actionloop v2
+Versioning
+- renamed actionloop docker image to actionloop-v2
+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 uploaded files
diff --git a/CREDITS.txt b/CREDITS.txt
index f3d5e6a..c47fb41 100644
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -1,6 +1,6 @@
-Michele Sciabarra
+Michele Sciabarra
-Carlos Santana
+Carlos Santana
Rodric Rabbah
diff --git a/LICENSE-filetype.txt b/LICENSE-filetype.txt
deleted file mode 100644
index c03a05c..000
--- a/LICENSE-filetype.txt
+++ /dev/null
@@ -1,25 +0,
[incubator-openwhisk-runtime-nodejs] branch master updated: bump nodejs versions 10.15.2, 8.15.1, 6.17.0 (#114)
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-runtime-nodejs.git The following commit(s) were added to refs/heads/master by this push: new 1169a53 bump nodejs versions 10.15.2, 8.15.1, 6.17.0 (#114) 1169a53 is described below commit 1169a53756ac53300d83fac7ce3d9227ae05ee57 Author: falkzoll AuthorDate: Mon Mar 4 17:40:33 2019 +0100 bump nodejs versions 10.15.2, 8.15.1, 6.17.0 (#114) * Security updates --- core/nodejs10Action/CHANGELOG.md | 2 +- core/nodejs10Action/Dockerfile | 2 +- core/nodejs6Action/CHANGELOG.md | 2 +- core/nodejs6Action/Dockerfile| 2 +- core/nodejs8Action/CHANGELOG.md | 2 +- core/nodejs8Action/Dockerfile| 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/nodejs10Action/CHANGELOG.md b/core/nodejs10Action/CHANGELOG.md index 7beca7f..e6f00e1 100644 --- a/core/nodejs10Action/CHANGELOG.md +++ b/core/nodejs10Action/CHANGELOG.md @@ -25,4 +25,4 @@ Changes: - [openwhisk v3.18.0](https://www.npmjs.com/package/openwhisk) - JavaScript client library for the OpenWhisk platform. Provides a wrapper around the OpenWhisk APIs. -Node.js version = [10.14.2](https://nodejs.org/en/blog/release/v10.14.2/) +Node.js version = [10.15.2](https://nodejs.org/en/blog/release/v10.15.2/) diff --git a/core/nodejs10Action/Dockerfile b/core/nodejs10Action/Dockerfile index 391e1ff..2aebe4b 100644 --- a/core/nodejs10Action/Dockerfile +++ b/core/nodejs10Action/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # -FROM node:10.15.1-stretch +FROM node:10.15.2-stretch RUN apt-get update && apt-get install -y \ imagemagick \ graphicsmagick \ diff --git a/core/nodejs6Action/CHANGELOG.md b/core/nodejs6Action/CHANGELOG.md index e9b21ab..6bd2751 100644 --- a/core/nodejs6Action/CHANGELOG.md +++ b/core/nodejs6Action/CHANGELOG.md @@ -26,7 +26,7 @@ Changes: - [openwhisk v3.18.0](https://www.npmjs.com/package/openwhisk) - JavaScript client library for the OpenWhisk platform. Provides a wrapper around the OpenWhisk APIs. -Node.js version = [6.16.0](https://nodejs.org/en/blog/release/v6.16.0/) +Node.js version = [6.17.0](https://nodejs.org/en/blog/release/v6.17.0/) ## 1.12.0 Change: Update npm openwhisk package from `3.16.0` to `3.17.0` diff --git a/core/nodejs6Action/Dockerfile b/core/nodejs6Action/Dockerfile index 4a90496..b238acb 100644 --- a/core/nodejs6Action/Dockerfile +++ b/core/nodejs6Action/Dockerfile @@ -18,7 +18,7 @@ FROM nodejsactionbase # based on https://github.com/nodejs/docker-node -ENV NODE_VERSION 6.16.0 +ENV NODE_VERSION 6.17.0 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz; \ && tar -xzf "node-v$NODE_VERSION-linux-x64.tar.gz" -C /usr/local --strip-components=1 \ && rm "node-v$NODE_VERSION-linux-x64.tar.gz" diff --git a/core/nodejs8Action/CHANGELOG.md b/core/nodejs8Action/CHANGELOG.md index 1e2d61d..f03fcb2 100644 --- a/core/nodejs8Action/CHANGELOG.md +++ b/core/nodejs8Action/CHANGELOG.md @@ -26,7 +26,7 @@ Changes: - [openwhisk v3.18.0](https://www.npmjs.com/package/openwhisk) - JavaScript client library for the OpenWhisk platform. Provides a wrapper around the OpenWhisk APIs. -Node.js version = [8.15.0](https://nodejs.org/en/blog/release/v8.15.0/) +Node.js version = [8.15.1](https://nodejs.org/en/blog/release/v8.15.1/) ## 1.9.0 (Apache 1.12) Change: Update openwhisk npm package from `3.16.0` to `3.17.0` diff --git a/core/nodejs8Action/Dockerfile b/core/nodejs8Action/Dockerfile index 25123f8..6dcc447 100644 --- a/core/nodejs8Action/Dockerfile +++ b/core/nodejs8Action/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # -FROM node:8.15.0 +FROM node:8.15.1 RUN apt-get update && apt-get install -y \ imagemagick \ graphicsmagick \
[incubator-openwhisk-cli] annotated tag latest deleted (was 8a4016f)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was 8a4016f 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.
[incubator-openwhisk-cli] annotated tag latest updated (151d6db -> e0f1ea3)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was modified! *** from 151d6db (commit) to e0f1ea3 (tag) tagging 151d6db6faf2fa6b178a27c8e7145d53d94be451 (commit) replaces 0.9.0-incubating by Travis CI on Mon Mar 4 09:45:15 2019 -0500 - Log - Generated tag from Travis CI build 1638 --- No new revisions were added by this update. Summary of changes:
[incubator-openwhisk-deploy-kube] branch master updated: Document that you must use KubernetesContainerFactory on IKS 1.11+ (#429)
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 a1ce67f Document that you must use KubernetesContainerFactory on IKS 1.11+ (#429) a1ce67f is described below commit a1ce67f82d4378959db712a335bb5faca5d6723f Author: David Grove AuthorDate: Sat Feb 23 06:15:52 2019 -0500 Document that you must use KubernetesContainerFactory on IKS 1.11+ (#429) --- docs/k8s-ibm-public.md | 10 ++ 1 file changed, 10 insertions(+) diff --git a/docs/k8s-ibm-public.md b/docs/k8s-ibm-public.md index ee6e7b9..e1584a7 100644 --- a/docs/k8s-ibm-public.md +++ b/docs/k8s-ibm-public.md @@ -104,12 +104,22 @@ whisk: 'X-Request-ID' $request_id; } +# not required on IKS 1.10; required on IKS 1.11 and newer +invoker: + containerFactory: +impl: kubernetes + k8s: persistence: hasDefaultStorageClass: false explicitStorageClass: default ``` +Starting with IKS 1.11, the underlying container runtime is now +containerd instead of docker. As a result, you cannot use the +DockerContainerFactory on IKS and must use the +KubernetesContainerFactory. + IKS does not provide a properly configured DefaultStorageClass, instead you need to tell the Helm chart to use the `default` StorageClassName as shown above. This StorageClass does have
[incubator-openwhisk-deploy-kube] branch master updated: Document that you must use KubernetesContainerFactory on IKS 1.11+ (#429)
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 a1ce67f Document that you must use KubernetesContainerFactory on IKS 1.11+ (#429) a1ce67f is described below commit a1ce67f82d4378959db712a335bb5faca5d6723f Author: David Grove AuthorDate: Sat Feb 23 06:15:52 2019 -0500 Document that you must use KubernetesContainerFactory on IKS 1.11+ (#429) --- docs/k8s-ibm-public.md | 10 ++ 1 file changed, 10 insertions(+) diff --git a/docs/k8s-ibm-public.md b/docs/k8s-ibm-public.md index ee6e7b9..e1584a7 100644 --- a/docs/k8s-ibm-public.md +++ b/docs/k8s-ibm-public.md @@ -104,12 +104,22 @@ whisk: 'X-Request-ID' $request_id; } +# not required on IKS 1.10; required on IKS 1.11 and newer +invoker: + containerFactory: +impl: kubernetes + k8s: persistence: hasDefaultStorageClass: false explicitStorageClass: default ``` +Starting with IKS 1.11, the underlying container runtime is now +containerd instead of docker. As a result, you cannot use the +DockerContainerFactory on IKS and must use the +KubernetesContainerFactory. + IKS does not provide a properly configured DefaultStorageClass, instead you need to tell the Helm chart to use the `default` StorageClassName as shown above. This StorageClass does have
[incubator-openwhisk-deploy-kube] branch master updated: periodic update of docker/git tags (#427)
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 115debb periodic update of docker/git tags (#427)
115debb is described below
commit 115debb691ad228dccc9c0a9e6c32736f3319268
Author: David Grove
AuthorDate: Wed Feb 20 15:30:47 2019 -0500
periodic update of docker/git tags (#427)
---
helm/openwhisk/Chart.yaml| 2 +-
helm/openwhisk/runtimes.json | 14 +++---
helm/openwhisk/values.yaml | 26 +-
3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/helm/openwhisk/Chart.yaml b/helm/openwhisk/Chart.yaml
index 21f0f07..025f76f 100644
--- a/helm/openwhisk/Chart.yaml
+++ b/helm/openwhisk/Chart.yaml
@@ -4,7 +4,7 @@
apiVersion: v1
description: An open source, distributed serverless platform that executes
functions in response to events at any scale
name: openwhisk
-version: 0.1.3
+version: 0.1.4
icon:
https://raw.githubusercontent.com/apache/incubator-openwhisk/682eb5b62ee6ba8017ab54226c2ace3637f4f1ec/docs/images/whisk_icon_full-color_with_tm_64x64-300dpi.png
keywords:
- Apache OpenWhisk
diff --git a/helm/openwhisk/runtimes.json b/helm/openwhisk/runtimes.json
index 07393c1..2601beb 100644
--- a/helm/openwhisk/runtimes.json
+++ b/helm/openwhisk/runtimes.json
@@ -7,7 +7,7 @@
"image": {
"prefix": "openwhisk",
"name": "nodejs6action",
-"tag": "2c5c075"
+"tag": "b99d71e"
},
"deprecated": false,
"attached": {
@@ -27,7 +27,7 @@
"image": {
"prefix": "openwhisk",
"name": "action-nodejs-v8",
-"tag": "2c5c075"
+"tag": "b99d71e"
},
"deprecated": false,
"attached": {
@@ -41,7 +41,7 @@
"image": {
"prefix": "openwhisk",
"name": "action-nodejs-v10",
-"tag": "2c5c075"
+"tag": "b99d71e"
},
"deprecated": false,
"attached": {
@@ -87,7 +87,7 @@
"image": {
"prefix": "openwhisk",
"name": "action-swift-v4.2",
-"tag": "5aacba1"
+"tag": "5bb0409"
},
"deprecated": false,
"attached": {
@@ -121,7 +121,7 @@
"image": {
"prefix": "openwhisk",
"name": "action-php-v7.3",
-"tag": "a68bb79"
+"tag": "7375a15"
},
"attached": {
"attachmentName": "codefile",
@@ -157,7 +157,7 @@
"image": {
"prefix": "openwhisk",
"name": "actionloop-golang-v1.11",
-"tag": "dbc0e34"
+"tag": "d787163"
}
}
],
@@ -185,7 +185,7 @@
"image": {
"prefix": "openwhisk",
"name": "action-ballerina-v0.990.2",
-"tag": "latest"
+"tag": "0f7df9c"
},
"deprecated": false,
"attached": {
diff --git a/helm/openwhisk/values.yaml b/helm/openwhisk/values.yaml
index 0baa2f1..9392747 100644
--- a/helm/openwhisk/values.yaml
+++ b/helm/openwhisk/values.yaml
@@ -111,19 +111,19 @@ whisk:
includeSystemTests: false
versions:
openwhisk:
- buildDate: "2019-01-18-18:58:16Z"
- buildNo: "20190118a"
- gitTag: "00fad9520342a83ea6adf83c511e5bf25f47109a"
+ buildDate: "2019-02-20-21:05:39Z"
+ buildNo: "20190220a"
+ gitTag: "38e4b05a20bdc6d76e1cf78c6e0203d47078a2b7"
openwhiskCli:
- tag: "b9b3ae9"
+ tag: "42cb87f"
[incubator-openwhisk-cli] annotated tag latest updated (42cb87f -> 8a4016f)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was modified! *** from 42cb87f (commit) to 8a4016f (tag) tagging 42cb87f526ea15360030b4814570fd6982d25dce (commit) replaces 0.9.0-incubating by Travis CI on Tue Feb 19 10:06:21 2019 -0500 - Log - Generated tag from Travis CI build 1628 --- No new revisions were added by this update. Summary of changes:
[incubator-openwhisk-cli] annotated tag latest deleted (was 3a5e7d4)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was 3a5e7d4 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.
[incubator-openwhisk-devtools] branch master updated: Update runtimes. (#201)
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-devtools.git
The following commit(s) were added to refs/heads/master by this push:
new 2079e03 Update runtimes. (#201)
2079e03 is described below
commit 2079e0395c7f386d1bbcd20c72bab2fc851f35fa
Author: rodric rabbah
AuthorDate: Mon Feb 18 20:47:06 2019 -0500
Update runtimes. (#201)
---
docker-compose/Makefile| 4 +---
docker-compose/docker-whisk-controller.env | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index 7d60234..2046593 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -122,16 +122,14 @@ docker-pull-full:
docker pull $(DOCKER_IMAGE_PREFIX)/action-nodejs-v10
docker pull $(DOCKER_IMAGE_PREFIX)/python2action
docker pull $(DOCKER_IMAGE_PREFIX)/python3action
- docker pull $(DOCKER_IMAGE_PREFIX)/action-swift-v3.1.1
- docker pull $(DOCKER_IMAGE_PREFIX)/action-swift-v4.1
docker pull $(DOCKER_IMAGE_PREFIX)/action-swift-v4.2
docker pull $(DOCKER_IMAGE_PREFIX)/java8action
- docker pull $(DOCKER_IMAGE_PREFIX)/action-php-v7.2
docker pull $(DOCKER_IMAGE_PREFIX)/action-php-v7.3
docker pull $(DOCKER_IMAGE_PREFIX)/action-ruby-v2.5
docker pull $(DOCKER_IMAGE_PREFIX)/actionloop-golang-v1.11
docker pull $(DOCKER_IMAGE_PREFIX)/dockerskeleton
docker pull $(DOCKER_IMAGE_PREFIX)/action-dotnet-v2.2
+ docker pull $(DOCKER_IMAGE_PREFIX)/action-ballerina-v0.990.2
download-cli:
echo "downloading the CLI tool ... "
diff --git a/docker-compose/docker-whisk-controller.env
b/docker-compose/docker-whisk-controller.env
index 60704ed..612ceb1 100644
--- a/docker-compose/docker-whisk-controller.env
+++ b/docker-compose/docker-whisk-controller.env
@@ -63,4 +63,4 @@ AKKA_CLUSTER_SEED_NODES=[]
AKKA_CLUSTER_BIND_PORT=5221
WHISK_SYSTEM_KEY=whisk.system
-RUNTIMES_MANIFEST={"runtimes":{"nodejs":[{"kind":"nodejs:6","default":true,"image":{"prefix":"openwhisk","name":"nodejs6action","tag":"latest"},"deprecated":false,"stemCells":[{"count":2,"memory":"256
MB"}]},{"kind":"nodejs:8","default":false,"image":{"prefix":"openwhisk","name":"action-nodejs-v8","tag":"latest"},"deprecated":false},{"kind":"nodejs:10","default":false,"image":{"prefix":"openwhisk","name":"action-nodejs-v10","tag":"latest"},"deprecated":false}],"python":[{"kind":"python",
[...]
+RUNTIMES_MANIFEST={"runtimes":{"nodejs":[{"kind":"nodejs:6","default":true,"image":{"prefix":"openwhisk","name":"nodejs6action","tag":"latest"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"},"stemCells":[{"count":2,"memory":"256
MB"}]},{"kind":"nodejs:8","default":false,"image":{"prefix":"openwhisk","name":"action-nodejs-v8","tag":"latest"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}},{"kind":"nodejs
[...]
[incubator-openwhisk-wskdeploy] branch master updated: raise memorySize limit to 2048MB (#1034)
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-wskdeploy.git
The following commit(s) were added to refs/heads/master by this push:
new fd77eda raise memorySize limit to 2048MB (#1034)
fd77eda is described below
commit fd77edab981724bf6ac27951e670a5ad42fc8c6a
Author: TPei <4004343+t...@users.noreply.github.com>
AuthorDate: Mon Feb 18 13:07:58 2019 +0100
raise memorySize limit to 2048MB (#1034)
---
utils/validation.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/validation.go b/utils/validation.go
index b59c5d2..59501c8 100644
--- a/utils/validation.go
+++ b/utils/validation.go
@@ -153,7 +153,7 @@ func LimitsMemoryValidation(memory *int) bool {
if memory == nil {
return true
}
- if *memory < 128 || *memory > 512 {
+ if *memory < 128 || *memory > 2048 {
wskprint.PrintlnOpenWhiskWarning(wski18n.T(wski18n.ID_WARN_LIMITS_MEMORY_SIZE))
return false
}
[incubator-openwhisk-wskdeploy] branch master updated: update runtimes used in tests (#1036)
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-wskdeploy.git The following commit(s) were added to refs/heads/master by this push: new a4d6818 update runtimes used in tests (#1036) a4d6818 is described below commit a4d6818ca17f22d641a97a8ef7d7a5a727d663c0 Author: TPei <4004343+t...@users.noreply.github.com> AuthorDate: Mon Feb 18 10:35:22 2019 +0100 update runtimes used in tests (#1036) * update runtimes used in tests * more runtime updates in tests --- tests/src/integration/helloworld/manifest.yaml | 4 ++-- tests/src/integration/runtimetests/manifest.yaml | 24 ++-- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/tests/src/integration/helloworld/manifest.yaml b/tests/src/integration/helloworld/manifest.yaml index 419edc4..95aa8a2 100644 --- a/tests/src/integration/helloworld/manifest.yaml +++ b/tests/src/integration/helloworld/manifest.yaml @@ -109,7 +109,7 @@ packages: # helloworld action in swift helloSwift: function: actions/hello.swift - runtime: swift:3.1.1 + runtime: swift:4.2 inputs: name: type: string @@ -130,7 +130,7 @@ packages: print (msg) return msg } - runtime: swift:3.1.1 + runtime: swift:4.2 inputs: name: type: string diff --git a/tests/src/integration/runtimetests/manifest.yaml b/tests/src/integration/runtimetests/manifest.yaml index 6d42255..d8cbf02 100644 --- a/tests/src/integration/runtimetests/manifest.yaml +++ b/tests/src/integration/runtimetests/manifest.yaml @@ -106,26 +106,6 @@ packages: place: string outputs: payload: string -greetingswift311-with-explicit-runtime: -web-export: true -version: 1.0 -function: src/hello.swift -runtime: swift:3.1.1 -inputs: -name: string -place: string -outputs: -payload: string -greetingswift41-with-explicit-runtime: -web-export: true -version: 1.0 -function: src/hello.swift -runtime: swift:4.1 -inputs: -name: string -place: string -outputs: -payload: string greetingswift42-with-explicit-runtime: web-export: true version: 1.0 @@ -307,7 +287,7 @@ packages: helloworldjava-with-swift-explicit-runtime: function: src/hello.jar main: Hello -runtime: swift:3.1.1 +runtime: swift:4.2 helloworldjava-with-random-explicit-runtime: function: src/hello.jar main: Hello @@ -315,4 +295,4 @@ packages: helloworlddotnet22-with-swift-explicit-runtime: function: src/helloDotNet.zip main: Apache.OpenWhisk.Example.Dotnet::Apache.OpenWhisk.Example.Dotnet.Hello::Main -runtime: swift:3.1.1 +runtime: swift:4.2
[incubator-openwhisk-cli] annotated tag latest updated (77c556d -> 3a5e7d4)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was modified! *** from 77c556d (commit) to 3a5e7d4 (tag) tagging 77c556d584cc66630cbcf6a71c6fa55af5cdb760 (commit) replaces 0.9.0-incubating by Travis CI on Thu Feb 14 11:21:01 2019 -0500 - Log - Generated tag from Travis CI build 1621 --- No new revisions were added by this update. Summary of changes:
[incubator-openwhisk-cli] annotated tag latest deleted (was 2fabd31)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was 2fabd31 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.
[incubator-openwhisk-runtime-nodejs] branch master updated: Remove load of unused filesystem module (#110)
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-runtime-nodejs.git
The following commit(s) were added to refs/heads/master by this push:
new b99d71e Remove load of unused filesystem module (#110)
b99d71e is described below
commit b99d71ecf65f2a981da638c71f284f7b0dc7bdd5
Author: Matt Rutkowski
AuthorDate: Wed Feb 13 21:59:36 2019 -0600
Remove load of unused filesystem module (#110)
---
core/nodejsActionBase/src/service.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/core/nodejsActionBase/src/service.js
b/core/nodejsActionBase/src/service.js
index eb99b6e..26dca1b 100644
--- a/core/nodejsActionBase/src/service.js
+++ b/core/nodejsActionBase/src/service.js
@@ -16,7 +16,6 @@
*/
var NodeActionRunner = require('../runner');
-var fs = require('fs');
function NodeActionService(config) {
var Status = {
[incubator-openwhisk-cli] annotated tag latest deleted (was 0925b3f)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was 0925b3f 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.
[incubator-openwhisk] branch master updated: Mount an optional html directory for serving static content. (#4259)
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 15ae5c4 Mount an optional html directory for serving static content.
(#4259)
15ae5c4 is described below
commit 15ae5c4ae5dc9f84b1e9f5cfc05ffe6df94b53ca
Author: rodric rabbah
AuthorDate: Mon Feb 11 13:03:41 2019 -0500
Mount an optional html directory for serving static content. (#4259)
---
ansible/group_vars/all | 1 +
ansible/roles/nginx/tasks/deploy.yml| 28 +---
ansible/roles/nginx/templates/nginx.conf.j2 | 24
3 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/ansible/group_vars/all b/ansible/group_vars/all
index b925259..077945e 100755
--- a/ansible/group_vars/all
+++ b/ansible/group_vars/all
@@ -203,6 +203,7 @@ userLogs:
nginx:
confdir: "{{ config_root_dir }}/nginx"
+ htmldir: "{{ ui_path | default(false) }}"
dir:
become: "{{ nginx_dir_become | default(false) }}"
version: "{{ nginx_version | default('1.13') }}"
diff --git a/ansible/roles/nginx/tasks/deploy.yml
b/ansible/roles/nginx/tasks/deploy.yml
index 418d228..545f812 100644
--- a/ansible/roles/nginx/tasks/deploy.yml
+++ b/ansible/roles/nginx/tasks/deploy.yml
@@ -52,6 +52,28 @@
retries: "{{ docker.pull.retries }}"
delay: "{{ docker.pull.delay }}"
+- name: ensure html directory exists
+ stat:
+path: "{{ nginx.htmldir }}"
+ register: nginx_html_dir_exists
+ when: nginx.htmldir
+
+- name: check if html directory exists
+ fail:
+msg: html directory does not exist '{{ nginx.htmldir }}'
+ when: nginx.htmldir and not (nginx_html_dir_exists.stat.exists and
nginx_html_dir_exists.stat.isdir)
+
+- name: configuration volumes to mount
+ set_fact:
+volumes:
+ - "{{ whisk_logs_dir }}/nginx:/logs"
+ - "{{ nginx.confdir }}:/etc/nginx"
+
+- name: "optional html volume to mount"
+ set_fact:
+volumes: "{{ volumes }} + [ '{{ nginx.htmldir }}:/usr/share/nginx/html' ]"
+ when: nginx.htmldir
+
- name: (re)start nginx
docker_container:
name: nginx
@@ -60,9 +82,9 @@
recreate: true
restart_policy: "{{ docker.restart.policy }}"
hostname: "nginx"
-volumes:
- - "{{ whisk_logs_dir }}/nginx:/logs"
- - "{{ nginx.confdir }}:/etc/nginx"
+volumes: "{{ volumes }}"
+expose:
+ - 8443
ports:
- "{{ nginx.port.http }}:80"
- "{{ nginx.port.api }}:443"
diff --git a/ansible/roles/nginx/templates/nginx.conf.j2
b/ansible/roles/nginx/templates/nginx.conf.j2
index d351f84..cefea41 100644
--- a/ansible/roles/nginx/templates/nginx.conf.j2
+++ b/ansible/roles/nginx/templates/nginx.conf.j2
@@ -33,6 +33,24 @@ http {
proxy_ssl_certificate_key /etc/nginx/{{ controller.ssl.key }};
{% endif %}
+gzip_static on;
+types {
+text/htmlhtml htm shtml;
+text/css css;
+text/xml xml;
+image/gifgif;
+image/jpeg jpeg jpg;
+image/pngpng;
+image/svg+xmlsvg svgz;
+image/x-icon ico;
+image/x-jng jng;
+image/x-ms-bmp bmp;
+application/javascript js;
+application/json json;
+application/java-archive jar war ear;
+application/pdf pdf;
+}
+
upstream controllers {
# fail_timeout: period of time the server will be considered
unavailable
# Mark the controller as unavailable for at least 60 seconds, to not
get any requests during restart.
@@ -129,5 +147,11 @@ http {
location /cli/go/download {
rewrite /cli/go/download(.*) /cli$1 permanent;
}
+
+{% if nginx.htmldir %}
+location /ui {
+alias /usr/share/nginx/html;
+}
+{% endif %}
}
}
[incubator-openwhisk] branch master updated: Update docs to remove bluemix refs. (#4256)
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 29ed589 Update docs to remove bluemix refs. (#4256)
29ed589 is described below
commit 29ed58979dc5553aae8e830bc78d58610e888c7b
Author: rodric rabbah
AuthorDate: Thu Feb 7 20:43:00 2019 -0500
Update docs to remove bluemix refs. (#4256)
Replace {APIHOST} with $APIHOST throughout.
---
docs/rest_api.md | 74 +---
1 file changed, 38 insertions(+), 36 deletions(-)
diff --git a/docs/rest_api.md b/docs/rest_api.md
index 88d9790..2591162 100644
--- a/docs/rest_api.md
+++ b/docs/rest_api.md
@@ -27,26 +27,26 @@ For more details about the APIs for actions, activations,
packages, rules, and t
All the capabilities in the system are available through a REST API. There are
collection and entity endpoints for actions, triggers, rules, packages,
activations, and namespaces.
These are the collection endpoints:
-- `https://{APIHOST}/api/v1/namespaces`
-- `https://{APIHOST}/api/v1/namespaces/{namespace}/actions`
-- `https://{APIHOST}/api/v1/namespaces/{namespace}/triggers`
-- `https://{APIHOST}/api/v1/namespaces/{namespace}/rules`
-- `https://{APIHOST}/api/v1/namespaces/{namespace}/packages`
-- `https://{APIHOST}/api/v1/namespaces/{namespace}/activations`
-
-The `{APIHOST}` is the OpenWhisk API hostname (for example,
openwhisk.ng.bluemix.net, 172.17.0.1, and so on).
+- `https://$APIHOST/api/v1/namespaces`
+- `https://$APIHOST/api/v1/namespaces/{namespace}/actions`
+- `https://$APIHOST/api/v1/namespaces/{namespace}/triggers`
+- `https://$APIHOST/api/v1/namespaces/{namespace}/rules`
+- `https://$APIHOST/api/v1/namespaces/{namespace}/packages`
+- `https://$APIHOST/api/v1/namespaces/{namespace}/activations`
+
+The `$APIHOST` is the OpenWhisk API hostname (for example, localhost,
172.17.0.1, and so on).
For the `{namespace}`, the character `_` can be used to specify the user's
*default
namespace*.
You can perform a GET request on the collection endpoints to fetch a list of
entities in the collection.
There are entity endpoints for each type of entity:
-- `https://{APIHOST}/api/v1/namespaces/{namespace}`
--
`https://{APIHOST}/api/v1/namespaces/{namespace}/actions/[{packageName}/]{actionName}`
-- `https://{APIHOST}/api/v1/namespaces/{namespace}/triggers/{triggerName}`
-- `https://{APIHOST}/api/v1/namespaces/{namespace}/rules/{ruleName}`
-- `https://{APIHOST}/api/v1/namespaces/{namespace}/packages/{packageName}`
--
`https://{APIHOST}/api/v1/namespaces/{namespace}/activations/{activationName}`
+- `https://$APIHOST/api/v1/namespaces/{namespace}`
+-
`https://$APIHOST/api/v1/namespaces/{namespace}/actions/[{packageName}/]{actionName}`
+- `https://$APIHOST/api/v1/namespaces/{namespace}/triggers/{triggerName}`
+- `https://$APIHOST/api/v1/namespaces/{namespace}/rules/{ruleName}`
+- `https://$APIHOST/api/v1/namespaces/{namespace}/packages/{packageName}`
+- `https://$APIHOST/api/v1/namespaces/{namespace}/activations/{activationName}`
The namespace and activation endpoints support only GET requests. The actions,
triggers, rules, and packages endpoints support GET, PUT, and DELETE requests.
The endpoints of actions, triggers, and rules also support POST requests, which
are used to invoke actions and triggers and enable or disable rules.
@@ -59,7 +59,7 @@ You can also retrieve these credentials using the CLI running
`wsk property get
The following is an example that uses the [cURL](https://curl.haxx.se) command
tool to get the list of all packages in the `whisk.system` namespace:
```bash
-curl -u USERNAME:PASSWORD
https://openwhisk.ng.bluemix.net/api/v1/namespaces/whisk.system/packages
+curl -u USERNAME:PASSWORD
https://$APIHOST/api/v1/namespaces/whisk.system/packages
```
```json
@@ -80,7 +80,7 @@ curl -u USERNAME:PASSWORD
https://openwhisk.ng.bluemix.net/api/v1/namespaces/whi
]
```
-In this example the authentication was passed using the `-u` flag, you can
pass this value also as part of the URL as `https://$AUTH@{APIHOST}`
+In this example the authentication was passed using the `-u` flag, you can
pass this value also as part of the URL as `https://USERNAME:PASSWORD@$APIHOST`.
The OpenWhisk API supports request-response calls from web clients. OpenWhisk
responds to `OPTIONS` requests with Cross-Origin Resource Sharing headers.
Currently, all origins are allowed (that is, Access-Control-Allow-Origin is
"`*`"), the standard set of methods are allowed (that is,
Access-Control-Allow-Methods is "`GET, DELETE, POST, PUT, HEAD`"), and
Access-Control-Allow-Headers yields "`Authorization, Origin, X-Requested-With,
Content-Type, Accept, User-Agent`".
@@ -91,7 +91,7 @@ The OpenWhisk API supports request-response calls f
[incubator-openwhisk] branch master updated: Revert "Mount an optional html directory for serving static content. (#4252)" (#4257)
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 b2dd4a2 Revert "Mount an optional html directory for serving static
content. (#4252)" (#4257)
b2dd4a2 is described below
commit b2dd4a2ed28e2b1313dff53949b959cc9cbcb19d
Author: Carlos Santana
AuthorDate: Thu Feb 7 20:30:34 2019 -0500
Revert "Mount an optional html directory for serving static content.
(#4252)" (#4257)
This reverts commit fb40eb621f24fa0165654a9b039aa41a7928f609.
---
ansible/group_vars/all | 1 -
ansible/roles/cli-install/tasks/deploy.yml | 2 +-
ansible/roles/nginx/tasks/deploy.yml | 26 +++---
ansible/roles/nginx/templates/nginx.conf.j2| 16 +
.../test/scala/system/rest/GoCLINginxTests.scala | 2 +-
5 files changed, 11 insertions(+), 36 deletions(-)
diff --git a/ansible/group_vars/all b/ansible/group_vars/all
index 27c8408..a806200 100755
--- a/ansible/group_vars/all
+++ b/ansible/group_vars/all
@@ -205,7 +205,6 @@ userLogs:
nginx:
confdir: "{{ config_root_dir }}/nginx"
- htmldir: "{{ ui_path | default(false) }}"
dir:
become: "{{ nginx_dir_become | default(false) }}"
version: "{{ nginx_version | default('1.13') }}"
diff --git a/ansible/roles/cli-install/tasks/deploy.yml
b/ansible/roles/cli-install/tasks/deploy.yml
index b25e7e2..0d6589e 100644
--- a/ansible/roles/cli-install/tasks/deploy.yml
+++ b/ansible/roles/cli-install/tasks/deploy.yml
@@ -5,7 +5,7 @@
- name: grab the local CLI from the binaries unarchived into nginx
get_url:
-url: "https://{{host}}/cli/{{os}}/{{arch}}/{{wsk}};
+url: "https://{{host}}/cli/go/download/{{os}}/{{arch}}/{{wsk}};
dest: "{{ openwhisk_home }}/bin"
mode: "0755"
validate_certs: no
diff --git a/ansible/roles/nginx/tasks/deploy.yml
b/ansible/roles/nginx/tasks/deploy.yml
index 53ee828..705d462 100644
--- a/ansible/roles/nginx/tasks/deploy.yml
+++ b/ansible/roles/nginx/tasks/deploy.yml
@@ -52,28 +52,6 @@
retries: "{{ docker.pull.retries }}"
delay: "{{ docker.pull.delay }}"
-- name: ensure html directory exists
- stat:
-path: "{{ nginx.htmldir }}"
- register: nginx_html_dir_exists
- when: nginx.htmldir
-
-- name: check if html directory exists
- fail:
-msg: html directory does not exist '{{ nginx.htmldir }}'
- when: nginx.htmldir and not (nginx_html_dir_exists.stat.exists and
nginx_html_dir_exists.stat.isdir)
-
-- name: configuration volumes to mount
- set_fact:
-volumes:
- - "{{ whisk_logs_dir }}/nginx:/logs"
- - "{{ nginx.confdir }}:/etc/nginx"
-
-- name: "optional html volume to mount"
- set_fact:
-volumes: "{{ volumes }} + [ '{{ nginx.htmldir }}:/usr/share/nginx/html' ]"
- when: nginx.htmldir
-
- name: (re)start nginx
docker_container:
name: nginx
@@ -82,7 +60,9 @@
recreate: true
restart_policy: "{{ docker.restart.policy }}"
hostname: "nginx"
-volumes: "{{ volumes }}"
+volumes:
+ - "{{ whisk_logs_dir }}/nginx:/logs"
+ - "{{ nginx.confdir }}:/etc/nginx"
expose:
- 8443
ports:
diff --git a/ansible/roles/nginx/templates/nginx.conf.j2
b/ansible/roles/nginx/templates/nginx.conf.j2
index e6f3b2e..a86593f 100644
--- a/ansible/roles/nginx/templates/nginx.conf.j2
+++ b/ansible/roles/nginx/templates/nginx.conf.j2
@@ -33,8 +33,6 @@ http {
proxy_ssl_certificate_key /etc/nginx/{{ controller.ssl.key }};
{% endif %}
-gzip_static on;
-
upstream controllers {
# fail_timeout: period of time the server will be considered
unavailable
# Mark the controller as unavailable for at least 60 seconds, to not
get any requests during restart.
@@ -117,20 +115,18 @@ http {
location /blackbox.tar.gz {
return 301
https://github.com/apache/incubator-openwhisk-runtime-docker/releases/download/sdk%400.1.0/blackbox-0.1.0.tar.gz;
}
+# leaving this for a while for clients out there to update to the new
endpoint
+location /blackbox-0.1.0.tar.gz {
+return 301 /blackbox.tar.gz;
+}
location /OpenWhiskIOSStarterApp.zip {
return 301
https://github.com/apache/incubator-openwhisk-client-swift/releases/download/0.3.0/starterapp-0.3.0.zip;
}
-location /cli {
+location /cli/go/download {
autoindex on;
-alias /etc/nginx/cli/go/download;
+root /etc/nginx;
}
-
-{% if nginx.htmldir %}
-location /ui {
-alias /usr/share/nginx/html;
-}
-{% end
[incubator-openwhisk-runtime-nodejs] branch master updated: Add graphicsmagick to the base images. (#109)
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-runtime-nodejs.git The following commit(s) were added to refs/heads/master by this push: new 1745626 Add graphicsmagick to the base images. (#109) 1745626 is described below commit 17456261ec7b24c6d2ddc2c8c841562a37bb59fb Author: rodric rabbah AuthorDate: Thu Feb 7 20:17:10 2019 -0500 Add graphicsmagick to the base images. (#109) --- core/nodejs10Action/Dockerfile | 1 + core/nodejs8Action/Dockerfile| 1 + core/nodejsActionBase/Dockerfile | 6 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/nodejs10Action/Dockerfile b/core/nodejs10Action/Dockerfile index 64e6ef5..56575d5 100644 --- a/core/nodejs10Action/Dockerfile +++ b/core/nodejs10Action/Dockerfile @@ -18,6 +18,7 @@ FROM node:10.15.0-stretch RUN apt-get update && apt-get install -y \ imagemagick \ +graphicsmagick \ unzip \ && rm -rf /var/lib/apt/lists/* WORKDIR /nodejsAction diff --git a/core/nodejs8Action/Dockerfile b/core/nodejs8Action/Dockerfile index 08ffc1c..25123f8 100644 --- a/core/nodejs8Action/Dockerfile +++ b/core/nodejs8Action/Dockerfile @@ -18,6 +18,7 @@ FROM node:8.15.0 RUN apt-get update && apt-get install -y \ imagemagick \ +graphicsmagick \ unzip \ && rm -rf /var/lib/apt/lists/* WORKDIR /nodejsAction diff --git a/core/nodejsActionBase/Dockerfile b/core/nodejsActionBase/Dockerfile index 2c8c04d..117c168 100644 --- a/core/nodejsActionBase/Dockerfile +++ b/core/nodejsActionBase/Dockerfile @@ -20,7 +20,11 @@ FROM buildpack-deps:trusty-curl ENV DEBIAN_FRONTEND noninteractive # Initial update and some basics. -RUN apt-get update && apt-get install -y imagemagick && apt-get install -y unzip +RUN apt-get update && apt-get install -y \ +imagemagick \ +graphicsmagick \ +unzip \ +&& rm -rf /var/lib/apt/lists/* ADD . /nodejsAction # COPY the package.json to root container, so we can install npm packages a level up from user's packages, so user's packages take precedence
[incubator-openwhisk] branch master updated: Mount an optional html directory for serving static content. (#4252)
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 fb40eb6 Mount an optional html directory for serving static content.
(#4252)
fb40eb6 is described below
commit fb40eb621f24fa0165654a9b039aa41a7928f609
Author: rodric rabbah
AuthorDate: Wed Feb 6 21:57:52 2019 -0500
Mount an optional html directory for serving static content. (#4252)
---
ansible/group_vars/all | 1 +
ansible/roles/cli-install/tasks/deploy.yml | 2 +-
ansible/roles/nginx/tasks/deploy.yml | 26 +++---
ansible/roles/nginx/templates/nginx.conf.j2| 16 -
.../test/scala/system/rest/GoCLINginxTests.scala | 2 +-
5 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/ansible/group_vars/all b/ansible/group_vars/all
index a806200..27c8408 100755
--- a/ansible/group_vars/all
+++ b/ansible/group_vars/all
@@ -205,6 +205,7 @@ userLogs:
nginx:
confdir: "{{ config_root_dir }}/nginx"
+ htmldir: "{{ ui_path | default(false) }}"
dir:
become: "{{ nginx_dir_become | default(false) }}"
version: "{{ nginx_version | default('1.13') }}"
diff --git a/ansible/roles/cli-install/tasks/deploy.yml
b/ansible/roles/cli-install/tasks/deploy.yml
index 0d6589e..b25e7e2 100644
--- a/ansible/roles/cli-install/tasks/deploy.yml
+++ b/ansible/roles/cli-install/tasks/deploy.yml
@@ -5,7 +5,7 @@
- name: grab the local CLI from the binaries unarchived into nginx
get_url:
-url: "https://{{host}}/cli/go/download/{{os}}/{{arch}}/{{wsk}};
+url: "https://{{host}}/cli/{{os}}/{{arch}}/{{wsk}};
dest: "{{ openwhisk_home }}/bin"
mode: "0755"
validate_certs: no
diff --git a/ansible/roles/nginx/tasks/deploy.yml
b/ansible/roles/nginx/tasks/deploy.yml
index 705d462..53ee828 100644
--- a/ansible/roles/nginx/tasks/deploy.yml
+++ b/ansible/roles/nginx/tasks/deploy.yml
@@ -52,6 +52,28 @@
retries: "{{ docker.pull.retries }}"
delay: "{{ docker.pull.delay }}"
+- name: ensure html directory exists
+ stat:
+path: "{{ nginx.htmldir }}"
+ register: nginx_html_dir_exists
+ when: nginx.htmldir
+
+- name: check if html directory exists
+ fail:
+msg: html directory does not exist '{{ nginx.htmldir }}'
+ when: nginx.htmldir and not (nginx_html_dir_exists.stat.exists and
nginx_html_dir_exists.stat.isdir)
+
+- name: configuration volumes to mount
+ set_fact:
+volumes:
+ - "{{ whisk_logs_dir }}/nginx:/logs"
+ - "{{ nginx.confdir }}:/etc/nginx"
+
+- name: "optional html volume to mount"
+ set_fact:
+volumes: "{{ volumes }} + [ '{{ nginx.htmldir }}:/usr/share/nginx/html' ]"
+ when: nginx.htmldir
+
- name: (re)start nginx
docker_container:
name: nginx
@@ -60,9 +82,7 @@
recreate: true
restart_policy: "{{ docker.restart.policy }}"
hostname: "nginx"
-volumes:
- - "{{ whisk_logs_dir }}/nginx:/logs"
- - "{{ nginx.confdir }}:/etc/nginx"
+volumes: "{{ volumes }}"
expose:
- 8443
ports:
diff --git a/ansible/roles/nginx/templates/nginx.conf.j2
b/ansible/roles/nginx/templates/nginx.conf.j2
index a86593f..e6f3b2e 100644
--- a/ansible/roles/nginx/templates/nginx.conf.j2
+++ b/ansible/roles/nginx/templates/nginx.conf.j2
@@ -33,6 +33,8 @@ http {
proxy_ssl_certificate_key /etc/nginx/{{ controller.ssl.key }};
{% endif %}
+gzip_static on;
+
upstream controllers {
# fail_timeout: period of time the server will be considered
unavailable
# Mark the controller as unavailable for at least 60 seconds, to not
get any requests during restart.
@@ -115,18 +117,20 @@ http {
location /blackbox.tar.gz {
return 301
https://github.com/apache/incubator-openwhisk-runtime-docker/releases/download/sdk%400.1.0/blackbox-0.1.0.tar.gz;
}
-# leaving this for a while for clients out there to update to the new
endpoint
-location /blackbox-0.1.0.tar.gz {
-return 301 /blackbox.tar.gz;
-}
location /OpenWhiskIOSStarterApp.zip {
return 301
https://github.com/apache/incubator-openwhisk-client-swift/releases/download/0.3.0/starterapp-0.3.0.zip;
}
-location /cli/go/download {
+location /cli {
autoindex on;
-root /etc/nginx;
+alias /etc/nginx/cli/go/download;
}
+
+{% if nginx.htmldir %}
+location /ui {
+alias /usr/share/nginx/html;
+}
+{% endif %}
}
}
diff --git a/tests/src/test/scala/system/rest/GoCLINginxTests.scala
b/tests/src/test/scala/system/rest/GoCLINgi
[incubator-openwhisk-runtime-ballerina] branch master updated: remove extra : in distDocker command (#13)
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-runtime-ballerina.git
The following commit(s) were added to refs/heads/master by this push:
new 0f7df9c remove extra : in distDocker command (#13)
0f7df9c is described below
commit 0f7df9caccc10078c80e7c1c1d4aef0324cf37be
Author: Carlos Santana
AuthorDate: Wed Feb 6 21:18:54 2019 -0500
remove extra : in distDocker command (#13)
---
tools/travis/publish.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/travis/publish.sh b/tools/travis/publish.sh
index 4a2420a..2832281 100755
--- a/tools/travis/publish.sh
+++ b/tools/travis/publish.sh
@@ -43,7 +43,7 @@ TERM=dumb ./gradlew \
if [ ${IMAGE_TAG} == "latest" ]; then
SHORT_COMMIT=`git rev-parse --short HEAD`
TERM=dumb ./gradlew \
-::ballerina:distDocker \
+:ballerina:distDocker \
-PdockerRegistry=docker.io \
-PdockerImagePrefix=${IMAGE_PREFIX} \
-PdockerImageTag=${SHORT_COMMIT}
[incubator-openwhisk-runtime-ballerina] branch master updated: Publish image hash tag (#12)
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-runtime-ballerina.git
The following commit(s) were added to refs/heads/master by this push:
new de4bfa4 Publish image hash tag (#12)
de4bfa4 is described below
commit de4bfa436cde3bb8bba1617228c03cb2a6b35ab7
Author: Carlos Santana
AuthorDate: Wed Feb 6 19:43:49 2019 -0500
Publish image hash tag (#12)
---
.gitignore | 5 +
tools/travis/publish.sh | 10 ++
2 files changed, 15 insertions(+)
diff --git a/.gitignore b/.gitignore
index fe312df..74d5fdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,8 @@ ballerina/proxy/build/
ballerina/proxy/out/
tests/build
tests/out/
+
+.classpath
+.settings
+.project
+bin/
diff --git a/tools/travis/publish.sh b/tools/travis/publish.sh
index 77a19fd..4a2420a 100755
--- a/tools/travis/publish.sh
+++ b/tools/travis/publish.sh
@@ -38,3 +38,13 @@ TERM=dumb ./gradlew \
-PdockerRegistry=docker.io \
-PdockerImagePrefix=${IMAGE_PREFIX} \
-PdockerImageTag=${IMAGE_TAG}
+
+# if doing latest also push a tag with the hash commit
+if [ ${IMAGE_TAG} == "latest" ]; then
+SHORT_COMMIT=`git rev-parse --short HEAD`
+TERM=dumb ./gradlew \
+::ballerina:distDocker \
+-PdockerRegistry=docker.io \
+-PdockerImagePrefix=${IMAGE_PREFIX} \
+-PdockerImageTag=${SHORT_COMMIT}
+fi
[incubator-openwhisk] branch master updated: Remove unsupported distributed playbooks. (#4245)
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 06892e6 Remove unsupported distributed playbooks. (#4245) 06892e6 is described below commit 06892e6f79300f86670cad1b5a5e2eb75b567f99 Author: rodric rabbah AuthorDate: Wed Feb 6 16:58:04 2019 -0500 Remove unsupported distributed playbooks. (#4245) --- ansible/README_DISTRIBUTED.md | 102 - ansible/boot_instances_dist.yml| 71 .../distributed/files/openstack/README_OS.md | 41 --- .../distributed/files/openstack/openstack.env | 20 ansible/environments/distributed/group_vars/all| 82 -- ansible/environments/distributed/hosts | 32 -- ansible/prereq_build.yml | 21 ansible/provision_env_dist.yml | 66 --- ansible/registry.yml | 22 ansible/roles/couchdb/tasks/deploy.yml | 12 -- ansible/roles/docker/tasks/clean.yml | 11 -- ansible/roles/docker/tasks/deploy.yml | 37 -- ansible/roles/docker/tasks/main.yml| 12 -- ansible/roles/docker/templates/docker.j2 | 13 --- ansible/roles/registry/tasks/clean.yml | 14 --- ansible/roles/registry/tasks/deploy.yml| 70 ansible/roles/registry/tasks/gencert.yml | 7 -- ansible/roles/registry/tasks/main.yml | 13 --- ansible/roles/registry/tasks/publish.yml | 28 - .../registry/templates/recycle-registry.py.j2 | 126 - ansible/roles/whiskhost/tasks/addUser.yml | 27 - ansible/roles/whiskhost/tasks/clean.yml| 7 -- ansible/roles/whiskhost/tasks/deploy.yml | 9 -- ansible/roles/whiskhost/tasks/main.yml | 12 -- ansible/roles/whiskhost/tasks/patchKernel.yml | 43 --- tools/ubuntu-setup/README.md | 6 +- 26 files changed, 3 insertions(+), 901 deletions(-) diff --git a/ansible/README_DISTRIBUTED.md b/ansible/README_DISTRIBUTED.md deleted file mode 100644 index 3b859ad..000 --- a/ansible/README_DISTRIBUTED.md +++ /dev/null @@ -1,102 +0,0 @@ - - -Deploying Distributed OpenWhisk using Ansible -= - -**Caveat:** All Ansible commands are meant to be executed from the `ansible` directory. -This is important because that's where `ansible.cfg` is located which contains generic settings that are needed for the remaining steps. - -By default, if you omit the `-i` parameter in Ansible commands, the `local` environment will be used. - -In all instructions, replace `` with the base directory of your OpenWhisk source tree. e.g., `openwhisk`. - - - Setup and provision OpenWhisk component VMs -A set of Ubuntu 14.04 machines will need to be provisioned in the targeted IaaS (Infrastructure as a Service platform). These VMs will need to provisioned manually in most IaaS providers, but we have added some scripts to automate VM/disk provisioning against Openstack CPIs. These scripts are not being actively maintained at the moment, but PRs to enhance the scripts and add support for other IaaS offerings (AWS, GCE, etc) are certainly encouraged. Once the VMs are up and reachable by th [...] - -If using Openstack, please follow the README at [environments/distributed/files/openstack/README_OS.md](environments/distributed/files/openstack/README_OS.md) to manage the required VMs. Otherwise, provision each VM manually. - -Login to your bootstrapper VM. Your local machine can act as the bootstrapping machine as well, as long as it can connect to the VMs deployed in your IaaS. - -Add the remote_user and private_key_file values to the defaults section of the `ansible.cfg` file. The remote_user value sets the default ssh user. The private_key_file is required when using a private key that is not in the default `~/.ssh` folder. - -``` -[defaults] -remote_user = ubuntu -private_key_file=/path/to/file.pem -``` - -Ensure that the Ansible VM can authenticate to the OpenWhisk VMs via SSH using the following command. - -``` -ansible all -i environments/distributed -m ping -``` - -Generate config files - -``` -ansible-playbook -i environments/distributed setup.yml -``` - -Install prerequisites on OpenWhisk nodes. - -``` -ansible-playbook -i environments/distributed prereq_build.yml -``` - - Build and deploy OpenWhisk - -Deploy registry. - -``` -ansible-playbook -i environments/distributed registry.yml -``` - -Build and distribute OpenWhisk docker images. Must be executed with root privileges. The IP for the registry VM can be found in the [hosts](environments/distributed/hosts) file. - -``` -cd .. -./gradlew distDocker
[incubator-openwhisk-wskdeploy] branch master updated: link api schema to specification overview page (#1030)
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-wskdeploy.git The following commit(s) were added to refs/heads/master by this push: new 9c72e1b link api schema to specification overview page (#1030) 9c72e1b is described below commit 9c72e1b0ece22745f3b4cb3b4b60f7f5f6f32302 Author: Mark Deuser AuthorDate: Tue Feb 5 23:59:22 2019 -0500 link api schema to specification overview page (#1030) * link api schema to specification overview page * fix typos --- specification/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/README.md b/specification/README.md index 74cbdfb..35c4b68 100644 --- a/specification/README.md +++ b/specification/README.md @@ -65,6 +65,7 @@ The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "S - [Rules](html/spec_rule.md#rules) - grammar, schema and examples for Rules. - [Sequences](html/spec_sequences.md#sequences) - schema to compose multiple Actions into a single, named Action sequence. - [Entity Naming & Namespacing](html/spec_entity_naming_and_namespacing.md#naming-and-namespacing) - describes what characters can be used to name Packages, Actions, Triggers and Rules and how to manage them with namespaces. +- [APIs](html/spec_apis.md#apis) - grammar, schema and examples for APIs. References - [Normative & Non-normative References](html/spec_normative_refs.md)
[incubator-openwhisk-website] branch master updated: Typo Fix (#359)
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-website.git The following commit(s) were added to refs/heads/master by this push: new aab509d Typo Fix (#359) aab509d is described below commit aab509d7bbb9c9539797a43ef49152e0ba45bee8 Author: Avinash Nuthalapati AuthorDate: Tue Feb 5 13:20:27 2019 +0100 Typo Fix (#359) --- _layouts/documentation.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/documentation.html b/_layouts/documentation.html index 3d41ad5..7bcd40d 100644 --- a/_layouts/documentation.html +++ b/_layouts/documentation.html @@ -384,7 +384,7 @@ layout: default Running OpenWhisk locally Developers can select to install and configure their own - instancefrom among any of the options listed here: + instance from among any of the options listed here: OpenWhisk Deployment Options. For local, "light weight" development, we recommend using
[incubator-openwhisk-wskdeploy] branch master updated: Add API entity schema (#1029)
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-wskdeploy.git The following commit(s) were added to refs/heads/master by this push: new 8766c9b Add API entity schema (#1029) 8766c9b is described below commit 8766c9b3f402acc0dac83824c4e12eb32ce0dda4 Author: Mark Deuser AuthorDate: Mon Feb 4 18:15:36 2019 -0500 Add API entity schema (#1029) * add api entity schema * comment updates --- specification/html/spec_apis.md | 123 1 file changed, 123 insertions(+) diff --git a/specification/html/spec_apis.md b/specification/html/spec_apis.md new file mode 100644 index 000..5f2e865 --- /dev/null +++ b/specification/html/spec_apis.md @@ -0,0 +1,123 @@ + + +## APIs + +The API entity schema is used to define an OpenWhisk API within a manifest. + +### Fields + + + + + Key Name + + + Required + + + Value Type + + + Default + + + Description + + + + method + yes + string + N/A + The HTTP method for the endpoint. All valid HTTP methods are supported, but a response type value of http may be required to correctly process the associated request. + + + response + no + string + http + The response type or content extension used when the API Gateway invokes the web action. See https://github.com/apache/incubator-openwhisk/blob/master/docs/webactions.md#content-extensions;>https://github.com/apache/incubator-openwhisk/blob/master/docs/webactions.md#content-extensions. + + + + +### Grammar + +```yaml +: +: +: +: +method: +response: +``` + +### Example + +```yaml +packages: + hello_world_package: +version: 1.0 +license: Apache-2.0 +actions: + hello_world: +function: src/hello.js +web-export: true +apis: + hello-world: +hello: + world: +hello_world: + method: GET + response: json + goodbye-world: +hello: + world: +hello_world: + method: DELETE + response: json +``` + +### Requirements + +- The API name MUST be less than or equal to 256 characters. +- The API `basePath` value MUST start with a `/` character. +- The APi `relativePath` value MUST start with a `/` character. +- The API entity schema includes all required fields declared above. +- Only web actions, actions having `web-export` set to `true`, can be used as an API endpoint's action. +- If needed, the action will be automatically converted to a web action during deployment. +- A valid API entity MUST have one or more valid endpoints defined. + + +### Notes + +- When an API endpoint is being added to an existing API, the `apiName` in the manifest is ignored. +- See https://github.com/apache/incubator-openwhisk/blob/master/docs/webactions.md;>https://github.com/apache/incubator-openwhisk/blob/master/docs/webactions.md for the complete set of supported `response` values, also known as content extensions. +- Using a `response` value of `http` will give you the most control over the API request and response handling. + + +--- + + +Index + +
[incubator-openwhisk-runtime-python] branch master updated: Remove python 2 publish. (#48)
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-runtime-python.git The following commit(s) were added to refs/heads/master by this push: new 7cdff17 Remove python 2 publish. (#48) 7cdff17 is described below commit 7cdff17f9d442e22609da614aee947f5fb7d1a7d Author: falkzoll AuthorDate: Thu Jan 31 15:19:30 2019 +0100 Remove python 2 publish. (#48) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 74beae5..79b2212 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ deploy: all_branches: true repo: apache/incubator-openwhisk-runtime-python - provider: script -script: "./tools/travis/publish.sh openwhisk 2 latest && ./tools/travis/publish.sh openwhisk 3 latest && ./tools/travis/publish.sh openwhisk 3-ai latest && ./tools/travis/publish.sh openwhisk 3-loop latest" +script: "./tools/travis/publish.sh openwhisk 3 latest && ./tools/travis/publish.sh openwhisk 3-ai latest && ./tools/travis/publish.sh openwhisk 3-loop latest" on: branch: master repo: apache/incubator-openwhisk-runtime-python
[incubator-openwhisk-wskdeploy] branch master updated: only print info messages when the verbose flag is enabled (#1027)
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-wskdeploy.git
The following commit(s) were added to refs/heads/master by this push:
new ff5c6a3 only print info messages when the verbose flag is enabled
(#1027)
ff5c6a3 is described below
commit ff5c6a399bb09dd6487fe7f87d2e00d31abc9d66
Author: Mark Deuser
AuthorDate: Thu Jan 31 09:13:26 2019 -0500
only print info messages when the verbose flag is enabled (#1027)
- also remove the openwhisk banner from the --preview
fixes #788
---
deployers/servicedeployer.go | 8 ++--
deployers/whiskclient.go | 8
parsers/manifest_parser.go | 2 +-
runtimes/runtimes.go | 4 ++--
wskprint/console.go | 6 ++
5 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/deployers/servicedeployer.go b/deployers/servicedeployer.go
index 2e266c0..c7b848c 100644
--- a/deployers/servicedeployer.go
+++ b/deployers/servicedeployer.go
@@ -1463,10 +1463,6 @@ func (deployer *ServiceDeployer) getQualifiedName(name
string) string {
func (deployer *ServiceDeployer) printDeploymentAssets(assets
*DeploymentProject) {
- // pretty ASCII OpenWhisk graphic
- // TODO() move to separate function and suppress using some flag
- wskprint.PrintlnOpenWhiskOutput(" ___
__ _ _ _\n/\\ \\/ _ \\ _ __ ___ _ __ | | | | |__
(_)___| | __\n /\\ /__\\ \\ | | | | '_ \\ / _ \\ '_ \\| | | | '_ \\| /
__| |/ /\n / \\ \\ / | |_| | |_) | __/ | | | |/\\| | | | | \\__ \\
<\n \\ \\ / \\/\\___/| .__/ \\___|_| |_|__/\\__|_| |_|_|___/_|\\_\\ \n
\\___\\/ |_|\n")
-
// TODO() review format
wskprint.PrintlnOpenWhiskOutput(strings.Title(parsers.YAML_KEY_PACKAGES) + ":")
for _, pack := range assets.Packages {
@@ -1623,7 +1619,7 @@ func displayPreprocessingInfo(entity string, name string,
onDeploy bool) {
map[string]interface{}{
wski18n.KEY_KEY: entity,
wski18n.KEY_NAME: name})
- wskprint.PrintlnOpenWhiskInfo(msg)
+ wskprint.PrintlnOpenWhiskVerbose(utils.Flags.Verbose, msg)
}
func displayPostprocessingInfo(entity string, name string, onDeploy bool) {
@@ -1638,7 +1634,7 @@ func displayPostprocessingInfo(entity string, name
string, onDeploy bool) {
map[string]interface{}{
wski18n.KEY_KEY: entity,
wski18n.KEY_NAME: name})
- wskprint.PrintlnOpenWhiskInfo(msg)
+ wskprint.PrintlnOpenWhiskVerbose(utils.Flags.Verbose, msg)
}
func createWhiskClientError(err *whisk.WskError, response *http.Response,
entity string, onCreate bool) *wskderrors.WhiskClientError {
diff --git a/deployers/whiskclient.go b/deployers/whiskclient.go
index 2f5aa28..93da0ef 100644
--- a/deployers/whiskclient.go
+++ b/deployers/whiskclient.go
@@ -275,20 +275,20 @@ func validateClientConfig(credential PropertyValue,
apiHost PropertyValue, names
// Show caller what final values we used for credential, apihost and
namespace
stdout :=
wski18n.T(wski18n.ID_MSG_CONFIG_INFO_APIHOST_X_host_X_source_X,
map[string]interface{}{wski18n.KEY_HOST: apiHost.Value,
wski18n.KEY_SOURCE: apiHost.Source})
- wskprint.PrintOpenWhiskInfo(stdout)
+ wskprint.PrintOpenWhiskVerbose(utils.Flags.Verbose, stdout)
stdout = wski18n.T(wski18n.ID_MSG_CONFIG_INFO_AUTHKEY_X_source_X,
map[string]interface{}{wski18n.KEY_SOURCE: credential.Source})
- wskprint.PrintOpenWhiskInfo(stdout)
+ wskprint.PrintOpenWhiskVerbose(utils.Flags.Verbose, stdout)
stdout =
wski18n.T(wski18n.ID_MSG_CONFIG_INFO_NAMESPACE_X_namespace_X_source_X,
map[string]interface{}{wski18n.KEY_NAMESPACE: namespace.Value,
wski18n.KEY_SOURCE: namespace.Source})
- wskprint.PrintOpenWhiskInfo(stdout)
+ wskprint.PrintOpenWhiskVerbose(utils.Flags.Verbose, stdout)
if len(apigwAccessToken.Value) != 0 {
stdout =
wski18n.T(wski18n.ID_MSG_CONFIG_INFO_APIGE_ACCESS_TOKEN_X_source_X,
map[string]interface{}{wski18n.KEY_SOURCE:
apigwAccessToken.Source})
- wskprint.PrintOpenWhiskInfo(stdout)
+ wskprint.PrintOpenWhiskVerbose(utils.Flags.Verbose, stdout)
}
return nil
diff --git a/parsers/manifest_parser.go b/parsers/manifest_parser.go
index dcbc0ed..fd9b121 100644
--- a/parsers/manifest_parser.go
+++ b/parsers/manifest_parser.go
@@ -432,7 +432,7 @@ func (dm *YAMLParser) ComposePackage(pkg Package,
packageName string, filePath s
// and in this case wskdeploy deploys openwhisk entities under
// /namespace instead of /namespace/package
if strings.ToLower(pag.N
[incubator-openwhisk-client-go] branch master updated: Update .gitignore (#114)
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-client-go.git The following commit(s) were added to refs/heads/master by this push: new a57389d Update .gitignore (#114) a57389d is described below commit a57389dff9f543ea0f721bdabf83239dc8281d2c Author: rodric rabbah AuthorDate: Wed Jan 30 21:09:56 2019 -0500 Update .gitignore (#114) --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dc15adc..62c1106 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -Godeps/_workspace .idea -*.iml \ No newline at end of file +*.iml +vendor/github.com
[incubator-openwhisk-runtime-python] branch master updated: disabled warnings at import for compatibility with old runtime (#46)
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-runtime-python.git
The following commit(s) were added to refs/heads/master by this push:
new 993c2ea disabled warnings at import for compatibility with old
runtime (#46)
993c2ea is described below
commit 993c2ea77a2ecfd2fc247140cd442926c3e98500
Author: Michele Sciabarra <30654959+sciabarra...@users.noreply.github.com>
AuthorDate: Wed Jan 30 20:16:52 2019 +0100
disabled warnings at import for compatibility with old runtime (#46)
---
core/pythonActionLoop/pythonbuild.py.launcher.py | 4 +++-
.../scala/runtime/actionContainers/PythonActionContainerTests.scala | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/core/pythonActionLoop/pythonbuild.py.launcher.py
b/core/pythonActionLoop/pythonbuild.py.launcher.py
index b7007c9..360cb55 100755
--- a/core/pythonActionLoop/pythonbuild.py.launcher.py
+++ b/core/pythonActionLoop/pythonbuild.py.launcher.py
@@ -19,7 +19,7 @@ from sys import stdin
from sys import stdout
from sys import stderr
from os import fdopen
-import sys, os, json, traceback
+import sys, os, json, traceback, warnings
try:
# if the directory 'virtualenv' is extracted out of a zip file
@@ -39,7 +39,9 @@ except Exception:
sys.exit(1)
# now import the action as process input/output
+warnings.filterwarnings("ignore")
from main__ import main as main
+warnings.resetwarnings()
# if there are some arguments exit immediately
if len(sys.argv) >1:
diff --git
a/tests/src/test/scala/runtime/actionContainers/PythonActionContainerTests.scala
b/tests/src/test/scala/runtime/actionContainers/PythonActionContainerTests.scala
index edc376c..89d2426 100644
---
a/tests/src/test/scala/runtime/actionContainers/PythonActionContainerTests.scala
+++
b/tests/src/test/scala/runtime/actionContainers/PythonActionContainerTests.scala
@@ -157,8 +157,8 @@ class PythonActionContainerTests extends
BasicActionRunnerTests with WskActorSys
Seq("__main__.py") ->
"""
|def main(args):
- |f = open('workfile', 'r')
- |return {'file': f.read()}
+ |with open('workfile', 'r') as f:
+ | return { 'file': f.read() }
""".stripMargin,
Seq("workfile") -> "this is a test string")
[incubator-openwhisk-runtime-python] branch master updated (d6a8920 -> e661433)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-python.git. from d6a8920 enable actionllop tests new b23fb7e remove build of python2 new e661433 only run python3 tests The 798 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: settings.gradle | 1 - tests/build.gradle | 4 tools/travis/test.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-)
[incubator-openwhisk-cli] annotated tag latest deleted (was d6a3db2)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was d6a3db2 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.
[incubator-openwhisk-cli] annotated tag latest deleted (was 2141da1)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was 2141da1 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.
[incubator-openwhisk-cli] annotated tag latest updated (9487cb7 -> d6a3db2)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was modified! *** from 9487cb7 (commit) to d6a3db2 (tag) tagging 9487cb76f98440374bb57e539faaf3b4c071dbd3 (commit) replaces 0.9.0-incubating by Travis CI on Sat Jan 26 13:50:59 2019 -0500 - Log - Generated tag from Travis CI build 1596 --- No new revisions were added by this update. Summary of changes:
[incubator-openwhisk-cli] annotated tag latest deleted (was 9254873)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was deleted! *** tag was 9254873 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.
