Move fake loader into its own package

This commit is contained in:
Sean Sullivan 2018-02-26 15:38:48 -08:00
parent 5a92d7a586
commit afdcd30ffa
3 changed files with 10 additions and 7 deletions

View File

@ -6,7 +6,7 @@ import (
"reflect"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/kubectl/pkg/loader"
"k8s.io/kubectl/pkg/loader/loadertest"
)
func makeUnconstructed(name string) *unstructured.Unstructured {
@ -34,7 +34,7 @@ metadata:
name: dply2
`
l := loader.FakeLoader{Content: resourceContent}
l := loadertest.FakeLoader{Content: resourceContent}
expected := []*Resource{
{Data: makeUnconstructed("dply1")},
{Data: makeUnconstructed("dply2")},

View File

@ -24,6 +24,7 @@ import (
manifest "k8s.io/kubectl/pkg/apis/manifest/v1alpha1"
"k8s.io/kubectl/pkg/kinflate/resource"
"k8s.io/kubectl/pkg/loader"
"k8s.io/kubectl/pkg/loader/loadertest"
)
func TestNewFromConfigMap(t *testing.T) {
@ -43,7 +44,7 @@ func TestNewFromConfigMap(t *testing.T) {
EnvSource: "app.env",
},
},
l: loader.FakeLoader{
l: loadertest.FakeLoader{
Content: `DB_USERNAME=admin
DB_PASSWORD=somepw
`,
@ -73,7 +74,7 @@ DB_PASSWORD=somepw
FileSources: []string{"app-init.ini"},
},
},
l: loader.FakeLoader{
l: loadertest.FakeLoader{
Content: `FOO=bar
BAR=baz
`,

View File

@ -14,7 +14,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package loader
package loadertest
import "k8s.io/kubectl/pkg/loader"
// FakeLoader implements Loader interface.
type FakeLoader struct {
@ -25,7 +27,7 @@ func (f FakeLoader) Root() string {
return "/fake/root"
}
func (f FakeLoader) New(root string) (Loader, error) {
func (f FakeLoader) New(root string) (loader.Loader, error) {
return f, nil
}
@ -33,4 +35,4 @@ func (f FakeLoader) Load(location string) ([]byte, error) {
return []byte(f.Content), nil
}
var _ Loader = FakeLoader{}
var _ loader.Loader = FakeLoader{}