Tweak file path handling and logging in test.

k8sdeps/configmapandsecret/configmapfactory.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"unicode/utf8"
 
+	"github.com/pkg/errors"
 	"k8s.io/api/core/v1"
 	"sigs.k8s.io/kustomize/v3/pkg/types"
 )
@@ -28,13 +29,13 @@ func (f *Factory) MakeConfigMap(
 	args *types.ConfigMapArgs) (*v1.ConfigMap, error) {
 	all, err := f.ldr.LoadKvPairs(args.GeneratorArgs)
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "loading KV pairs")
 	}
 	cm := makeFreshConfigMap(args)
 	for _, p := range all {
 		err = f.addKvToConfigMap(cm, p)
 		if err != nil {
-			return nil, err
+			return nil, errors.Wrap(err, "trouble mapping")
 		}
 	}
 	if f.options != nil {

k8sdeps/configmapandsecret/configmapfactory_test.go

@@ -4,6 +4,7 @@
 package configmapandsecret
 
 import (
+	"path/filepath"
 	"reflect"
 	"testing"
 
@@ -86,7 +87,9 @@ func TestConstructConfigMap(t *testing.T) {
 				GeneratorArgs: types.GeneratorArgs{
 					Name: "envConfigMap",
 					DataSources: types.DataSources{
-						EnvSources: []string{"configmap/app.env"},
+						EnvSources: []string{
+							filepath.Join("configmap", "app.env"),
+						},
 					},
 				},
 			},
@@ -99,7 +102,10 @@ func TestConstructConfigMap(t *testing.T) {
 				GeneratorArgs: types.GeneratorArgs{
 					Name: "fileConfigMap",
 					DataSources: types.DataSources{
-						FileSources: []string{"configmap/app-init.ini", "configmap/app.bin"},
+						FileSources: []string{
+							filepath.Join("configmap", "app-init.ini"),
+							filepath.Join("configmap", "app.bin"),
+						},
 					},
 				},
 			},
@@ -126,9 +132,15 @@ func TestConstructConfigMap(t *testing.T) {
 	}
 
 	fSys := fs.MakeFakeFS()
-	fSys.WriteFile("/configmap/app.env", []byte("DB_USERNAME=admin\nDB_PASSWORD=somepw\n"))
-	fSys.WriteFile("/configmap/app-init.ini", []byte("FOO=bar\nBAR=baz\n"))
-	fSys.WriteFile("/configmap/app.bin", []byte{0xff, 0xfd})
+	fSys.WriteFile(
+		fSys.RPath("configmap", "app.env"),
+		[]byte("DB_USERNAME=admin\nDB_PASSWORD=somepw\n"))
+	fSys.WriteFile(
+		fSys.RPath("configmap", "app-init.ini"),
+		[]byte("FOO=bar\nBAR=baz\n"))
+	fSys.WriteFile(
+		fSys.RPath("configmap", "app.bin"),
+		[]byte{0xff, 0xfd})
 	ldr := loader.NewFileLoaderAtRoot(validators.MakeFakeValidator(), fSys)
 	for _, tc := range testCases {
 		f := NewFactory(ldr, tc.options)