From 3444ac30213e44390f05bb5d2ba8d8940688d3f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toma=C5=BE=20Jerman?= Date: Wed, 2 Dec 2020 09:58:50 +0100 Subject: [PATCH] Rename conditional envoy processing property --- pkg/envoy/store/compose_record.go | 8 ++++---- tests/envoy/testdata/simple/records_conditional.yaml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/envoy/store/compose_record.go b/pkg/envoy/store/compose_record.go index bde6d8caf..75ef952c0 100644 --- a/pkg/envoy/store/compose_record.go +++ b/pkg/envoy/store/compose_record.go @@ -23,7 +23,7 @@ type ( relMod *types.Module // Little helper flag for conditional encoding - modEmpty bool + missing bool } ) @@ -50,7 +50,7 @@ func (n *composeRecordState) Prepare(ctx context.Context, s store.Storer, state return composeNamespaceErrUnresolved(n.res.NsRef.Identifiers) } - n.modEmpty = true + n.missing = true n.relMod = findComposeModuleR(state.ParentResources, n.res.ModRef.Identifiers) if n.relMod == nil && n.relNS.ID > 0 { n.relMod, err = findComposeModuleS(ctx, s, n.relNS.ID, makeGenericFilter(n.res.ModRef.Identifiers)) @@ -73,7 +73,7 @@ func (n *composeRecordState) Prepare(ctx context.Context, s store.Storer, state if err != nil && err != store.ErrNotFound { return err } - n.modEmpty = len(rr) == 0 + n.missing = len(rr) == 0 } } @@ -158,7 +158,7 @@ func (n *composeRecordState) Encode(ctx context.Context, s store.Storer, state * } // @todo expand this skip, err := evl.EvalBool(ctx, map[string]interface{}{ - "empty": n.modEmpty, + "missing": n.missing, }) if err != nil { return err diff --git a/tests/envoy/testdata/simple/records_conditional.yaml b/tests/envoy/testdata/simple/records_conditional.yaml index d86c2143e..4c617c794 100644 --- a/tests/envoy/testdata/simple/records_conditional.yaml +++ b/tests/envoy/testdata/simple/records_conditional.yaml @@ -2,12 +2,12 @@ namespace: ns1 records: mod1: - (envoy): - skipIf: "!empty" + skipIf: "!missing" values: f1: f1 value mod2: - (envoy): - skipIf: "!empty" + skipIf: "!missing" values: f1: f1 value