[incubator-openwhisk] branch master updated: Add option to use docker/runc respectively. (#2828)

2017-10-17 Thread markusthoemmes 
This is an automated email from the ASF dual-hosted git repository.

markusthoemmes 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 febde00  Add option to use docker/runc respectively. (#2828)
febde00 is described below

commit febde00425f0624b132f48bcd90df3f0f21c8f36
Author: David Grove 
AuthorDate: Tue Oct 17 04:43:09 2017 -0400

Add option to use docker/runc respectively. (#2828)

Restore config option to use docker pause/unpause instead of docker-runc 
pause/unpause in the invoker.
Works around the problem of incompatible versions of docker-runc in invoker 
container and hosting environment.
---
 ansible/group_vars/all |  2 ++
 ansible/roles/invoker/tasks/deploy.yml |  1 +
 ansible/templates/whisk.properties.j2  |  1 +
 .../src/main/scala/whisk/core/WhiskConfig.scala|  2 ++
 .../containerpool/docker/DockerContainer.scala | 23 +-
 .../docker/DockerContainerFactory.scala|  8 ++--
 .../main/scala/whisk/core/invoker/Invoker.scala|  3 ++-
 docs/deploy.md | 16 +--
 .../docker/test/DockerContainerTests.scala | 22 +
 9 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/ansible/group_vars/all b/ansible/group_vars/all
index 88ce571..e7dda4e 100644
--- a/ansible/group_vars/all
+++ b/ansible/group_vars/all
@@ -159,6 +159,8 @@ invoker:
   instances: "{{ groups['invokers'] | length }}"
   # Specify if it is allowed to deploy more than 1 invoker on a single machine.
   allowMultipleInstances: "{{ invoker_allow_multiple_instances | 
default(false) }}"
+  # Specify if it should use docker-runc or docker to pause/unpause containers
+  useRunc: "{{ invoker_use_runc | default(true) }}"
   docker:
 become: "{{ invoker_docker_become | default(false) }}"
 
diff --git a/ansible/roles/invoker/tasks/deploy.yml 
b/ansible/roles/invoker/tasks/deploy.yml
index 75df82e..413a9c6 100644
--- a/ansible/roles/invoker/tasks/deploy.yml
+++ b/ansible/roles/invoker/tasks/deploy.yml
@@ -139,6 +139,7 @@
 -e INVOKER_CONTAINER_DNS='{{ invoker_container_network_dns_servers | 
default()}}'
 -e INVOKER_NUMCORE='{{ invoker.numcore }}'
 -e INVOKER_CORESHARE='{{ invoker.coreshare }}'
+-e INVOKER_USE_RUNC='{{ invoker.useRunc }}'
 -e WHISK_LOGS_DIR='{{ whisk_logs_dir }}'
 -v /sys/fs/cgroup:/sys/fs/cgroup
 -v /run/runc:/run/runc
diff --git a/ansible/templates/whisk.properties.j2 
b/ansible/templates/whisk.properties.j2
index 66aa64b..89cf8d6 100644
--- a/ansible/templates/whisk.properties.j2
+++ b/ansible/templates/whisk.properties.j2
@@ -62,6 +62,7 @@ invoker.container.policy={{ invoker_container_policy_name | 
default()}}
 invoker.container.dns={{ invoker_container_network_dns_servers | default()}}
 invoker.numcore={{ invoker.numcore }}
 invoker.coreshare={{ invoker.coreshare }}
