You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ho...@apache.org on 2018/05/24 01:32:53 UTC
[incubator-openwhisk-wskdeploy] branch master updated: fixing
deployment file inputs
This is an automated email from the ASF dual-hosted git repository.
houshengbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-wskdeploy.git
The following commit(s) were added to refs/heads/master by this push:
new 7da7746 fixing deployment file inputs
7da7746 is described below
commit 7da7746d26d433e580141a73b6582654c7626502
Author: Priti Desai <pd...@us.ibm.com>
AuthorDate: Wed May 23 15:20:46 2018 -0700
fixing deployment file inputs
---
deployers/deploymentreader.go | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/deployers/deploymentreader.go b/deployers/deploymentreader.go
index 19579f6..0c02e40 100644
--- a/deployers/deploymentreader.go
+++ b/deployers/deploymentreader.go
@@ -177,6 +177,8 @@ func (reader *DeploymentReader) bindPackageInputsAndAnnotations(paramsCLI interf
}
packageInputs = append(packageInputs, kv)
}
+ } else {
+ packageInputs = keyValArr
}
serviceDeployPack.Package.Parameters = packageInputs
@@ -245,6 +247,8 @@ func (reader *DeploymentReader) bindActionInputsAndAnnotations(paramsCLI interfa
}
actionInputs = append(actionInputs, kv)
}
+ } else {
+ actionInputs = keyValArr
}
wskAction.Action.Parameters = actionInputs
@@ -267,9 +271,9 @@ func (reader *DeploymentReader) bindActionInputsAndAnnotations(paramsCLI interfa
}
}
wskAction.Action.Annotations = keyValArr
+ } else {
+ displayEntityNotFoundInDeploymentWarning(parsers.YAML_KEY_ACTION, actionName)
}
- } else {
- displayEntityNotFoundInDeploymentWarning(parsers.YAML_KEY_ACTION, actionName)
}
}
}
@@ -321,6 +325,8 @@ func (reader *DeploymentReader) bindTriggerInputsAndAnnotations(paramsCLI interf
}
triggerInputs = append(triggerInputs, kv)
}
+ } else {
+ triggerInputs = keyValArr
}
wskTrigger.Parameters = triggerInputs
@@ -343,9 +349,9 @@ func (reader *DeploymentReader) bindTriggerInputsAndAnnotations(paramsCLI interf
}
}
wskTrigger.Annotations = keyValArr
+ } else {
+ displayEntityNotFoundInDeploymentWarning(parsers.YAML_KEY_TRIGGER, triggerName)
}
- } else {
- displayEntityNotFoundInDeploymentWarning(parsers.YAML_KEY_TRIGGER, triggerName)
}
}
--
To stop receiving notification emails like this one, please contact
houshengbo@apache.org.