houshengbo closed pull request #926: Overwriting Deployment file inputs
URL: https://github.com/apache/incubator-openwhisk-wskdeploy/pull/926
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/deployers/deploymentreader.go b/deployers/deploymentreader.go
index 19579f6f..0c02e400 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)
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
