diff --git a/.prekignore b/.prekignore new file mode 100644 index 0000000000..48b8bf9072 --- /dev/null +++ b/.prekignore @@ -0,0 +1 @@ +vendor/ diff --git a/src/internal/template/testdata/invalid/input.yaml b/src/internal/template/testdata/invalid/input.yaml deleted file mode 100644 index 444d40c0fc..0000000000 --- a/src/internal/template/testdata/invalid/input.yaml +++ /dev/null @@ -1 +0,0 @@ -name: {{ .Values.missing \ No newline at end of file diff --git a/src/pkg/packager/actions/actions.go b/src/pkg/packager/actions/actions.go index 798c72dcda..fe6d66b0ea 100644 --- a/src/pkg/packager/actions/actions.go +++ b/src/pkg/packager/actions/actions.go @@ -20,8 +20,8 @@ import ( "github.com/goccy/go-yaml" "github.com/zarf-dev/zarf/src/api/v1alpha1" ptmpl "github.com/zarf-dev/zarf/src/internal/packager/template" - "github.com/zarf-dev/zarf/src/internal/template" "github.com/zarf-dev/zarf/src/pkg/logger" + "github.com/zarf-dev/zarf/src/pkg/template" "github.com/zarf-dev/zarf/src/pkg/utils" "github.com/zarf-dev/zarf/src/pkg/utils/exec" "github.com/zarf-dev/zarf/src/pkg/value" diff --git a/src/pkg/packager/assemble/assemble.go b/src/pkg/packager/assemble/assemble.go index 9fb2d53a95..91d4439c9f 100644 --- a/src/pkg/packager/assemble/assemble.go +++ b/src/pkg/packager/assemble/assemble.go @@ -33,7 +33,6 @@ import ( "github.com/zarf-dev/zarf/src/internal/git" "github.com/zarf-dev/zarf/src/internal/packager/helm" "github.com/zarf-dev/zarf/src/internal/packager/kustomize" - "github.com/zarf-dev/zarf/src/internal/template" "github.com/zarf-dev/zarf/src/pkg/archive" "github.com/zarf-dev/zarf/src/pkg/images" "github.com/zarf-dev/zarf/src/pkg/logger" @@ -42,6 +41,7 @@ import ( "github.com/zarf-dev/zarf/src/pkg/packager/layout" "github.com/zarf-dev/zarf/src/pkg/packager/load" "github.com/zarf-dev/zarf/src/pkg/signing" + "github.com/zarf-dev/zarf/src/pkg/template" "github.com/zarf-dev/zarf/src/pkg/transform" "github.com/zarf-dev/zarf/src/pkg/utils" "github.com/zarf-dev/zarf/src/pkg/value" diff --git a/src/pkg/packager/deploy.go b/src/pkg/packager/deploy.go index cd7a3fb306..0172b8a308 100644 --- a/src/pkg/packager/deploy.go +++ b/src/pkg/packager/deploy.go @@ -22,7 +22,6 @@ import ( "github.com/zarf-dev/zarf/src/internal/packager/helm" "github.com/zarf-dev/zarf/src/internal/packager/requirements" ptmpl "github.com/zarf-dev/zarf/src/internal/packager/template" - "github.com/zarf-dev/zarf/src/internal/template" "github.com/zarf-dev/zarf/src/pkg/cluster" "github.com/zarf-dev/zarf/src/pkg/feature" "github.com/zarf-dev/zarf/src/pkg/images" @@ -32,6 +31,7 @@ import ( "github.com/zarf-dev/zarf/src/pkg/packager/layout" "github.com/zarf-dev/zarf/src/pkg/pki" "github.com/zarf-dev/zarf/src/pkg/state" + "github.com/zarf-dev/zarf/src/pkg/template" "github.com/zarf-dev/zarf/src/pkg/transform" "github.com/zarf-dev/zarf/src/pkg/utils" "github.com/zarf-dev/zarf/src/pkg/value" diff --git a/src/pkg/packager/find_images.go b/src/pkg/packager/find_images.go index 9151df14ed..cbb38cf809 100644 --- a/src/pkg/packager/find_images.go +++ b/src/pkg/packager/find_images.go @@ -23,12 +23,12 @@ import ( "github.com/zarf-dev/zarf/src/config" "github.com/zarf-dev/zarf/src/internal/packager/helm" "github.com/zarf-dev/zarf/src/internal/packager/template" - itpl "github.com/zarf-dev/zarf/src/internal/template" "github.com/zarf-dev/zarf/src/pkg/images" "github.com/zarf-dev/zarf/src/pkg/logger" "github.com/zarf-dev/zarf/src/pkg/packager/layout" "github.com/zarf-dev/zarf/src/pkg/packager/load" "github.com/zarf-dev/zarf/src/pkg/state" + itpl "github.com/zarf-dev/zarf/src/pkg/template" "github.com/zarf-dev/zarf/src/pkg/transform" "github.com/zarf-dev/zarf/src/pkg/utils" "github.com/zarf-dev/zarf/src/pkg/value" diff --git a/src/pkg/packager/inspect.go b/src/pkg/packager/inspect.go index 826bc6e5a6..41a82cfc73 100644 --- a/src/pkg/packager/inspect.go +++ b/src/pkg/packager/inspect.go @@ -15,12 +15,12 @@ import ( "github.com/zarf-dev/zarf/src/config" "github.com/zarf-dev/zarf/src/internal/packager/helm" "github.com/zarf-dev/zarf/src/internal/packager/template" - tmpl "github.com/zarf-dev/zarf/src/internal/template" "github.com/zarf-dev/zarf/src/pkg/feature" "github.com/zarf-dev/zarf/src/pkg/packager/assemble" "github.com/zarf-dev/zarf/src/pkg/packager/layout" "github.com/zarf-dev/zarf/src/pkg/packager/load" "github.com/zarf-dev/zarf/src/pkg/state" + tmpl "github.com/zarf-dev/zarf/src/pkg/template" "github.com/zarf-dev/zarf/src/pkg/utils" "github.com/zarf-dev/zarf/src/pkg/value" "github.com/zarf-dev/zarf/src/pkg/variables" diff --git a/src/pkg/packager/remove.go b/src/pkg/packager/remove.go index f773c52ffb..54a8b95a2a 100644 --- a/src/pkg/packager/remove.go +++ b/src/pkg/packager/remove.go @@ -14,10 +14,10 @@ import ( "github.com/zarf-dev/zarf/src/internal/packager/helm" "github.com/zarf-dev/zarf/src/internal/packager/requirements" - "github.com/zarf-dev/zarf/src/internal/template" "github.com/zarf-dev/zarf/src/pkg/feature" "github.com/zarf-dev/zarf/src/pkg/logger" "github.com/zarf-dev/zarf/src/pkg/state" + "github.com/zarf-dev/zarf/src/pkg/template" "github.com/zarf-dev/zarf/src/pkg/value" "helm.sh/helm/v4/pkg/storage/driver" diff --git a/src/pkg/packager/values_preflight.go b/src/pkg/packager/values_preflight.go index c7524ab9de..d685d6be53 100644 --- a/src/pkg/packager/values_preflight.go +++ b/src/pkg/packager/values_preflight.go @@ -15,8 +15,8 @@ import ( "github.com/zarf-dev/zarf/src/api/v1alpha1" "github.com/zarf-dev/zarf/src/config" "github.com/zarf-dev/zarf/src/internal/packager/helm" - "github.com/zarf-dev/zarf/src/internal/template" "github.com/zarf-dev/zarf/src/pkg/packager/layout" + "github.com/zarf-dev/zarf/src/pkg/template" "github.com/zarf-dev/zarf/src/pkg/utils" "github.com/zarf-dev/zarf/src/pkg/value" ) diff --git a/src/internal/template/refs.go b/src/pkg/template/refs.go similarity index 100% rename from src/internal/template/refs.go rename to src/pkg/template/refs.go diff --git a/src/internal/template/refs_test.go b/src/pkg/template/refs_test.go similarity index 100% rename from src/internal/template/refs_test.go rename to src/pkg/template/refs_test.go diff --git a/src/internal/template/template.go b/src/pkg/template/template.go similarity index 100% rename from src/internal/template/template.go rename to src/pkg/template/template.go diff --git a/src/internal/template/template_test.go b/src/pkg/template/template_test.go similarity index 100% rename from src/internal/template/template_test.go rename to src/pkg/template/template_test.go diff --git a/src/internal/template/testdata/configmap/expected.yaml b/src/pkg/template/testdata/configmap/expected.yaml similarity index 81% rename from src/internal/template/testdata/configmap/expected.yaml rename to src/pkg/template/testdata/configmap/expected.yaml index 9fba3574a6..c61f1f5c70 100644 --- a/src/internal/template/testdata/configmap/expected.yaml +++ b/src/pkg/template/testdata/configmap/expected.yaml @@ -3,4 +3,4 @@ kind: ConfigMap metadata: name: my-config data: - port: "8080" \ No newline at end of file + port: "8080" diff --git a/src/internal/template/testdata/configmap/input.yaml b/src/pkg/template/testdata/configmap/input.yaml similarity index 70% rename from src/internal/template/testdata/configmap/input.yaml rename to src/pkg/template/testdata/configmap/input.yaml index 815faf27a7..084b4c7d82 100644 --- a/src/internal/template/testdata/configmap/input.yaml +++ b/src/pkg/template/testdata/configmap/input.yaml @@ -3,4 +3,4 @@ kind: ConfigMap metadata: name: {{ .Values.app.name }} data: - port: "{{ .Values.app.port }}" \ No newline at end of file + port: "{{ .Values.app.port }}" diff --git a/src/internal/template/testdata/constants/expected.yaml b/src/pkg/template/testdata/constants/expected.yaml similarity index 100% rename from src/internal/template/testdata/constants/expected.yaml rename to src/pkg/template/testdata/constants/expected.yaml diff --git a/src/internal/template/testdata/constants/input.yaml b/src/pkg/template/testdata/constants/input.yaml similarity index 100% rename from src/internal/template/testdata/constants/input.yaml rename to src/pkg/template/testdata/constants/input.yaml diff --git a/src/internal/template/testdata/deployment/expected.yaml b/src/pkg/template/testdata/deployment/expected.yaml similarity index 85% rename from src/internal/template/testdata/deployment/expected.yaml rename to src/pkg/template/testdata/deployment/expected.yaml index e1430d0b7b..108648b133 100644 --- a/src/internal/template/testdata/deployment/expected.yaml +++ b/src/pkg/template/testdata/deployment/expected.yaml @@ -7,4 +7,4 @@ spec: replicas: 3 selector: matchLabels: - app: my-deployment \ No newline at end of file + app: my-deployment diff --git a/src/internal/template/testdata/deployment/input.yaml b/src/pkg/template/testdata/deployment/input.yaml similarity index 85% rename from src/internal/template/testdata/deployment/input.yaml rename to src/pkg/template/testdata/deployment/input.yaml index 678240e6d2..fb79c78432 100644 --- a/src/internal/template/testdata/deployment/input.yaml +++ b/src/pkg/template/testdata/deployment/input.yaml @@ -7,4 +7,4 @@ spec: replicas: {{ .Values.app.replicas }} selector: matchLabels: - app: {{ .Values.app.name }} \ No newline at end of file + app: {{ .Values.app.name }} diff --git a/src/pkg/template/testdata/invalid/input.yaml b/src/pkg/template/testdata/invalid/input.yaml new file mode 100644 index 0000000000..b73de01548 --- /dev/null +++ b/src/pkg/template/testdata/invalid/input.yaml @@ -0,0 +1 @@ +name: {{ .Values.missing diff --git a/src/internal/template/testdata/sprig-basic/expected.yaml b/src/pkg/template/testdata/sprig-basic/expected.yaml similarity index 78% rename from src/internal/template/testdata/sprig-basic/expected.yaml rename to src/pkg/template/testdata/sprig-basic/expected.yaml index 0c695568a7..a48ba3ca70 100644 --- a/src/internal/template/testdata/sprig-basic/expected.yaml +++ b/src/pkg/template/testdata/sprig-basic/expected.yaml @@ -3,4 +3,4 @@ message: Hello World count: 3 first: 1 last: 3 -quoted: "hello" \ No newline at end of file +quoted: "hello" diff --git a/src/internal/template/testdata/sprig-basic/input.yaml b/src/pkg/template/testdata/sprig-basic/input.yaml similarity index 83% rename from src/internal/template/testdata/sprig-basic/input.yaml rename to src/pkg/template/testdata/sprig-basic/input.yaml index d249984e14..3d31281046 100644 --- a/src/internal/template/testdata/sprig-basic/input.yaml +++ b/src/pkg/template/testdata/sprig-basic/input.yaml @@ -3,4 +3,4 @@ message: {{ .Values.message | title }} count: {{ .Values.numbers | len }} first: {{ .Values.numbers | first }} last: {{ .Values.numbers | last }} -quoted: {{ .Values.text | quote }} \ No newline at end of file +quoted: {{ .Values.text | quote }} diff --git a/src/internal/template/testdata/sprig-functions/expected.yaml b/src/pkg/template/testdata/sprig-functions/expected.yaml similarity index 91% rename from src/internal/template/testdata/sprig-functions/expected.yaml rename to src/pkg/template/testdata/sprig-functions/expected.yaml index ed2d13ca9f..4ad9c5959a 100644 --- a/src/internal/template/testdata/sprig-functions/expected.yaml +++ b/src/pkg/template/testdata/sprig-functions/expected.yaml @@ -11,4 +11,4 @@ data: timestamp: "2023-01-01" random: abc12345 joined: "apple,banana,cherry" - default-value: "fallback" \ No newline at end of file + default-value: "fallback" diff --git a/src/internal/template/testdata/sprig-functions/input.yaml b/src/pkg/template/testdata/sprig-functions/input.yaml similarity index 100% rename from src/internal/template/testdata/sprig-functions/input.yaml rename to src/pkg/template/testdata/sprig-functions/input.yaml