Allow non handle identifiers for related resources
This commit is contained in:
@@ -169,7 +169,7 @@ func (wrap *composeChartConfigReport) UnmarshalYAML(n *yaml.Node) error {
|
||||
// custom decoder for referenced module
|
||||
// we'll copy this to the dedicated prop of the wrapping structure
|
||||
// so that the parent decoder can collect it
|
||||
return decodeRef(v, "chart report module", &wrap.refModule)
|
||||
return y7s.DecodeScalar(v, "chart report module", &wrap.refModule)
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -83,10 +83,10 @@ func (wrap *composePage) UnmarshalYAML(n *yaml.Node) (err error) {
|
||||
return y7s.DecodeScalar(v, "page handle", &wrap.res.Handle)
|
||||
|
||||
case "module":
|
||||
return decodeRef(v, "page module", &wrap.refModule)
|
||||
return y7s.DecodeScalar(v, "page module", &wrap.refModule)
|
||||
|
||||
case "parent", "selfid":
|
||||
return decodeRef(v, "page parent", &wrap.refParent)
|
||||
return y7s.DecodeScalar(v, "page parent", &wrap.refParent)
|
||||
|
||||
case "weight", "order":
|
||||
return y7s.DecodeScalar(v, "page weight", &wrap.res.Weight)
|
||||
|
||||
@@ -23,7 +23,7 @@ func (wset *composeRecordSet) UnmarshalYAML(n *yaml.Node) error {
|
||||
return y7s.NodeErr(n, "malformed record definition")
|
||||
}
|
||||
|
||||
if err = decodeRef(k, "module", &moduleRef); err != nil {
|
||||
if err = y7s.DecodeScalar(k, "module", &moduleRef); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -77,7 +77,7 @@ func (wrap *composeRecord) UnmarshalYAML(n *yaml.Node) (err error) {
|
||||
return y7s.DecodeScalar(v, "recordID", &wrap.id)
|
||||
|
||||
case "module":
|
||||
return decodeRef(v, "module", &wrap.refModule)
|
||||
return y7s.DecodeScalar(v, "module", &wrap.refModule)
|
||||
|
||||
case "allow", "deny":
|
||||
return errors.New("compose record RBAC rules not supported on resource level")
|
||||
|
||||
Reference in New Issue
Block a user