diff --git a/examples/validation/cue/cue.mod/module.cue b/examples/validation/cue/cue.mod/module.cue index e83c557..39ddda9 100644 --- a/examples/validation/cue/cue.mod/module.cue +++ b/examples/validation/cue/cue.mod/module.cue @@ -2,3 +2,9 @@ module: "validation.cuestomize.dev" language: { version: "v0.14.0" } +deps: { + "cue.dev/x/k8s.io@v0": { + v: "v0.7.0" + default: true + } +} diff --git a/examples/validation/cue/gen.go b/examples/validation/cue/gen.go deleted file mode 100644 index bd521d3..0000000 --- a/examples/validation/cue/gen.go +++ /dev/null @@ -1,5 +0,0 @@ -package stigvalidator - -//go:generate cue get go k8s.io/api/core/v1 -//go:generate cue get go k8s.io/api/apps/v1 -//go:generate cue get go k8s.io/api/batch/v1 diff --git a/examples/validation/cue/pkg/validations/pod_spec.cue b/examples/validation/cue/pkg/validations/pod_spec.cue index a00b6d5..8acaa66 100644 --- a/examples/validation/cue/pkg/validations/pod_spec.cue +++ b/examples/validation/cue/pkg/validations/pod_spec.cue @@ -1,7 +1,7 @@ package validations import ( - api "k8s.io/api/core/v1" + api "cue.dev/x/k8s.io/api/core/v1" ) #STIGPodSpec: api.#PodSpec & { diff --git a/examples/validation/cue/pkg/validations/schemas.cue b/examples/validation/cue/pkg/validations/schemas.cue index cbddfa3..bee5f2b 100644 --- a/examples/validation/cue/pkg/validations/schemas.cue +++ b/examples/validation/cue/pkg/validations/schemas.cue @@ -1,9 +1,9 @@ package validations import ( - api "k8s.io/api/core/v1" - apps "k8s.io/api/apps/v1" - batch "k8s.io/api/batch/v1" + api "cue.dev/x/k8s.io/api/core/v1" + apps "cue.dev/x/k8s.io/api/apps/v1" + batch "cue.dev/x/k8s.io/api/batch/v1" ) // #STIGPod is a Kubernetes Pod respecting STIG requirements diff --git a/gen.go b/gen.go deleted file mode 100644 index 1c3ed4f..0000000 --- a/gen.go +++ /dev/null @@ -1,4 +0,0 @@ -package main - -//go:generate ./hack/generate-testdata.sh -//go:generate ./hack/generate-examples.sh diff --git a/hack/generate-cue-modules.sh b/hack/generate-cue-modules.sh deleted file mode 100755 index 3573e44..0000000 --- a/hack/generate-cue-modules.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -set -e - -if [ "$#" -lt 2 ]; then - echo "Usage: $0 [dir-suffix]" - exit 1 -fi - -which cue >/dev/null || { echo "cue command not found in PATH."; exit 1; } - -dir_suffix=${3} - -cd "$1" - -for dir in */; do - mkdir -p "$dir/${dir_suffix}" - pushd "$dir/${dir_suffix}" - - cue mod init cue.k8s.example || true - # clean the cue generated files - rm -fr cue.mod/gen || true - cue get go "$2" - cue mod tidy || echo "cue mod tidy failed, continuing..." - cue fmt ./... || true - - popd -done diff --git a/hack/generate-examples.sh b/hack/generate-examples.sh deleted file mode 100755 index 0b27044..0000000 --- a/hack/generate-examples.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -e - -./hack/generate-cue-modules.sh ./examples ../../../api cue diff --git a/hack/generate-testdata.sh b/hack/generate-testdata.sh deleted file mode 100755 index 94e13e0..0000000 --- a/hack/generate-testdata.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -e - -./hack/generate-cue-modules.sh ./testdata/function/cue-modules ../../../../api diff --git a/semver b/semver index e07d136..45a9970 100644 --- a/semver +++ b/semver @@ -1 +1 @@ -v0.6.0 \ No newline at end of file +v0.6.1 \ No newline at end of file