Use DepProvider in tests to access kyaml impls.

This commit is contained in:
jregan
2020-11-21 14:49:44 -08:00
parent 7e01aec5a4
commit a5f3d5c823
21 changed files with 115 additions and 155 deletions

View File

@@ -5,17 +5,18 @@ package build
import (
"github.com/spf13/pflag"
"sigs.k8s.io/kustomize/api/konfig"
)
var (
flagEnableKyamlValue = false
flagEnableKyamlValue = konfig.FlagEnableKyamlDefaultValue
)
func addFlagEnableKyaml(set *pflag.FlagSet) {
set.BoolVar(
&flagEnableKyamlValue,
"enable_kyaml", // flag name
false, // default value
"enable_kyaml", // flag name
konfig.FlagEnableKyamlDefaultValue, // default value
"enable dependence on kyaml instead of k8sdeps.", // help
)
}

View File

@@ -8,14 +8,12 @@ import (
"flag"
"os"
"sigs.k8s.io/kustomize/cmd/config/configcobra"
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/api/k8sdeps/validator"
"sigs.k8s.io/kustomize/api/konfig"
"sigs.k8s.io/kustomize/api/provider"
"sigs.k8s.io/kustomize/cmd/config/completion"
"sigs.k8s.io/kustomize/cmd/config/configcobra"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/build"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/create"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit"
@@ -36,13 +34,13 @@ Manages declarative configuration of Kubernetes.
See https://sigs.k8s.io/kustomize
`,
}
uf := kunstruct.NewKunstructuredFactoryImpl()
v := validator.NewKustValidator()
pvd := provider.NewDefaultDepProvider()
c.AddCommand(
completion.NewCommand(),
build.NewCmdBuild(stdOut),
edit.NewCmdEdit(fSys, v, uf),
create.NewCmdCreate(fSys, uf),
edit.NewCmdEdit(
fSys, pvd.GetFieldValidator(), pvd.GetKunstructuredFactory()),
create.NewCmdCreate(fSys, pvd.GetKunstructuredFactory()),
version.NewCmdVersion(stdOut),
openapi.NewCmdOpenAPI(stdOut),
)

View File

@@ -8,12 +8,12 @@ import (
"testing"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/api/provider"
"sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
)
var factory = kunstruct.NewKunstructuredFactoryImpl()
var factory = provider.NewDefaultDepProvider().GetKunstructuredFactory()
func readKustomizationFS(t *testing.T, fSys filesys.FileSystem) *types.Kustomization {
kf, err := kustfile.NewKustomizationFile(fSys)