From 0a241fab3e3f82b2edf0e8acbe31f5db9dbe25d9 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Fri, 9 Jul 2021 16:56:33 +0200 Subject: [PATCH] Fix 2 small mistakes in envoy error messages --- pkg/envoy/store/rbac_rule_marshal.go | 3 ++- pkg/envoy/yaml/rbac_rules_marshal.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/envoy/store/rbac_rule_marshal.go b/pkg/envoy/store/rbac_rule_marshal.go index 205caa1be..1ba3156d3 100644 --- a/pkg/envoy/store/rbac_rule_marshal.go +++ b/pkg/envoy/store/rbac_rule_marshal.go @@ -189,6 +189,7 @@ func (n *rbacRule) Encode(ctx context.Context, pl *payload) (err error) { // return resource.ComposeNamespaceErrUnresolved(n.res.RefPath[1].Identifiers) //} + //// //p2 := resource.FindComposeRecord(pl.state.ParentResources, n.res.RefResource.Identifiers) //if p2 == nil { // return resource.ComposeNamespaceErrUnresolved(n.res.RefResource.Identifiers) @@ -196,7 +197,7 @@ func (n *rbacRule) Encode(ctx context.Context, pl *payload) (err error) { // //res.Resource = composeTypes.RecordRbacResource(p0.ID, p1.ID, p2.ID) case composeTypes.ModuleFieldResourceType: - return fmt.Errorf("importing rbac rules on record level is not supported") + return fmt.Errorf("importing rbac rules on module field level is not supported") //p0 := resource.FindComposeNamespace(pl.state.ParentResources, n.res.RefPath[0].Identifiers) //if p0 == nil { // return resource.ComposeNamespaceErrUnresolved(n.res.RefPath[0].Identifiers) diff --git a/pkg/envoy/yaml/rbac_rules_marshal.go b/pkg/envoy/yaml/rbac_rules_marshal.go index 0152e7dee..9564176d9 100644 --- a/pkg/envoy/yaml/rbac_rules_marshal.go +++ b/pkg/envoy/yaml/rbac_rules_marshal.go @@ -138,7 +138,7 @@ func (r *rbacRule) Encode(ctx context.Context, doc *Document, state *envoy.Resou case composeTypes.RecordResourceType: return fmt.Errorf("importing rbac rules on record level is not supported") case composeTypes.ModuleFieldResourceType: - return fmt.Errorf("importing rbac rules on record level is not supported") + return fmt.Errorf("importing rbac rules on module field level is not supported") case systemTypes.UserResourceType: if res.RefResource != nil { p1 := resource.FindUser(state.ParentResources, res.RefResource.Identifiers)