mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-01-20 18:52:16 +00:00
Code Activity

refactor: move resource loader package to ext (#8780)

Browse source 
Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
This commit is contained in:
Charles-Edouard Brétéché 2023-10-30 18:27:02 +01:00 • committed by GitHub
parent 50c8d20f9c
commit fb530626ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/cli/kubectl-kyverno/exception/load.go
View file

@ -6,8 +6,8 @@ import (
kyvernov2alpha1 "github.com/kyverno/kyverno/api/kyverno/v2alpha1" kyvernov2alpha1 "github.com/kyverno/kyverno/api/kyverno/v2alpha1"
kyvernov2beta1 "github.com/kyverno/kyverno/api/kyverno/v2beta1" kyvernov2beta1 "github.com/kyverno/kyverno/api/kyverno/v2beta1"
"github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/data" "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/data"
resourceloader "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/resource/loader"
"github.com/kyverno/kyverno/ext/resource/convert" "github.com/kyverno/kyverno/ext/resource/convert"
resourceloader "github.com/kyverno/kyverno/ext/resource/loader"
yamlutils "github.com/kyverno/kyverno/ext/yaml" yamlutils "github.com/kyverno/kyverno/ext/yaml"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/kubectl-validate/pkg/openapiclient" "sigs.k8s.io/kubectl-validate/pkg/openapiclient"

2
cmd/cli/kubectl-kyverno/policy/load.go
View file

@ -14,9 +14,9 @@ import (
kyvernov2beta1 "github.com/kyverno/kyverno/api/kyverno/v2beta1" kyvernov2beta1 "github.com/kyverno/kyverno/api/kyverno/v2beta1"
"github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/data" "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/data"
"github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/experimental" "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/experimental"
resourceloader "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/resource/loader"
"github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/source" "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/source"
"github.com/kyverno/kyverno/ext/resource/convert" "github.com/kyverno/kyverno/ext/resource/convert"
resourceloader "github.com/kyverno/kyverno/ext/resource/loader"
extyaml "github.com/kyverno/kyverno/ext/yaml" extyaml "github.com/kyverno/kyverno/ext/yaml"
"github.com/kyverno/kyverno/pkg/utils/git" "github.com/kyverno/kyverno/pkg/utils/git"
yamlutils "github.com/kyverno/kyverno/pkg/utils/yaml" yamlutils "github.com/kyverno/kyverno/pkg/utils/yaml"

2
cmd/cli/kubectl-kyverno/resource/load.go
View file

@ -1,8 +1,8 @@
package resource package resource
import ( import (
"github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/resource/loader"
"github.com/kyverno/kyverno/ext/resource/convert" "github.com/kyverno/kyverno/ext/resource/convert"
"github.com/kyverno/kyverno/ext/resource/loader"
) )
func Load[T any](l loader.Loader, content []byte) (*T, error) { func Load[T any](l loader.Loader, content []byte) (*T, error) {

0
cmd/cli/kubectl-kyverno/resource/loader/loader.go → ext/resource/loader/loader.go
View file

6
cmd/cli/kubectl-kyverno/resource/loader/loader_test.go → ext/resource/loader/loader_test.go
View file

@ -129,7 +129,7 @@ func Test_loader_Load(t *testing.T) {
}, { }, {
name: "unknown GVK", name: "unknown GVK",
loader: newLoader(openapiclient.NewLocalCRDFiles(data.Crds(), "crds")), loader: newLoader(openapiclient.NewLocalCRDFiles(data.Crds(), "crds")),
document: loadFile("../../_testdata/resources/namespace.yaml"), document: loadFile("../../../cmd/cli/kubectl-kyverno/_testdata/resources/namespace.yaml"),
wantErr: true, wantErr: true,
}, { }, {
name: "bad schema", name: "bad schema",
@ -146,8 +146,8 @@ func Test_loader_Load(t *testing.T) {
}, { }, {
name: "ok", name: "ok",
loader: newLoader(openapiclient.NewHardcodedBuiltins("1.27")), loader: newLoader(openapiclient.NewHardcodedBuiltins("1.27")),
document: loadFile("../../_testdata/resources/namespace.yaml"), document: loadFile("../../../cmd/cli/kubectl-kyverno/_testdata/resources/namespace.yaml"),
want: toUnstructured(loadFile("../../_testdata/resources/namespace.yaml")), want: toUnstructured(loadFile("../../../cmd/cli/kubectl-kyverno/_testdata/resources/namespace.yaml")),
}} }}
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {