remove decoder interface since it is only used inside k8sdeps

This commit is contained in:
Jingfang Liu
2018-10-10 11:08:23 -07:00
parent cf4a1ba083
commit 96091dfcf5
22 changed files with 35 additions and 92 deletions

View File

@@ -65,7 +65,7 @@ func NewCmdBuild(
out io.Writer, fs fs.FileSystem,
kf ifc.KunstructuredFactory,
ptf patch.TransformerFactory,
decoder ifc.Decoder, hash ifc.Hash) *cobra.Command {
hash ifc.Hash) *cobra.Command {
var o buildOptions
var p string
@@ -79,7 +79,7 @@ func NewCmdBuild(
if err != nil {
return err
}
return o.RunBuild(out, fs, kf, ptf, decoder, hash)
return o.RunBuild(out, fs, kf, ptf, hash)
},
}
cmd.Flags().StringVarP(
@@ -126,7 +126,7 @@ func (o *buildOptions) RunBuild(
out io.Writer, fSys fs.FileSystem,
kf ifc.KunstructuredFactory,
ptf patch.TransformerFactory,
decoder ifc.Decoder, hash ifc.Hash) error {
hash ifc.Hash) error {
rootLoader, err := loader.NewLoader(o.kustomizationPath, "", fSys)
if err != nil {
return err
@@ -137,7 +137,7 @@ func (o *buildOptions) RunBuild(
resmap.NewFactory(resource.NewFactory(kf)),
ptf,
makeTransformerconfig(fSys, o.transformerconfigPaths),
decoder, hash)
hash)
if err != nil {
return err
}

View File

@@ -131,9 +131,9 @@ func runBuildTestCase(t *testing.T, testcaseName string, updateKustomizeExpected
buf := bytes.NewBuffer([]byte{})
err = ops.RunBuild(
buf, fSys,
k8sdeps.NewKunstructuredFactoryImpl(k8sdeps.NewKustDecoder()),
k8sdeps.NewKunstructuredFactoryImpl(),
patch.NewPatchTransformerFactory(),
k8sdeps.NewKustDecoder(), k8sdeps.NewKustHash())
k8sdeps.NewKustHash())
switch {
case err != nil && len(testcase.ExpectedError) == 0:
t.Errorf("unexpected error: %v", err)