Fix some nits in the crawler and elsewhere.

This commit is contained in:
Jeffrey Regan
2019-12-03 10:44:44 -08:00
parent fd5db20a48
commit e9ab3da164
33 changed files with 31 additions and 113 deletions

View File

@@ -75,7 +75,7 @@ func (th Harness) MakeOptionsPluginsEnabled() krusty.Options {
if strings.Contains(err.Error(), "unable to find plugin root") {
th.t.Log(
"Tests that want to run with plugins enabled must be " +
"bookended by calls to MakeEnhancedHarness(), Reset().")
"bookended by calls to MakeEnhancedHarness(), Reset().")
}
th.t.Fatal(err)
}

View File

@@ -6,7 +6,6 @@ package resmaptest_test
import (
"testing"
"sigs.k8s.io/kustomize/api/resid"
"sigs.k8s.io/kustomize/api/resmap"
"sigs.k8s.io/kustomize/api/resource"
)
@@ -38,14 +37,6 @@ func (rm *rmBuilder) AddR(r *resource.Resource) *rmBuilder {
return rm
}
func (rm *rmBuilder) AddWithId(id resid.ResId, m map[string]interface{}) *rmBuilder {
err := rm.m.Append(rm.rf.FromMap(m))
if err != nil {
rm.t.Fatalf("test setup failure: %v", err)
}
return rm
}
func (rm *rmBuilder) AddWithName(n string, m map[string]interface{}) *rmBuilder {
err := rm.m.Append(rm.rf.FromMapWithName(n, m))
if err != nil {

View File

@@ -36,12 +36,12 @@ func MakeFakeValidator() *fakeValidator {
}
// ErrIfInvalidKey returns nil
func (v *fakeValidator) ErrIfInvalidKey(k string) error {
func (v *fakeValidator) ErrIfInvalidKey(_ string) error {
return nil
}
// IsEnvVarName returns nil
func (v *fakeValidator) IsEnvVarName(k string) error {
func (v *fakeValidator) IsEnvVarName(_ string) error {
return nil
}