+invoker.useRunc={{ invoker.useRunc }}
 invoker.instances={{ invoker.instances }}
 
 main.docker.endpoint={{ hostvars[groups["controllers"]|first].ansible_host 
}}:{{ docker.port }}
diff --git a/common/scala/src/main/scala/whisk/core/WhiskConfig.scala 
b/common/scala/src/main/scala/whisk/core/WhiskConfig.scala
index 254181b..5ae80d3 100644
--- a/common/scala/src/main/scala/whisk/core/WhiskConfig.scala
+++ b/common/scala/src/main/scala/whisk/core/WhiskConfig.scala
@@ -64,6 +64,7 @@ class WhiskConfig(requiredProperties: Map[String, String],
 if (this(WhiskConfig.invokerContainerDns) == "") Seq() else 
this(WhiskConfig.invokerContainerDns).split(" ").toSeq
   val invokerNumCore = this(WhiskConfig.invokerNumCore)
   val invokerCoreShare = this(WhiskConfig.invokerCoreShare)
+  val invokerUseRunc = this.getAsBoolean(WhiskConfig.invokerUseRunc, true)
 
   val wskApiHost = this(WhiskConfig.wskApiProtocol) + "://" + 
this(WhiskConfig.wskApiHostname) + ":" + this(
 WhiskConfig.wskApiPort)
@@ -188,6 +189,7 @@ object WhiskConfig {
   val invokerContainerDns = "invoker.container.dns"
   val invokerNumCore = "invoker.numcore"
   val invokerCoreShare = "invoker.coreshare"
+  val invokerUseRunc = "invoker.use.runc"
 
   val wskApiProtocol = "whisk.api.host.proto"
   val wskApiPort = "whisk.api.host.port"
diff --git 
a/core/invoker/src/main/scala/whisk/core/containerpool/docker/DockerContainer.scala
 
b/core/invoker/src/main/scala/whisk/core/containerpool/docker/DockerContainer.scala
index 89960e3..a7b1785 100644
--- 
a/core/invoker/src/main/scala/whisk/core/containerpool/docker/DockerContainer.scala
+++ 
b/core/invoker/src/main/scala/whisk/core/containerpool/docker/DockerContainer.scala
@@ -49,6 +49,7 @@ object DockerContainer {
* @param network network to launch the container in
* @param dnsServers list of dns servers to use in the container
* @param name optional name for th

[incubator-openwhisk-client-js] branch master updated: Adding support for responsetype parameter during route create. (#74)

2017-10-17 Thread rabbah 
This is an automated email from the ASF dual-hosted git repository.

rabbah 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 244d2b0  Adding support for responsetype parameter during route 
create. (#74)
244d2b0 is described below

commit 244d2b00d197aeb32687a551c344df7b23dbd4fc
Author: James Thomas 
AuthorDate: Tue Oct 17 11:50:37 2017 +0100

Adding support for responsetype parameter during route create. (#74)
---
 README.md|  3 ++-
 lib/routes.js|  2 +-
 package.json |  4 ++--
 test/unit/routes.test.js | 35 +++
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index fdd4998..159b3e3 100644
--- a/README.md
+++ b/README.md
@@ -464,7 +464,8 @@ ow.routes.create({relpath: '...', operation: '...', action: 
'...'})
 
 *`action` supports normal (actionName) and fully-qualified 
(/namespace/actionName) formats.*
 
-The following optional parameters are supported to filter the result set:
+The following optional parameters are supported:
+- `responsetype` - content type returned by web action, possible values: 
`html`, `http`, `json`, `text` and `svg` (default: `json`).
 - `basepath` - base URI path for endpoints (default: `/`)
 
 ## Debugging
diff --git a/lib/routes.js b/lib/routes.js
index 2de8ab4..edb5f60 100644
--- a/lib/routes.js
+++ b/lib/routes.js
@@ -48,7 +48,7 @@ class Routes extends BaseOperation {
 }
 
 const body = this.route_swagger_definition(options)
-const qs = this.qs(options, [])
+const qs = this.qs(options, ['responsetype'])
 return this.client.request('POST', this.routeMgmtApiPath('createApi'), { 
body, qs })
   }
 
diff --git a/package.json b/package.json
index 8a7f3e1..105f154 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openwhisk",
-  "version": "3.6.0",
+  "version": "3.9.0",
   "description": "JavaScript client library for the OpenWhisk platform",
   "main": "lib/main.js",
   "typings": "lib/main.d.ts",
@@ -65,4 +65,4 @@
   "babel-core/register"
 ]
   }
-}
\ No newline at end of file
+}
diff --git a/test/unit/routes.test.js b/test/unit/routes.test.js
index 5e3767c..0d25c36 100644
--- a/test/unit/routes.test.js
+++ b/test/unit/routes.test.js
@@ -171,6 +171,41 @@ test('should create a route with apigw_token', t => {
   return routes.create({relpath: '/hello', operation: 'GET', action: 
'helloAction'})
 })
 
+test('should create a route with response type', t => {
+  t.plan(4)
+  const path_url = path => `https://openwhisk.ng.bluemix.net/api/v1/${path}`
+  const api_key = 'username:password'
+  const client_options = { api_key }
+  const client = { path_url, options: client_options }
+  const options = {force: true, basepath: '/hello', relpath: '/bar/1', 
operation: 'GET'}
+
+  const body = {
+apidoc: {
+  namespace: '_',
+  gatewayBasePath: '/',
+  gatewayPath: '/hello',
+  gatewayMethod: 'GET',
+  id: 'API:_:/',
+  action: {
+name: 'helloAction',
+namespace: '_',
+backendMethod: 'GET',
+backendUrl: 
'https://openwhisk.ng.bluemix.net/api/v1/web/_/default/helloAction.http',
+authkey: api_key }
+}
+  }
+
+  client.request = (method, path, _options) => {
+t.is(method, 'POST')
+t.is(path, routes.routeMgmtApiPath('createApi'))
+t.deepEqual(_options.body, body)
+t.deepEqual(_options.qs, { responsetype: 'http' })
+  }
+
+  const routes = new Routes(client)
+  return routes.create({relpath: '/hello', operation: 'GET', action: 
'helloAction', responsetype: 'http'})
+})
+
 test('should create a route with apigw_token and action with package', t => {
   t.plan(4)
   const path_url = path => `https://openwhisk.ng.bluemix.net/api/v1/${path}`

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" '].

[incubator-openwhisk] branch master updated (febde00 -> 1810897)

2017-10-17 Thread rabbah 
This is an automated email from the ASF dual-hosted git repository.

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


from febde00  Add option to use docker/runc respectively. (#2828)
 add 1810897  Move nodejs runtime into it's own repo (#2834)

No new revisions were added by this update.

Summary of changes:
 core/nodejs6Action/Dockerfile|  79 +---
 core/nodejs6Action/build.gradle  |   1 -
 core/nodejsActionBase/.dockerignore  |   2 -
 core/nodejsActionBase/Dockerfile |   8 --
 core/nodejsActionBase/app.js |  81 
 core/nodejsActionBase/build.gradle   |  10 --
 core/nodejsActionBase/package.json   |  11 ---
 core/nodejsActionBase/runner.js  | 168 -
 core/nodejsActionBase/src/logger.js  |  60 
 core/nodejsActionBase/src/service.js | 175 ---
 core/nodejsActionBase/test.js| 127 -
 settings.gradle  |   1 -
 12 files changed, 1 insertion(+), 722 deletions(-)
 delete mode 100644 core/nodejsActionBase/.dockerignore
 delete mode 100644 core/nodejsActionBase/Dockerfile
 delete mode 100644 core/nodejsActionBase/app.js
 delete mode 100644 core/nodejsActionBase/build.gradle
 delete mode 100644 core/nodejsActionBase/package.json
 delete mode 100644 core/nodejsActionBase/runner.js
 delete mode 100644 core/nodejsActionBase/src/logger.js
 delete mode 100644 core/nodejsActionBase/src/service.js
 delete mode 100644 core/nodejsActionBase/test.js

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" '].

[incubator-openwhisk] branch master updated (1810897 -> f0ded00)

2017-10-17 Thread rabbah 
This is an automated email from the ASF dual-hosted git repository.

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


from 1810897  Move nodejs runtime into it's own repo (#2834)
 add f0ded00  Move java runtime into its own repo (#2821)

No new revisions were added by this update.

Summary of changes:
 core/javaAction/Dockerfile |  39 +
 core/javaAction/proxy/build.gradle |  32 
 .../proxy/gradle/wrapper/gradle-wrapper.jar| Bin 53636 -> 0 bytes
 .../proxy/gradle/wrapper/gradle-wrapper.properties |   6 -
 core/javaAction/proxy/gradlew  | 160 ---
 .../main/java/openwhisk/java/action/JarLoader.java |  90 ---
 .../src/main/java/openwhisk/java/action/Proxy.java | 169 -
 .../java/action/WhiskSecurityManager.java  |  44 --
 8 files changed, 1 insertion(+), 539 deletions(-)
 delete mode 100644 core/javaAction/proxy/build.gradle
 delete mode 100644 core/javaAction/proxy/gradle/wrapper/gradle-wrapper.jar
 delete mode 100644 
core/javaAction/proxy/gradle/wrapper/gradle-wrapper.properties
 delete mode 100755 core/javaAction/proxy/gradlew
 delete mode 100644 
core/javaAction/proxy/src/main/java/openwhisk/java/action/JarLoader.java
 delete mode 100644 
core/javaAction/proxy/src/main/java/openwhisk/java/action/Proxy.java
 delete mode 100644 
core/javaAction/proxy/src/main/java/openwhisk/java/action/WhiskSecurityManager.java

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" '].

[incubator-openwhisk] branch master updated (f0ded00 -> eb191ec)

2017-10-17 Thread rabbah 
This is an automated email from the ASF dual-hosted git repository.

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


from f0ded00  Move java runtime into its own repo (#2821)
 add eb191ec  Move swift runtime into its own repo (#2822)

No new revisions were added by this update.

Summary of changes:
 core/swift3.1.1Action/Dockerfile  |  31 +--
 core/swift3.1.1Action/build.gradle|  38 ---
 core/swift3.1.1Action/buildandrecord.py   |  77 --
 core/swift3.1.1Action/spm-build/Package.swift |  27 ---
 core/swift3Action/Dockerfile  |  10 +-
 core/swift3Action/build.gradle|  10 -
 core/swift3Action/buildandrecord.py   |  76 --
 core/swift3Action/epilogue.swift  |  78 --
 core/swift3Action/spm-build/Package.swift |  28 ---
 core/swift3Action/spm-build/_Whisk.swift  | 275 --
 core/swift3Action/spm-build/_WhiskJSONUtils.swift | 169 -
 core/swift3Action/swift3runner.py | 114 -
 12 files changed, 2 insertions(+), 931 deletions(-)
 delete mode 100755 core/swift3.1.1Action/buildandrecord.py
 delete mode 100755 core/swift3.1.1Action/spm-build/Package.swift
 delete mode 100644 core/swift3Action/buildandrecord.py
 delete mode 100644 core/swift3Action/epilogue.swift
 delete mode 100644 core/swift3Action/spm-build/Package.swift
 delete mode 100644 core/swift3Action/spm-build/_Whisk.swift
 delete mode 100644 core/swift3Action/spm-build/_WhiskJSONUtils.swift
 delete mode 100644 core/swift3Action/swift3runner.py

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" '].

[incubator-openwhisk] branch master updated (eb191ec -> 1138aff)

2017-10-17 Thread rabbah 
This is an automated email from the ASF dual-hosted git repository.

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


from eb191ec  Move swift runtime into its own repo (#2822)
 add 1138aff  Move php runtime into its own repo (#2823)

No new revisions were added by this update.

Summary of changes:
 core/php7.1Action/Dockerfile|  51 +-
 core/php7.1Action/composer.json |  11 --
 core/php7.1Action/router.php| 342 
 core/php7.1Action/runner.php|  69 
 4 files changed, 1 insertion(+), 472 deletions(-)
 delete mode 100644 core/php7.1Action/composer.json
 delete mode 100644 core/php7.1Action/router.php
 delete mode 100644 core/php7.1Action/runner.php

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" '].

[incubator-openwhisk] branch master updated (1138aff -> 445f414)

2017-10-17 Thread rabbah 
This is an automated email from the ASF dual-hosted git repository.

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


from 1138aff  Move php runtime into its own repo (#2823)
 add 445f414  Move python runtime into its own repo (#2843)

No new revisions were added by this update.

Summary of changes:
 core/python2Action/Dockerfile |  40 +--
 core/python2Action/build.gradle   |  17 ---
 core/pythonAction/Dockerfile  |  33 +
 core/pythonAction/build.gradle|   1 -
 core/pythonAction/pythonrunner.py | 100 --
 5 files changed, 2 insertions(+), 189 deletions(-)
 delete mode 100644 core/pythonAction/pythonrunner.py

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" '].

[incubator-openwhisk] branch master updated (445f414 -> fa8b462)

2017-10-17 Thread markusthoemmes 
This is an automated email from the ASF dual-hosted git repository.

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


from 445f414  Move python runtime into its own repo (#2843)
 add fa8b462  Basic support for dynamic invoker id assignment. (#2689)

No new revisions were added by this update.

Summary of changes:
 ansible/roles/invoker/tasks/deploy.yml |  3 ++
 ansible/templates/whisk.properties.j2  |  2 +
 common/scala/build.gradle  |  1 +
 .../src/main/scala/whisk/core/WhiskConfig.scala|  7 
 .../main/scala/whisk/core/invoker/Invoker.scala| 44 --
 5 files changed, 53 insertions(+), 4 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" '].

[incubator-openwhisk] branch master updated (fa8b462 -> 1110c34)

2017-10-17 Thread rabbah 
This is an automated email from the ASF dual-hosted git repository.

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


from fa8b462  Basic support for dynamic invoker id assignment. (#2689)
 add 1110c34  Implement bulk write of activations in the Invoker. (#2812)

No new revisions were added by this update.

Summary of changes:
 .../src/main/scala/whisk/common/Logging.scala  |   1 +
 .../scala/whisk/core/database/ArtifactStore.scala  |  11 ++
 .../main/scala/whisk/core/database/Batcher.scala   |  84 +++
 .../whisk/core/database/CouchDbRestClient.scala|   4 +
 .../whisk/core/database/CouchDbRestStore.scala |  37 ++-
 .../whisk/core/database/DocumentFactory.scala  |   8 ++
 .../src/main/scala/whisk/core/entity/DocInfo.scala |   5 +-
 .../scala/whisk/core/invoker/InvokerReactive.scala |  23 ++--
 tests/src/test/scala/common/LoggedFunction.scala   |  10 ++
 .../whisk/core/database/test/BatcherTests.scala| 118 +
 .../database/test/CouchDbRestClientTests.scala |  45 +++-
 11 files changed, 334 insertions(+), 12 deletions(-)
 create mode 100644 
common/scala/src/main/scala/whisk/core/database/Batcher.scala
 create mode 100644 
tests/src/test/scala/whisk/core/database/test/BatcherTests.scala

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" '].

[incubator-openwhisk-client-js] tag 3.8.0 created (now 244d2b0)

2017-10-17 Thread rabbah 
This is an automated email from the ASF dual-hosted git repository.

rabbah pushed a change to tag 3.8.0
in repository 
https://gitbox.apache.org/repos/asf/incubator-openwhisk-client-js.git.


  at 244d2b0  (commit)
No new revisions were added by this update.

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" '].

[incubator-openwhisk-client-js] tag 3.9.0 created (now 244d2b0)

2017-10-17 Thread rabbah 
This is an automated email from the ASF dual-hosted git repository.

rabbah pushed a change to tag 3.9.0
in repository 
https://gitbox.apache.org/repos/asf/incubator-openwhisk-client-js.git.


  at 244d2b0  (commit)
No new revisions were added by this update.

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" '].

[incubator-openwhisk-package-kafka] branch master updated: Add ability to get trigger configuration and status (#217)

2017-10-17 Thread dubeejw 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 3fb980c  Add ability to get trigger configuration and status (#217)
3fb980c is described below

commit 3fb980c72c54b33add8bdf2fa6231e08287d7c56
Author: Adnan Baruni 
AuthorDate: Tue Oct 17 13:48:32 2017 -0500

Add ability to get trigger configuration and status (#217)

* initial implementation of trigger management, get status and configuration

* add test for get trigger config and status

* add implementation from message hub feed action to kafka feed action
---
 action/kafkaFeed.js|  2 +
 action/kafkaFeedWeb.js | 29 ++
 action/lib/common.js   | 29 +-
 action/messageHubFeed.js   |  2 +
 action/messageHubFeedWeb.js| 29 ++
 .../system/packages/MessageHubFeedTests.scala  | 67 +-
 6 files changed, 153 insertions(+), 5 deletions(-)

diff --git a/action/kafkaFeed.js b/action/kafkaFeed.js
index 3cd42f7..bf55538 100644
--- a/action/kafkaFeed.js
+++ b/action/kafkaFeed.js
@@ -18,6 +18,8 @@ function main(params) {
 
 if (params.lifecycleEvent === 'CREATE') {
 return common.createTrigger(endpoint, massagedParams, webActionName);
+} else if (params.lifecycleEvent === 'READ') {
+return common.getTrigger(endpoint, massagedParams, webActionName);
 } else if (params.lifecycleEvent === 'DELETE') {
 return common.deleteTrigger(endpoint, massagedParams, webActionName);
 }
diff --git a/action/kafkaFeedWeb.js b/action/kafkaFeedWeb.js
index de39edb..d60ce2f 100644
--- a/action/kafkaFeedWeb.js
+++ b/action/kafkaFeedWeb.js
@@ -61,6 +61,35 @@ function main(params) {
 
 resolve(common.webResponse(statusCode, body));
 });
+} else if (params.__ow_method === "get") {
+const triggerURL = common.getTriggerURL(params.authKey, 
params.endpoint, params.triggerName);
+
+return common.verifyTriggerAuth(triggerURL)
+.then(() => {
+db = new Database(params.DB_URL, params.DB_NAME);
+return db.getTrigger(params.triggerName);
+})
+.then((triggerDoc) => {
+var body = {
+config: {
+triggerName: triggerDoc.triggerName,
+topic: triggerDoc.topic,
+isJSONData: triggerDoc.isJSONData,
+isBinaryValue: triggerDoc.isBinaryValue,
+isBinaryKey: triggerDoc.isBinaryKey,
+isMessageHub: triggerDoc.isMessageHub,
+brokers: triggerDoc.brokers,
+kafka_admin_url: triggerDoc.kafka_admin_url,
+username: triggerDoc.username,
+password: triggerDoc.password
+},
+status: triggerDoc.status
+}
+resolve(common.webResponse(200, body, 'application/json'));
+})
+.catch(error => {
+resolve(common.webResponse(500, error.toString()));
+});
 } else if (params.__ow_method === "delete") {
 const triggerURL = common.getTriggerURL(params.authKey, 
params.endpoint, params.triggerName);
 
diff --git a/action/lib/common.js b/action/lib/common.js
index 46a7d32..638f8c2 100644
--- a/action/lib/common.js
+++ b/action/lib/common.js
@@ -130,6 +130,30 @@ function deleteTrigger(endpoint, params, actionName) {
 });
 }
 
+function getTrigger(endpoint, params, actionName) {
+var options = {
+method: 'GET',
+url: getWebActionURL(endpoint, actionName),
+rejectUnauthorized: false,
+json: true,
+body: params,
+headers: {
+'Content-Type': 'application/json',
+'Accept': 'application/json',
+'User-Agent': 'whisk'
+}
+};
+
+return request(options)
+.then(response => {
+return response;
+})
+.catch(error => {
+console.log(`Error fetching trigger: ${JSON.stringify(error, null, 
2)}`);
+return Promise.reject(error.response.body);
+});
+}
+
 // perform parameter validation that is common to both feed actions
 function performCommonParameterValidation(rawParams) {
 var validatedParams = {};
@@ -166,11 +190,11 @@ function performCommonParameterValidation(rawParams) {
 return { validatedParams: validatedParams };
 }
 
-function webResponse(code, body) {
+function w

[incubator-openwhisk] branch master updated: Move docker runtime into its own repo (#2850)

2017-10-17 Thread rabbah 
This is an automated email from the ASF dual-hosted git repository.

rabbah 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 faeee10  Move docker runtime into its own repo  (#2850)
faeee10 is described below

commit faeee1009cdb317fe0e6fcaf5100f1c940ff360d
Author: Carlos Santana 
AuthorDate: Tue Oct 17 17:56:37 2017 -0400

Move docker runtime into its own repo  (#2850)
---
 ansible/edge.yml   |   1 -
 ansible/roles/nginx/templates/nginx.conf.j2|   6 +-
 ansible/roles/sdk/tasks/clean.yml  |   8 -
 ansible/roles/sdk/tasks/deploy.yml |  39 ---
 ansible/roles/sdk/tasks/main.yml   |  10 -
 core/actionProxy/Dockerfile|  23 +-
 core/actionProxy/actionproxy.py| 271 -
 core/actionProxy/delete-build-run.sh   |  23 --
 core/actionProxy/stub.sh   |   9 -
 sdk/docker/Dockerfile  |  16 +-
 sdk/docker/README.md   |  34 ---
 sdk/docker/build.gradle|   2 -
 sdk/docker/buildAndPush.sh |  24 --
 sdk/docker/example.c   |  17 --
 .../src/test/scala/system/basic/WskSdkTests.scala  |   9 -
 tools/cli/go-whisk-cli/commands/sdk.go |   2 +-
 16 files changed, 8 insertions(+), 486 deletions(-)

diff --git a/ansible/edge.yml b/ansible/edge.yml
index cf80ebe..6566d57 100644
--- a/ansible/edge.yml
+++ b/ansible/edge.yml
@@ -8,4 +8,3 @@
   roles:
   - nginx
   - cli
-  - sdk
diff --git a/ansible/roles/nginx/templates/nginx.conf.j2 
b/ansible/roles/nginx/templates/nginx.conf.j2
index 31c1ccf..6a0b4dc 100644
--- a/ansible/roles/nginx/templates/nginx.conf.j2
+++ b/ansible/roles/nginx/templates/nginx.conf.j2
@@ -76,8 +76,12 @@ http {
 proxy_read_timeout 70s; # 60+10 additional seconds to allow 
controller to terminate request
 }
 
+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 {
-root /etc/nginx;
+return 301 /blackbox.tar.gz;
 }
 
 location /OpenWhiskIOSStarterApp.zip {
diff --git a/ansible/roles/sdk/tasks/clean.yml 
b/ansible/roles/sdk/tasks/clean.yml
deleted file mode 100644
index c9e83ed..000
--- a/ansible/roles/sdk/tasks/clean.yml
+++ /dev/null
@@ -1,8 +0,0 @@

-# Remove SDK artifacts from nginx.
-
-- name: remove blackbox sdk
-  file:
-path: "{{ nginx.confdir }}/blackbox-0.1.0.tar.gz"
-state: absent
-  become: "{{ sdk.dir.become }}"
diff --git a/ansible/roles/sdk/tasks/deploy.yml 
b/ansible/roles/sdk/tasks/deploy.yml
deleted file mode 100644
index 4b6b2de..000
--- a/ansible/roles/sdk/tasks/deploy.yml
+++ /dev/null
@@ -1,39 +0,0 @@

-# Tasks for handling SDK generation and publishing
-
-- name: ensure nginx config directory exists
-  file:
-path: "{{ nginx.confdir }}"
-state: directory
-  become: "{{ sdk.dir.become }}"
-
-# Blackbox
-
-- name: make temp dir
-  local_action: shell "mktemp" "-d" "{{ lookup('env', 'TMPDIR') | 
default('/tmp', true) }}/whisk."
-  register: tmpdir
-
-- name: copy docker sdk to dockerSkeleton in scratch space
-  local_action: copy src="{{ openwhisk_home }}/sdk/docker/{{ item }}" dest="{{ 
tmpdir.stdout }}/dockerSkeleton/"
-  with_items:
-- buildAndPush.sh
-- Dockerfile
-- example.c
-- README.md
-
-- name: rename base image in Dockerfile
-  local_action: replace dest="{{ tmpdir.stdout }}/dockerSkeleton/Dockerfile" 
regexp='^FROM dockerskeleton*.*$' replace='FROM openwhisk/dockerskeleton'
-
-- name: fix file permissions
-  local_action: file path="{{ tmpdir.stdout }}/dockerSkeleton/buildAndPush.sh" 
mode=0755
-
-- name: build blackbox container artifact
-  local_action: shell "tar" "--exclude=build.gradle" "-czf" "{{ tmpdir.stdout 
}}/blackbox-0.1.0.tar.gz" "dockerSkeleton" chdir="{{ tmpdir.stdout }}"
-
-- name: copy blackbox container artifact to nginx
-  copy:
-src: "{{ tmpdir.stdout }}/blackbox-0.1.0.tar.gz"
-dest: "{{ nginx.confdir }}"
-
-- name: remove temp dir
-  local_action: file path="{{ tmpdir.stdout }}" state=absent
diff --git a/ansible/roles/sdk/tasks/main.yml b/ansible/roles/sdk/tasks/main.yml
deleted file mode 100644
index 32f892d..000
--- a/ansible/roles/sdk/tasks/main.yml
+++ /dev/null
@@ -1,10 +0,0 @@

-# This role will build and publish Openwhisk SDKs. Currently covers blackbox 
starter kit.
-# In deploy mode it will generate downloadable artifacts and copy them to 
nginx.
-# In clean mode it will remove the artifacts from nginx.

[incubator-openwhisk] branch master updated: only build invoker and controller (#2866)

2017-10-17 Thread dubeejw 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 733f3e9  only build invoker and controller (#2866)
733f3e9 is described below

commit 733f3e9d3e4885ff1b1b5b380483e12ea4b9f01e
Author: Carlos Santana 
AuthorDate: Tue Oct 17 22:00:32 2017 -0400

only build invoker and controller (#2866)
---
 tools/jenkins/apache/dockerhub.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/jenkins/apache/dockerhub.groovy 
b/tools/jenkins/apache/dockerhub.groovy
index 975e196..c804b23 100644
--- a/tools/jenkins/apache/dockerhub.groovy
+++ b/tools/jenkins/apache/dockerhub.groovy
@@ -12,7 +12,7 @@ node('xenial&&!H21&&!H22&&!H11&&!ubuntu-eu3') {
   withCredentials([usernamePassword(credentialsId: 'openwhisk_dockerhub', 
passwordVariable: 'DOCKER_PASSWORD', usernameVariable: 'DOCKER_USER')]) {
   sh 'docker login -u ${DOCKER_USER} -p ${DOCKER_PASSWORD}'
   }
-  def PUSH_CMD = "./gradlew distDocker -PdockerRegistry=docker.io 
-PdockerImagePrefix=openwhisk -x tests:dat:blackbox:badproxy:distDocker -x 
tests:dat:blackbox:badaction:distDocker -x sdk:docker:distDocker -x 
tools:cli:distDocker -x tools:cli:distDocker"
+  def PUSH_CMD = "./gradlew :core:controller:distDocker 
:core:invoker:distDocker -PdockerRegistry=docker.io 
-PdockerImagePrefix=openwhisk"
   def gitCommit = sh(returnStdout: true, script: 'git rev-parse 
HEAD').trim()
   def shortCommit = gitCommit.take(7)
   sh "${PUSH_CMD} -PdockerImageTag=latest"

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" '].