From a47c1112e15b3aa3e7ab64ea0d12379d73431321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toma=C5=BE=20Jerman?= Date: Fri, 14 Jan 2022 15:28:34 +0100 Subject: [PATCH] Allow non handle identifiers for related resources --- pkg/envoy/yaml/compose_chart_unmarshal.go | 2 +- pkg/envoy/yaml/compose_page_unmarshal.go | 4 ++-- pkg/envoy/yaml/compose_record_unmarshal.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/envoy/yaml/compose_chart_unmarshal.go b/pkg/envoy/yaml/compose_chart_unmarshal.go index 39009d3f5..7817fc8c5 100644 --- a/pkg/envoy/yaml/compose_chart_unmarshal.go +++ b/pkg/envoy/yaml/compose_chart_unmarshal.go @@ -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) } diff --git a/pkg/envoy/yaml/compose_page_unmarshal.go b/pkg/envoy/yaml/compose_page_unmarshal.go index 7e6a22760..5444dd8d8 100644 --- a/pkg/envoy/yaml/compose_page_unmarshal.go +++ b/pkg/envoy/yaml/compose_page_unmarshal.go @@ -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) diff --git a/pkg/envoy/yaml/compose_record_unmarshal.go b/pkg/envoy/yaml/compose_record_unmarshal.go index 42c10fa89..85ba4b8d7 100644 --- a/pkg/envoy/yaml/compose_record_unmarshal.go +++ b/pkg/envoy/yaml/compose_record_unmarshal.go @@ -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")