From f8f40807bc937ec8dd9ac8104219025132ba3595 Mon Sep 17 00:00:00 2001 From: mrjoelkamp Date: Mon, 22 Apr 2024 14:16:45 -0500 Subject: [PATCH] feat: pr comments --- pkg/policy/rego.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkg/policy/rego.go b/pkg/policy/rego.go index 3dd42e2..fc9141a 100644 --- a/pkg/policy/rego.go +++ b/pkg/policy/rego.go @@ -206,18 +206,13 @@ func verifyIntotoEnvelope(rCtx rego.BuiltinContext, envTerm, keysTerm *ast.Term) return ast.NewTerm(value), nil } -// copied from opa func loadYAML(path string, bs []byte) (interface{}, error) { + var x interface{} bs, err := yaml.YAMLToJSON(bs) if err != nil { return nil, fmt.Errorf("%v: error converting YAML to JSON: %v", path, err) } - return loadJSON(path, bs) -} - -func loadJSON(path string, bs []byte) (interface{}, error) { - var x interface{} - err := opa.UnmarshalJSON(bs, &x) + err = opa.UnmarshalJSON(bs, &x) if err != nil { return nil, fmt.Errorf("%s: %w", path, err) }