This is an automated email from the ASF dual-hosted git repository.
pdesai 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 ce5e9e7 Resolves issue #880 (#890)
ce5e9e7 is described below
commit ce5e9e79bad415016a02fac5d3c1716c93bba118
Author: Pavel Kravchenko <[email protected]>
AuthorDate: Wed May 9 22:31:47 2018 +0300
Resolves issue #880 (#890)
* Resolves issue #880
- fix for rules actions when action from different package, e.g. dependency
- fix for dependencies when dependency from different namespace
note: if the exported dependency not managed by any project warning will be
printed and resource will not be exported, but it's reference will be added
to exported manifest.yaml assuming it should be added to the system by the
user
e.g. like whisk.system namespace should be pre-installed on the OW by user
* resolves #880
- fix trigger export to export feed and input parameters
- fix export sequence action
- export dependency package input parameters
- avoid exporting unmanaged actions
---
cmd/export.go | 65 +++++++++++++++++++++++++++++++++++++++++++--------
parsers/yamlparser.go | 18 +++++++++++---
2 files changed, 70 insertions(+), 13 deletions(-)
diff --git a/cmd/export.go b/cmd/export.go
index 5112947..d3d31b1 100644
--- a/cmd/export.go
+++ b/cmd/export.go
@@ -43,7 +43,7 @@ var exportCmd = &cobra.Command{
var config *whisk.Config
-func ExportAction(actionName string, packageName string, maniyaml
*parsers.YAML, targetManifest string) error {
+func ExportAction(actionName string, packageName string, maniyaml
*parsers.YAML, targetManifest string, projectName string) error {
pkg := maniyaml.Packages[packageName]
if pkg.Actions == nil {
@@ -55,19 +55,30 @@ func ExportAction(actionName string, packageName string,
maniyaml *parsers.YAML,
if err != nil {
return err
}
+
+ if a := wskAction.Annotations.GetValue(utils.MANAGED); a != nil {
+ // decode the JSON blob and retrieve __OW_PROJECT_NAME
+ pa := a.(map[string]interface{})
+
+ // we have found a package which is part of the current project
+ if pa[utils.OW_PROJECT_NAME] != projectName {
+ return nil
+ }
+ } else {
+ return nil
+ }
+
if wskAction.Exec.Kind == "sequence" {
seq := new(parsers.Sequence)
for _, component := range wskAction.Exec.Components {
// must ommit namespace from seq component name
- ExportAction(strings.SplitN(component, "/", 3)[2],
packageName, maniyaml, targetManifest)
- slices := strings.Split(component, "/")
+ ExportAction(strings.SplitN(component, "/", 3)[2],
packageName, maniyaml, targetManifest, projectName)
- // save in the seq list only action names
if len(seq.Actions) > 0 {
seq.Actions += ","
}
-
- seq.Actions += slices[len(slices)-1]
+ // save action in the seq list as package/action
+ seq.Actions += strings.SplitN(component, "/", 3)[2]
}
pkg = maniyaml.Packages[packageName]
@@ -91,7 +102,7 @@ func ExportAction(actionName string, packageName string,
maniyaml *parsers.YAML,
if filename != "" {
// store function in manifest if action has code section
- parsedAction.Function = filepath.Join(packageName,
filename)
+ parsedAction.Function = packageName + "/" + filename
}
pkg.Actions[wskAction.Name] = parsedAction
@@ -162,7 +173,7 @@ func exportProject(projectName string, targetManifest
string) error {
if aa[utils.OW_PROJECT_NAME] ==
projectName {
actionName :=
strings.Join([]string{pkg.Name, action.Name}, "/")
// export action to
file system
- err =
ExportAction(actionName, pkg.Name, maniyaml, targetManifest)
+ err =
ExportAction(actionName, pkg.Name, maniyaml, targetManifest, projectName)
if err != nil {
return err
}
@@ -187,7 +198,6 @@ func exportProject(projectName string, targetManifest
string) error {
ta := a.(map[string]interface{})
if ta[utils.OW_PROJECT_NAME] == projectName {
- // for i := 0; i <
len(maniyaml.Packages); i++ {
for pkgName := range maniyaml.Packages {
if maniyaml.Packages[pkgName].Namespace
== trg.Namespace {
if
maniyaml.Packages[pkgName].Triggers == nil {
@@ -197,6 +207,31 @@ func exportProject(projectName string, targetManifest
string) error {
}
// export trigger to manifest
+
+ if feedname, isFeed :=
utils.IsFeedAction(&trg); isFeed {
+ // export feed input
parameters
+ feedAction, _, _ :=
client.Actions.Get(feedname, true)
+ if err != nil {
+ return err
+ }
+
+ params :=
make(map[string]interface{})
+ params["authKey"] =
client.Config.AuthToken
+
params["lifecycleEvent"] = "READ"
+ params["triggerName"] =
"/" + client.Namespace + "/" + trg.Name
+ res, _, err :=
client.Actions.Invoke(feedname, params, true, true)
+ if err != nil {
+ return err
+ }
+ feedConfig :=
res["config"]
+ for key, val := range
feedConfig.(map[string]interface{}) {
+
+ if i :=
feedAction.Parameters.FindKeyValue(key); i >= 0 {
+
trg.Parameters = trg.Parameters.AddOrReplace(&whisk.KeyValue{Key: key, Value:
val})
+ }
+ }
+ }
+
maniyaml.Packages[pkgName].Triggers[trg.Name] =
*maniyaml.ComposeParsersTrigger(trg)
}
}
@@ -245,7 +280,13 @@ func exportProject(projectName string, targetManifest
string) error {
pkg.Dependencies =
make(map[string]parsers.Dependency)
maniyaml.Packages[pkgName] = pkg
}
- maniyaml.Packages[pkgName].Dependencies[bPkg] =
*maniyaml.ComposeParsersDependency(binding)
+
+ bPkgData, _, err := client.Packages.Get(bPkg)
+ if err != nil {
+ return err
+ }
+
+ maniyaml.Packages[pkgName].Dependencies[bPkg] =
*maniyaml.ComposeParsersDependency(binding, *bPkgData)
}
break
@@ -268,6 +309,9 @@ func exportProject(projectName string, targetManifest
string) error {
// now export dependencies to their own manifests
for _, binding := range bindings {
+ ns := client.Config.Namespace
+ client.Config.Namespace = binding.Namespace
+
pkg, _, err := client.Packages.Get(binding.Name)
if err != nil {
return err
@@ -289,6 +333,7 @@ func exportProject(projectName string, targetManifest
string) error {
// showing warning to notify user that exported
manifest dependent on unmanaged library which can't be exported
fmt.Println("Warning! Dependency package " +
binding.Name + " currently unmanaged by any project. Unable to export this
package")
}
+ client.Config.Namespace = ns
}
return nil
diff --git a/parsers/yamlparser.go b/parsers/yamlparser.go
index 551733a..0b7c158 100644
--- a/parsers/yamlparser.go
+++ b/parsers/yamlparser.go
@@ -428,21 +428,30 @@ func (yaml *YAML) ComposeParsersTrigger(wsktrg
whisk.Trigger) *Trigger {
trigger := new(Trigger)
trigger.Name = wsktrg.Name
trigger.Namespace = wsktrg.Namespace
-
+ trigger.Inputs = make(map[string]Parameter)
for _, keyval := range wsktrg.Parameters {
param := new(Parameter)
param.Value = keyval.Value
trigger.Inputs[keyval.Key] = *param
}
+ if feedname, isFeed := utils.IsFeedAction(&wsktrg); isFeed {
+ trigger.Source = feedname
+ }
trigger.Annotations = filterAnnotations(wsktrg.Annotations)
return trigger
}
-func (yaml *YAML) ComposeParsersDependency(binding whisk.Binding) *Dependency {
+func (yaml *YAML) ComposeParsersDependency(binding whisk.Binding, bPkg
whisk.Package) *Dependency {
dependency := new(Dependency)
dependency.Location = "/" + binding.Namespace + "/" + binding.Name
+ dependency.Inputs = make(map[string]Parameter)
+ for _, keyval := range bPkg.Parameters {
+ param := new(Parameter)
+ param.Value = keyval.Value
+ dependency.Inputs[keyval.Key] = *param
+ }
return dependency
}
@@ -450,7 +459,10 @@ func (yaml *YAML) ComposeParsersRule(wskrule whisk.Rule)
*Rule {
rule := new(Rule)
rule.Name = wskrule.Name
- rule.Action = wskrule.Action.(map[string]interface{})["name"].(string)
+ pa := wskrule.Action.(map[string]interface{})["path"].(string)
+ pa = strings.SplitN(pa, "/", 2)[1]
+
+ rule.Action = pa + "/" +
wskrule.Action.(map[string]interface{})["name"].(string)
rule.Trigger = wskrule.Trigger.(map[string]interface{})["name"].(string)
rule.Annotations = filterAnnotations(wskrule.Annotations)
--
To stop receiving notification emails like this one, please contact
[email protected].
