This is an automated email from the ASF dual-hosted git repository.
dgrove pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-openwhisk-composer.git
The following commit(s) were added to refs/heads/master by this push:
new 0a6b9fb Propagate OpenWhisk configuration to subcompositions (#23)
0a6b9fb is described below
commit 0a6b9fbb3207279c5e8fad280e90c1fa331f41fb
Author: Olivier Tardieu <[email protected]>
AuthorDate: Tue Feb 12 12:07:57 2019 -0500
Propagate OpenWhisk configuration to subcompositions (#23)
---
conductor.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/conductor.js b/conductor.js
index 0c22f14..2cf9845 100644
--- a/conductor.js
+++ b/conductor.js
@@ -96,6 +96,7 @@ function main (composition) {
const params = it(saved, item) // obtain combinator-specific params
for branch invocation
params.$composer.stack = stack
params.$composer.redis = p.s.redis
+ params.$composer.openwhisk = p.s.openwhisk
params.$composer.join = { barrierId, position, count: array.length }
return wsk.actions.invoke({ name: process.env.__OW_ACTION_NAME, params
}) // invoke branch
.then(({ activationId }) => { console.log(`barrierId: ${barrierId},
spawned position: ${position} with activationId: ${activationId}`) })
@@ -248,7 +249,7 @@ function main (composition) {
},
async ({ p, node, index, inspect, step }) {
- p.params.$composer = { state: p.s.state, stack: [{ marker: true
}].concat(p.s.stack), redis: p.s.redis }
+ p.params.$composer = { state: p.s.state, stack: [{ marker: true
}].concat(p.s.stack), redis: p.s.redis, openwhisk: p.s.openwhisk }
p.s.state = index + node.return
if (!wsk) wsk = openwhisk(p.s.openwhisk)
return wsk.actions.invoke({ name: process.env.__OW_ACTION_NAME, params:
p.params })
