refactor: move jp extensions in a top level package (kyverno#490)

Signed-off-by: Charles-Edouard Brétéché <[email protected]>
eddycharly · Sep 19, 2024 · 4a9eb50 · 4a9eb50
1 parent 42154f1
commit 4a9eb50
Show file tree

Hide file tree

Showing 22 changed files with 12 additions and 10 deletions.
diff --git a/pkg/commands/jp/function/command.go b/pkg/commands/jp/function/command.go
@@ -10,7 +10,7 @@ import (
 
 	jpfunctions "github.com/jmespath-community/go-jmespath/pkg/functions"
 	"github.com/kyverno/kyverno-json/pkg/command"
-	"github.com/kyverno/kyverno-json/pkg/engine/template"
+	"github.com/kyverno/kyverno-json/pkg/jp"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/util/sets"
 )
@@ -59,7 +59,7 @@ func functionString(f jpfunctions.FunctionEntry) string {
 }
 
 func printFunctions(out io.Writer, names ...string) {
-	funcs := template.GetFunctions(context.Background())
+	funcs := jp.GetFunctions(context.Background())
 	slices.SortFunc(funcs, func(a, b jpfunctions.FunctionEntry) int {
 		return cmp.Compare(functionString(a), functionString(b))
 	})

diff --git a/pkg/engine/assert/binding.go b/pkg/engine/assert/binding.go
@@ -5,11 +5,12 @@ import (
 
 	"github.com/jmespath-community/go-jmespath/pkg/binding"
 	"github.com/kyverno/kyverno-json/pkg/engine/template"
+	"github.com/kyverno/kyverno-json/pkg/jp"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )
 
 func NewContextBinding(path *field.Path, bindings binding.Bindings, value any, entry any, opts ...template.Option) binding.Binding {
-	return template.NewLazyBinding(
+	return jp.NewLazyBinding(
 		func() (any, error) {
 			expression := parseExpression(context.TODO(), entry)
 			if expression != nil && expression.engine != "" {

diff --git a/pkg/engine/template/options.go b/pkg/engine/template/options.go
@@ -4,10 +4,11 @@ import (
 	"context"
 
 	"github.com/jmespath-community/go-jmespath/pkg/interpreter"
+	"github.com/kyverno/kyverno-json/pkg/jp"
 )
 
 var (
-	funcs         = GetFunctions(context.Background())
+	funcs         = jp.GetFunctions(context.Background())
 	defaultCaller = interpreter.NewFunctionCaller(funcs...)
 )
 

diff --git a/pkg/engine/template/binding.go → pkg/jp/binding.go b/pkg/engine/template/binding.go → pkg/jp/binding.go
@@ -1,4 +1,4 @@
-package template
+package jp
 
 import (
 	"sync"

diff --git a/pkg/engine/template/functions.go → pkg/jp/functions.go b/pkg/engine/template/functions.go → pkg/jp/functions.go
@@ -1,11 +1,11 @@
-package template
+package jp
 
 import (
 	"context"
 
 	jpfunctions "github.com/jmespath-community/go-jmespath/pkg/functions"
-	"github.com/kyverno/kyverno-json/pkg/engine/template/functions"
-	kyvernofunctions "github.com/kyverno/kyverno-json/pkg/engine/template/kyverno"
+	"github.com/kyverno/kyverno-json/pkg/jp/functions"
+	kyvernofunctions "github.com/kyverno/kyverno-json/pkg/jp/kyverno"
 )
 
 func GetFunctions(ctx context.Context) []jpfunctions.FunctionEntry {

diff --git a/pkg/engine/template/functions/at.go → pkg/jp/functions/at.go b/pkg/engine/template/functions/at.go → pkg/jp/functions/at.go
diff --git a/pkg/engine/template/functions/concat.go → pkg/jp/functions/concat.go b/pkg/engine/template/functions/concat.go → pkg/jp/functions/concat.go
diff --git a/pkg/engine/template/functions/functions.go → pkg/jp/functions/functions.go b/pkg/engine/template/functions/functions.go → pkg/jp/functions/functions.go
diff --git a/pkg/engine/template/functions/json_parse.go → pkg/jp/functions/json_parse.go b/pkg/engine/template/functions/json_parse.go → pkg/jp/functions/json_parse.go
diff --git a/pkg/engine/template/functions/wildcard.go → pkg/jp/functions/wildcard.go b/pkg/engine/template/functions/wildcard.go → pkg/jp/functions/wildcard.go
diff --git a/pkg/engine/template/kyverno/arithmetic.go → pkg/jp/kyverno/arithmetic.go b/pkg/engine/template/kyverno/arithmetic.go → pkg/jp/kyverno/arithmetic.go
diff --git a/...ngine/template/kyverno/arithmetic_test.go → pkg/jp/kyverno/arithmetic_test.go b/...ngine/template/kyverno/arithmetic_test.go → pkg/jp/kyverno/arithmetic_test.go
diff --git a/pkg/engine/template/kyverno/error.go → pkg/jp/kyverno/error.go b/pkg/engine/template/kyverno/error.go → pkg/jp/kyverno/error.go
diff --git a/pkg/engine/template/kyverno/functionentry.go → pkg/jp/kyverno/functionentry.go b/pkg/engine/template/kyverno/functionentry.go → pkg/jp/kyverno/functionentry.go
diff --git a/...ne/template/kyverno/functionentry_test.go → pkg/jp/kyverno/functionentry_test.go b/...ne/template/kyverno/functionentry_test.go → pkg/jp/kyverno/functionentry_test.go
diff --git a/pkg/engine/template/kyverno/functions.go → pkg/jp/kyverno/functions.go b/pkg/engine/template/kyverno/functions.go → pkg/jp/kyverno/functions.go
diff --git a/...engine/template/kyverno/functions_test.go → pkg/jp/kyverno/functions_test.go b/...engine/template/kyverno/functions_test.go → pkg/jp/kyverno/functions_test.go
diff --git a/pkg/engine/template/kyverno/time.go → pkg/jp/kyverno/time.go b/pkg/engine/template/kyverno/time.go → pkg/jp/kyverno/time.go
diff --git a/pkg/engine/template/kyverno/time_test.go → pkg/jp/kyverno/time_test.go b/pkg/engine/template/kyverno/time_test.go → pkg/jp/kyverno/time_test.go
diff --git a/pkg/engine/template/kyverno/utils.go → pkg/jp/kyverno/utils.go b/pkg/engine/template/kyverno/utils.go → pkg/jp/kyverno/utils.go
diff --git a/pkg/engine/template/kyverno/utils_test.go → pkg/jp/kyverno/utils_test.go b/pkg/engine/template/kyverno/utils_test.go → pkg/jp/kyverno/utils_test.go
diff --git a/website/jp/main.go b/website/jp/main.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	jpfunctions "github.com/jmespath-community/go-jmespath/pkg/functions"
-	"github.com/kyverno/kyverno-json/pkg/engine/template/functions"
-	kyvernofunctions "github.com/kyverno/kyverno-json/pkg/engine/template/kyverno"
+	"github.com/kyverno/kyverno-json/pkg/jp/functions"
+	kyvernofunctions "github.com/kyverno/kyverno-json/pkg/jp/kyverno"
 )
 
 func main() {