openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pde...@apache.org
Subject [incubator-openwhisk-wskdeploy] branch master updated: Add assets tags when exported (#789)
Date Wed, 14 Mar 2018 01:14:35 GMT
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 029c4af  Add assets tags when exported (#789)
029c4af is described below

commit 029c4afa9355ac77f1170c47593dfe5f73872f6c
Author: kpavel <kpavel@il.ibm.com>
AuthorDate: Wed Mar 14 03:14:33 2018 +0200

    Add assets tags when exported (#789)
    
    filter managed annotations during export
---
 parsers/yamlparser.go | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/parsers/yamlparser.go b/parsers/yamlparser.go
index 2267e06..b8a58b6 100644
--- a/parsers/yamlparser.go
+++ b/parsers/yamlparser.go
@@ -19,6 +19,7 @@ package parsers
 
 import (
 	"github.com/apache/incubator-openwhisk-client-go/whisk"
+	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
 	"github.com/apache/incubator-openwhisk-wskdeploy/wskenv"
 )
 
@@ -353,6 +354,17 @@ func (pkg *Package) GetApis() []*whisk.Api {
 }
 
 //********************YAML functions*************************//
+func filterAnnotations(annotations whisk.KeyValueArr) map[string]interface{} {
+	res := make(map[string]interface{})
+	for _, a := range annotations {
+		if a.Key != utils.MANAGED {
+			res[a.Key] = a.Value
+		}
+	}
+
+	return res
+}
+
 func (yaml *YAML) ComposeParsersPackage(wskpag whisk.Package) *Package {
 	pkg := new(Package)
 	pkg.Packagename = wskpag.Name
@@ -365,6 +377,7 @@ func (yaml *YAML) ComposeParsersPackage(wskpag whisk.Package) *Package
{
 		pkg.Inputs[keyval.Key] = *param
 	}
 
+	pkg.Annotations = filterAnnotations(wskpag.Annotations)
 	return pkg
 }
 
@@ -382,6 +395,7 @@ func (yaml *YAML) ComposeParsersAction(wskact whisk.Action) *Action {
 		action.Inputs[keyval.Key] = *param
 	}
 
+	action.Annotations = filterAnnotations(wskact.Annotations)
 	return action
 }
 
@@ -396,6 +410,7 @@ func (yaml *YAML) ComposeParsersTrigger(wsktrg whisk.Trigger) *Trigger
{
 		trigger.Inputs[keyval.Key] = *param
 	}
 
+	trigger.Annotations = filterAnnotations(wsktrg.Annotations)
 	return trigger
 }
 
@@ -406,5 +421,6 @@ func (yaml *YAML) ComposeParsersRule(wskrule whisk.Rule) *Rule {
 	rule.Action = wskrule.Action.(map[string]interface{})["name"].(string)
 	rule.Trigger = wskrule.Trigger.(map[string]interface{})["name"].(string)
 
+	rule.Annotations = filterAnnotations(wskrule.Annotations)
 	return rule
 }

-- 
To stop receiving notification emails like this one, please contact
pdesai@apache.org.

Mime
View raw message