Bump golangci-lint to 1.47.2 and fix issues

khos2ow · khos2ow · commit f09375367d66 · 2022-07-26T18:47:40.000-04:00
Signed-off-by: Khosrow Moossavi &lt;khos2ow@gmail.com&gt;
diff --git a/.golangci.yml b/.golangci.yml
@@ -124,6 +124,12 @@ issues:
         - unparam
         - goconst
 
+    # G306: Expect WriteFile permissions to be 0600 or less
+    # mainly seen in internal/cli/wrtier.go
+    - text: "G306:"
+      linters:
+        - gosec
+
     # - text: "should have a package comment"
     #   linters:
     #     - golint
diff --git a/Makefile b/Makefile
@@ -38,7 +38,7 @@ DOCKER_IMAGE := quay.io/$(PROJECT_OWNER)/$(PROJECT_NAME)
 DOCKER_TAG   ?= $(DEFAULT_TAG)
 
 # Binary versions
-GOLANGCI_VERSION  := v1.38.0
+GOLANGCI_VERSION  := v1.47.2
 
 .PHONY: all
 all: clean verify checkfmt lint test build
diff --git a/format/generator.go b/format/generator.go
@@ -209,7 +209,7 @@ func (g *generator) Render(tpl string) (string, error) {
 	})
 	tt.CustomFunc(gotemplate.FuncMap{
 		"include": func(s string) string {
-			content, err := os.ReadFile(filepath.Join(g.path, s))
+			content, err := os.ReadFile(filepath.Join(g.path, filepath.Clean(s)))
 			if err != nil {
 				panic(err)
 			}
diff --git a/internal/cli/writer.go b/internal/cli/writer.go
@@ -28,7 +28,7 @@ type stdoutWriter struct{}
 
 // Write content to Stdout
 func (sw *stdoutWriter) Write(p []byte) (int, error) {
-	return os.Stdout.Write([]byte(string(p) + "\n"))
+	return os.Stdout.WriteString(string(p) + "\n")
 }
 
 // fileWriter writes content to file.
@@ -82,7 +82,7 @@ func (fw *fileWriter) Write(p []byte) (int, error) {
 		return fw.write(filename, buf.Bytes())
 	}
 
-	content, err := os.ReadFile(filename)
+	content, err := os.ReadFile(filepath.Clean(filename))
 	if err != nil {
 		// In mode 'inject', if target file not found:
 		// create it and save the generated output into it.
@@ -161,7 +161,7 @@ func (fw *fileWriter) inject(filename string, content string, generated string)
 func (fw *fileWriter) write(filename string, p []byte) (int, error) {
 	// if run in check mode return exit 1
 	if fw.check {
-		f, err := os.ReadFile(filename)
+		f, err := os.ReadFile(filepath.Clean(filename))
 		if err != nil {
 			return 0, err
 		}
diff --git a/internal/reader/lines_test.go b/internal/reader/lines_test.go
@@ -11,7 +11,6 @@ the root directory of this source tree.
 package reader
 
 import (
-	"path/filepath"
 	"strings"
 	"testing"
 
@@ -122,7 +121,7 @@ func TestReadLinesFromFile(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			assert := assert.New(t)
 			lines := Lines{
-				FileName: filepath.Join(tt.fileName),
+				FileName: tt.fileName,
 				LineNum:  tt.lineNumber,
 				Condition: func(line string) bool {
 					line = strings.TrimSpace(line)
diff --git a/internal/testutil/testing.go b/internal/testutil/testing.go
@@ -65,5 +65,5 @@ func getExampleFolder(folder string) (string, error) {
 }
 
 func testDataPath() string {
-	return filepath.Join("testdata")
+	return "testdata"
 }
diff --git a/scripts/docs/generate.go b/scripts/docs/generate.go
@@ -70,13 +70,13 @@ func generate(cmd *cobra.Command, weight int, basename string) error {
 	}
 
 	filename := filepath.Join("docs", "reference", basename+".md")
-	f, err := os.Create(filename)
+	f, err := os.Create(filepath.Clean(filename))
 	if err != nil {
 		return err
 	}
 	defer f.Close() //nolint:errcheck,gosec
 
-	if _, err := io.WriteString(f, ""); err != nil {
+	if _, err := f.WriteString(""); err != nil {
 		return err
 	}
 	if err := generateMarkdown(cmd, weight, f); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ func (g *generator) Render(tpl string) (string, error) {`
`209`	`209`	`})`
`210`	`210`	`tt.CustomFunc(gotemplate.FuncMap{`
`211`	`211`	`"include": func(s string) string {`
`212`		`- content, err := os.ReadFile(filepath.Join(g.path, s))`
	`212`	`+ content, err := os.ReadFile(filepath.Join(g.path, filepath.Clean(s)))`
`213`	`213`	`if err != nil {`
`214`	`214`	`panic(err)`
`215`	`215`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,5 +65,5 @@ func getExampleFolder(folder string) (string, error) {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`func testDataPath() string {`
`68`		`- return filepath.Join("testdata")`
	`68`	`+ return "testdata"`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,13 +70,13 @@ func generate(cmd *cobra.Command, weight int, basename string) error {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`filename := filepath.Join("docs", "reference", basename+".md")`
`73`		`- f, err := os.Create(filename)`
	`73`	`+ f, err := os.Create(filepath.Clean(filename))`
`74`	`74`	`if err != nil {`
`75`	`75`	`return err`
`76`	`76`	`}`
`77`	`77`	`defer f.Close() //nolint:errcheck,gosec`
`78`	`78`
`79`		`- if _, err := io.WriteString(f, ""); err != nil {`
	`79`	`+ if _, err := f.WriteString(""); err != nil {`
`80`	`80`	`return err`
`81`	`81`	`}`
`82`	`82`	`if err := generateMarkdown(cmd, weight, f); err != nil {`