Handle multiple conditions in policies (#7079)

Fixes #7078
This commit is contained in:
Harshavardhana
2019-01-17 23:58:24 +05:30
committed by kannappanr
parent 98c950aacd
commit 1a7e6d4768
2 changed files with 63 additions and 2 deletions

View File

@@ -71,7 +71,13 @@ func (functions Functions) MarshalJSON() ([]byte, error) {
nm := make(map[name]map[Key]ValueSet)
for _, f := range functions {
nm[f.name()] = f.toMap()
if _, ok := nm[f.name()]; ok {
for k, v := range f.toMap() {
nm[f.name()][k] = v
}
} else {
nm[f.name()] = f.toMap()
}
}
return json.Marshal(nm)