lint(errcheck): Fix trivial warnings and nolint refactor targets

Signed-off-by: Stephen Augustus <[email protected]>

Author: justaugustus

pkg/kepctl/create.go

@@ -17,14 +17,15 @@ limitations under the License.
 package kepctl
 
 import (
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"
 
+	"github.com/pkg/errors"
+
 	"k8s.io/enhancements/api"
 )
 
@@ -47,9 +48,11 @@ func (c *CreateOpts) Validate(args []string) error {
 	if err != nil {
 		return err
 	}
+
 	if len(c.PRRApprovers) == 0 {
 		return errors.New("must provide at least one PRR Approver")
 	}
+
 	return nil
 }
 
@@ -157,7 +160,9 @@ func (c *Client) createKEP(kep *api.Proposal, opts *CreateOpts) error {
 	}
 
 	newPath := filepath.Join(path, "keps", opts.SIG, opts.Name, "README.md")
-	ioutil.WriteFile(newPath, b, os.ModePerm)
+	if writeErr := ioutil.WriteFile(newPath, b, os.ModePerm); writeErr != nil {
+		return errors.Wrapf(writeErr, "writing KEP data to file")
+	}
 
 	return nil
 }

pkg/kepctl/kepctl.go

@@ -32,6 +32,7 @@ import (
 
 	"github.com/google/go-github/v32/github"
 	"github.com/olekukonko/tablewriter"
+	"github.com/pkg/errors"
 	"golang.org/x/oauth2"
 	"gopkg.in/yaml.v2"
 
@@ -122,8 +123,10 @@ func (c *Client) SetGitHubToken(opts *CommonArgs) error {
 		if err != nil {
 			return err
 		}
+
 		c.Token = strings.Trim(string(token), "\n\r")
 	}
+
 	return nil
 }
 
@@ -152,7 +155,6 @@ func (c *Client) getReadmeTemplate(repoPath string) ([]byte, error) {
 }
 
 // TODO: Unused?
