kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-14 10:30:59 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Move plugin EnvForTest manager into new package

Browse Source 
Move the EnvForTest manager into an independent package that is not
imported by any non-test code. Previously this code was directly
embedded in the plugins package resulting in testing flags being exposed
in the main kustomize binary.
This commit is contained in:
Richard Marshall
2019-07-10 17:16:05 -07:00
parent 9bff2e8883
commit 0d8d9e2f2b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/plugins/envfortest.go → pkg/plugins/test/envfortest.go
View File

@@ -1,7 +1,7 @@
// Copyright 2019 The Kubernetes Authors. // Copyright 2019 The Kubernetes Authors.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package plugins package test
import ( import (
"io/ioutil" "io/ioutil"
@@ -12,13 +12,14 @@ import (
"testing" "testing"
"sigs.k8s.io/kustomize/v3/pkg/pgmconfig" "sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
"sigs.k8s.io/kustomize/v3/pkg/plugins"
) )
// EnvForTest manages the plugin test environment. // EnvForTest manages the plugin test environment.
// It sets/resets XDG_CONFIG_HOME, makes/removes a temp objRoot. // It sets/resets XDG_CONFIG_HOME, makes/removes a temp objRoot.
type EnvForTest struct { type EnvForTest struct {
t *testing.T t *testing.T
compiler *Compiler compiler *plugins.Compiler
workDir string workDir string
oldXdg string oldXdg string
wasSet bool wasSet bool
@@ -61,7 +62,7 @@ func (x *EnvForTest) BuildExecPlugin(g, v, k string) {
} }
} }
func (x *EnvForTest) makeCompiler() *Compiler { func (x *EnvForTest) makeCompiler() *plugins.Compiler {
// The plugin loader wants to find object code under // The plugin loader wants to find object code under
// $XDG_CONFIG_HOME/kustomize/plugins // $XDG_CONFIG_HOME/kustomize/plugins
// and the compiler writes object code to // and the compiler writes object code to
@@ -73,11 +74,11 @@ func (x *EnvForTest) makeCompiler() *Compiler {
if err != nil { if err != nil {
x.t.Error(err) x.t.Error(err)
} }
srcRoot, err := DefaultSrcRoot() srcRoot, err := plugins.DefaultSrcRoot()
if err != nil { if err != nil {
x.t.Error(err) x.t.Error(err)
} }
return NewCompiler(srcRoot, objRoot) return plugins.NewCompiler(srcRoot, objRoot)
} }
func (x *EnvForTest) createWorkDir() { func (x *EnvForTest) createWorkDir() {