From 8ca1f3813bed849c9ebcfaebc60f31ab9aafce03 Mon Sep 17 00:00:00 2001
From: "yufei.li" <yufeiminds@gmail.com>
Date: Thu, 24 Nov 2022 21:28:14 +0800
Subject: [PATCH] fix: correct lint issues

---
 kustomize/commands/edit/remove/removeconfigmap.go    | 12 ++++++++----
 .../commands/edit/remove/removeconfigmap_test.go     |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/kustomize/commands/edit/remove/removeconfigmap.go b/kustomize/commands/edit/remove/removeconfigmap.go
index 6348b4fb9..3b5292255 100644
--- a/kustomize/commands/edit/remove/removeconfigmap.go
+++ b/kustomize/commands/edit/remove/removeconfigmap.go
@@ -59,20 +59,20 @@ func (o *removeConfigMapOptions) Validate(args []string) error {
 func (o *removeConfigMapOptions) RunRemoveConfigMap(fSys filesys.FileSystem) error {
 	mf, err := kustfile.NewKustomizationFile(fSys)
 	if err != nil {
-		return err
+		return fmt.Errorf("configmap cannot load from file system, got %w", err)
 	}
 
 	m, err := mf.Read()
 	if err != nil {
-		return err
+		return fmt.Errorf("configmap cannot read from file, got %w", err)
 	}
 
-	var newConfigMaps []types.ConfigMapArgs
 	foundConfigMaps := make(map[string]bool)
 	for _, removeName := range o.configMapNames {
 		foundConfigMaps[removeName] = false
 	}
 
+	newConfigMaps := make([]types.ConfigMapArgs, 0, len(m.ConfigMapGenerator))
 	for _, currentConfigMap := range m.ConfigMapGenerator {
 		if kustfile.StringInSlice(currentConfigMap.Name, o.configMapNames) {
 			foundConfigMaps[currentConfigMap.Name] = true
@@ -88,5 +88,9 @@ func (o *removeConfigMapOptions) RunRemoveConfigMap(fSys filesys.FileSystem) err
 	}
 
 	m.ConfigMapGenerator = newConfigMaps
-	return mf.Write(m)
+	err = mf.Write(m)
+	if err != nil {
+		return fmt.Errorf("configmap cannot write back to file, got %w", err)
+	}
+	return nil
 }
diff --git a/kustomize/commands/edit/remove/removeconfigmap_test.go b/kustomize/commands/edit/remove/removeconfigmap_test.go
index 6427c2ef0..d44829f75 100644
--- a/kustomize/commands/edit/remove/removeconfigmap_test.go
+++ b/kustomize/commands/edit/remove/removeconfigmap_test.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package remove
+package remove //nolint:testpackage
 
 import (
 	"fmt"