-//golint:deadcode,unused
 func validateKEP(p *api.Proposal) error {
 	b, err := yaml.Marshal(p)
 	if err != nil {
@@ -446,15 +448,17 @@ func (c *Client) writeKEP(kep *api.Proposal, opts *CommonArgs) error {
 		return fmt.Errorf("KEP is invalid: %s", err)
 	}
 
-	os.MkdirAll(
+	if mkErr := os.MkdirAll(
 		filepath.Join(
 			path,
 			"keps",
 			opts.SIG,
 			opts.Name,
 		),
 		os.ModePerm,
-	)
+	); mkErr != nil {
+		return errors.Wrapf(mkErr, "creating KEP directory")
+	}
 
 	newPath := filepath.Join(path, "keps", opts.SIG, opts.Name, "kep.yaml")
 	fmt.Fprintf(c.Out, "writing KEP to %s\n", newPath)

pkg/kepctl/kepctl_test.go

@@ -78,7 +78,9 @@ func TestFindLocalKEPs(t *testing.T) {
 		},
 	}
 
-	c, _ := New("testdata")
+	c, clientErr := New("testdata")
+	require.Nil(t, clientErr)
+
 	for i, tc := range testcases {
 		k := c.loadLocalKEPs("testdata", tc.sig)
 		if len(k) != len(tc.keps) {

pkg/kepctl/query.go

@@ -103,7 +103,9 @@ func (c *Client) Query(opts *QueryOpts) error {
 		return errors.Wrap(err, "unable to search KEPs")
 	}
 
-	c.SetGitHubToken(&opts.CommonArgs)
+	if tokenErr := c.SetGitHubToken(&opts.CommonArgs); tokenErr != nil {
+		return errors.Wrapf(tokenErr, "setting GitHub token")
+	}
 
 	allKEPs := make([]*api.Proposal, 10)
 	// load the KEPs for each listed SIG

pkg/kepval/keps/validations/yaml.go

@@ -59,6 +59,8 @@ func ValidateStructure(parsed map[interface{}]interface{}) error {
 				return util.NewValueMustBeString(k, v)
 			}
 
+			// TODO(lint): Error return value is not checked (errcheck)
+			//nolint:errcheck
 			v, _ := value.(string)
 			if !reStatus.Match([]byte(v)) {
 				return util.NewValueMustBeOneOf(k, v, statuses)
@@ -70,6 +72,8 @@ func ValidateStructure(parsed map[interface{}]interface{}) error {
 				return util.NewValueMustBeString(k, v)
 			}
 
+			// TODO(lint): Error return value is not checked (errcheck)
+			//nolint:errcheck
 			v, _ := value.(string)
 			if !reStages.Match([]byte(v)) {
 				return util.NewValueMustBeOneOf(k, v, stages)
@@ -81,6 +85,8 @@ func ValidateStructure(parsed map[interface{}]interface{}) error {
 				return util.NewValueMustBeString(k, v)
 			}
 
+			// TODO(lint): Error return value is not checked (errcheck)
+			//nolint:errcheck
 			v, _ := value.(string)
 			index := sort.SearchStrings(listGroups, v)
 			if index >= len(listGroups) || listGroups[index] != v {
@@ -136,6 +142,8 @@ func ValidateStructure(parsed map[interface{}]interface{}) error {
 
 				if strings.EqualFold(k, "participating-sigs") {
 					for _, value := range values {
+						// TODO(lint): Error return value is not checked (errcheck)
+						//nolint:errcheck
 						v := value.(string)
 						index := sort.SearchStrings(listGroups, v)
 						if index >= len(listGroups) || listGroups[index] != v {
@@ -154,6 +162,8 @@ func ValidateStructure(parsed map[interface{}]interface{}) error {
 				// prrApprovers must be sorted to use SearchStrings down below...
 				sort.Strings(prrApprovers)
 				for _, value := range values {
+					// TODO(lint): Error return value is not checked (errcheck)
+					//nolint:errcheck
 					v := value.(string)
 					if len(v) > 0 && v[0] == '@' {
 						// If "@" is appeneded at the beginning, remove it.
@@ -175,6 +185,9 @@ func ValidateStructure(parsed map[interface{}]interface{}) error {
 			case []interface{}:
 				return util.NewValueMustBeString(k, v)
 			}
+
+			// TODO(lint): Error return value is not checked (errcheck)
+			//nolint:errcheck
 			v, _ := value.(string)
 			if !reMilestone.Match([]byte(v)) {
 				return util.NewValueMustBeMilestone(k, v)
@@ -192,6 +205,7 @@ func ValidateStructure(parsed map[interface{}]interface{}) error {
 			}
 		}
 	}
+
 	return nil
 }
 
@@ -210,6 +224,8 @@ func validateMilestone(parsed map[interface{}]interface{}) error {
 				return util.NewValueMustBeString(k, v)
 			}
 
+			// TODO(lint): Error return value is not checked (errcheck)
+			//nolint:errcheck
 			v, _ := value.(string)
 			if !reMilestone.Match([]byte(v)) {
 				return util.NewValueMustBeMilestone(k, v)

pkg/kepval/prrs/validations/yaml.go

@@ -75,11 +75,15 @@ func validateMilestone(parsed map[interface{}]interface{}) error {
 			case []interface{}:
 				return util.NewValueMustBeString(k, v)
 			}
+
+			// TODO(lint): Error return value is not checked (errcheck)
+			//nolint:errcheck
 			v, _ := value.(string)
 			if len(v) > 0 && v[0] == '@' {
-				// If "@" is appeneded at the beginning, remove it.
+				// If "@" is appended at the beginning, remove it.
 				v = v[1:]
 			}
+
 			index := sort.SearchStrings(prrApprovers, v)
 			if index >= len(prrApprovers) || prrApprovers[index] != v {
 				return util.NewValueMustBeOneOf(k, v, prrApprovers)