fix: lint issues

kubernetes-sigs · Oct 26, 2023 · 5381f37 · 5381f37
1 parent c87b1aa
commit 5381f37
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/kustomize/commands/edit/set/all.go b/kustomize/commands/edit/set/all.go
@@ -32,7 +32,7 @@ func NewCmdSet(
 	}
 
 	c.AddCommand(
-		newCmdSetConfigMap(fSys, ldr, rf),
+		NewCmdSetConfigMap(fSys, ldr, rf),
 		newCmdSetNamePrefix(fSys),
 		newCmdSetNameSuffix(fSys),
 		newCmdSetNamespace(fSys, v),

diff --git a/kustomize/commands/edit/set/configmap.go b/kustomize/commands/edit/set/configmap.go
@@ -16,7 +16,7 @@ import (
 	"sigs.k8s.io/kustomize/kyaml/filesys"
 )
 
-func newCmdSetConfigMap(
+func NewCmdSetConfigMap(
 	fSys filesys.FileSystem,
 	ldr ifc.KvLoader,
 	rf *resource.Factory,
@@ -115,7 +115,7 @@ func setConfigMap(
 	if len(flags.LiteralSources) > 0 {
 		err := util.UpdateLiteralSources(&args.GeneratorArgs, flags)
 		if err != nil {
-			return err
+			return fmt.Errorf("failed to update literal sources: %w", err)
 		}
 	}
 
@@ -129,7 +129,11 @@ func setConfigMap(
 		args.Options, k.GeneratorOptions)
 
 	_, err = rf.MakeConfigMap(ldr, args)
-	return err
+	if err != nil {
+		return fmt.Errorf("failed to validate ConfigMap structure: %w", err)
+	}
+
+	return nil
 }
 
 // findConfigMapArgs finds the generator arguments corresponding to the specified

diff --git a/kustomize/commands/edit/set/configmap_test.go b/kustomize/commands/edit/set/configmap_test.go
@@ -1,4 +1,4 @@
-package set
+package set_test
 
 import (
 	"testing"
@@ -7,6 +7,7 @@ import (
 	"sigs.k8s.io/kustomize/api/kv"
 	"sigs.k8s.io/kustomize/api/pkg/loader"
 	"sigs.k8s.io/kustomize/api/provider"
+	. "sigs.k8s.io/kustomize/kustomize/v5/commands/edit/set"
 	"sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils"
 	"sigs.k8s.io/kustomize/kyaml/filesys"
@@ -69,7 +70,7 @@ configMapGenerator:
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			cmd := newCmdSetConfigMap(
+			cmd := NewCmdSetConfigMap(
 				fSys,
 				kv.NewLoader(
 					loader.NewFileLoaderAtCwd(fSys),
@@ -131,7 +132,7 @@ configMapGenerator:
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			cmd := newCmdSetConfigMap(
+			cmd := NewCmdSetConfigMap(
 				fSys,
 				kv.NewLoader(
 					loader.NewFileLoaderAtCwd(fSys),