feat(ci): update helm and go version in ci workflow (#675)

yxxhero · web-flow · commit 82941647b2eb · 2024-10-18T10:36:47.000+09:00
* feat(ci): update helm and go version in ci workflow

Signed-off-by: yxxhero &lt;aiopsclub@163.com&gt;

* refactor: use _ to discard fmt.Fprintf return value

Signed-off-by: yxxhero &lt;aiopsclub@163.com&gt;

* fix more lint issue

Signed-off-by: yxxhero &lt;aiopsclub@163.com&gt;

* fix more lint issue

Signed-off-by: yxxhero &lt;aiopsclub@163.com&gt;

---------

Signed-off-by: yxxhero &lt;aiopsclub@163.com&gt;
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -43,7 +43,7 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
         shell: [ default ]
         experimental: [ false ]
-        helm-version: [ v3.15.4, v3.16.1 ]
+        helm-version: [ v3.15.4, v3.16.2 ]
         include:
           - os: windows-latest
             shell: wsl
@@ -61,16 +61,16 @@ jobs:
           - os: windows-latest
             shell: wsl
             experimental: false
-            helm-version: v3.16.1
+            helm-version: v3.16.2
           - os: windows-latest
             shell: cygwin
             experimental: false
-            helm-version: v3.16.1
+            helm-version: v3.16.2
           - os: ubuntu-latest
             container: alpine
             shell: sh
             experimental: false
-            helm-version: v3.16.1
+            helm-version: v3.16.2
 
     steps:
       - name: Disable autocrlf
@@ -111,7 +111,7 @@ jobs:
           # That's why we cover only 2 Helm minor versions in this matrix.
           # See https://github.com/helmfile/helmfile/pull/286#issuecomment-1250161182 for more context.
           - helm-version: v3.15.4
-          - helm-version: v3.16.1
+          - helm-version: v3.16.2
     steps:
       - uses: engineerd/setup-kind@v0.5.0
         with:
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -21,4 +21,4 @@ jobs:
           go-version-file: 'go.mod'
       - uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.56.0
+          version: v1.61.0
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -51,8 +51,9 @@ run:
 
 # output configuration options
 output:
+  formats:
   # colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number"
-  format: line-number
+  - format: line-number
 
   # print lines of code with issue, default is true
   print-issued-lines: true
@@ -290,7 +291,7 @@ linters:
     - depguard
     - errcheck
     - errorlint
-    - exportloopref
+    - copyloopvar
     - funlen
     - gci
     - gocognit
diff --git a/diff/diff.go b/diff/diff.go
@@ -332,7 +332,7 @@ func printDiffRecords(suppressedKinds []string, kind string, context int, diffs
 	for _, ckind := range suppressedKinds {
 		if ckind == kind {
 			str := fmt.Sprintf("+ Changes suppressed on sensitive content of type %s\n", kind)
-			fmt.Fprint(to, ansi.Color(str, "yellow"))
+			_, _ = fmt.Fprint(to, ansi.Color(str, "yellow"))
 			return
 		}
 	}
@@ -343,7 +343,7 @@ func printDiffRecords(suppressedKinds []string, kind string, context int, diffs
 		for i, diff := range diffs {
 			if distances[i] > context {
 				if !omitting {
-					fmt.Fprintln(to, "...")
+					_, _ = fmt.Fprintln(to, "...")
 					omitting = true
 				}
 			} else {
@@ -363,14 +363,14 @@ func printDiffRecord(diff difflib.DiffRecord, to io.Writer) {
 
 	switch diff.Delta {
 	case difflib.RightOnly:
-		fmt.Fprintf(to, "%s\n", ansi.Color("+ "+text, "green"))
+		_, _ = fmt.Fprintf(to, "%s\n", ansi.Color("+ "+text, "green"))
 	case difflib.LeftOnly:
-		fmt.Fprintf(to, "%s\n", ansi.Color("- "+text, "red"))
+		_, _ = fmt.Fprintf(to, "%s\n", ansi.Color("- "+text, "red"))
 	case difflib.Common:
 		if text == "" {
-			fmt.Fprintln(to)
+			_, _ = fmt.Fprintln(to)
 		} else {
-			fmt.Fprintf(to, "%s\n", "  "+text)
+			_, _ = fmt.Fprintf(to, "%s\n", "  "+text)
 		}
 	}
 }
diff --git a/diff/report.go b/diff/report.go
@@ -148,7 +148,7 @@ func setupDiffReport(r *Report) {
 // print report for default output: diff
 func printDiffReport(r *Report, to io.Writer) {
 	for _, entry := range r.entries {
-		fmt.Fprintf(to, ansi.Color("%s %s", "yellow")+"\n", entry.key, r.format.changestyles[entry.changeType].message)
+		_, _ = fmt.Fprintf(to, ansi.Color("%s %s", "yellow")+"\n", entry.key, r.format.changestyles[entry.changeType].message)
 		printDiffRecords(entry.suppressedKinds, entry.kind, entry.context, entry.diffs, to)
 	}
 }
@@ -170,13 +170,13 @@ func printSimpleReport(r *Report, to io.Writer) {
 		"MODIFY": 0,
 	}
 	for _, entry := range r.entries {
-		fmt.Fprintf(to, ansi.Color("%s %s", r.format.changestyles[entry.changeType].color)+"\n",
+		_, _ = fmt.Fprintf(to, ansi.Color("%s %s", r.format.changestyles[entry.changeType].color)+"\n",
 			entry.key,
 			r.format.changestyles[entry.changeType].message,
 		)
 		summary[entry.changeType]++
 	}
-	fmt.Fprintf(to, "Plan: %d to add, %d to change, %d to destroy.\n", summary["ADD"], summary["MODIFY"], summary["REMOVE"])
+	_, _ = fmt.Fprintf(to, "Plan: %d to add, %d to change, %d to destroy.\n", summary["ADD"], summary["MODIFY"], summary["REMOVE"])
 }
 
 func newTemplate(name string) *template.Template {
diff --git a/go.mod b/go.mod
@@ -1,8 +1,6 @@
 module github.com/databus23/helm-diff/v3
 
-go 1.22.0
-
-toolchain go1.22.4
+go 1.23.2
 
 require (
 	github.com/Masterminds/semver/v3 v3.3.0
diff --git a/main_test.go b/main_test.go
@@ -76,7 +76,7 @@ func runFakeHelm() int {
 	var stub *fakeHelmSubcmd
 
 	if len(os.Args) < 2 {
-		fmt.Fprintln(os.Stderr, "fake helm does not support invocations without subcommands")
+		_, _ = fmt.Fprintln(os.Stderr, "fake helm does not support invocations without subcommands")
 		return 1
 	}
 
@@ -90,7 +90,7 @@ func runFakeHelm() int {
 	}
 
 	if stub == nil {
-		fmt.Fprintf(os.Stderr, "no stub for %s\n", cmdAndArgs)
+		_, _ = fmt.Fprintf(os.Stderr, "no stub for %s\n", cmdAndArgs)
 		return 1
 	}
 
@@ -100,13 +100,13 @@ func runFakeHelm() int {
 	}
 	got := cmdAndArgs[len(stub.cmd):]
 	if !reflect.DeepEqual(want, got) {
-		fmt.Fprintf(os.Stderr, "want: %v\n", want)
-		fmt.Fprintf(os.Stderr, "got : %v\n", got)
-		fmt.Fprintf(os.Stderr, "args : %v\n", os.Args)
-		fmt.Fprintf(os.Stderr, "env : %v\n", os.Environ())
+		_, _ = fmt.Fprintf(os.Stderr, "want: %v\n", want)
+		_, _ = fmt.Fprintf(os.Stderr, "got : %v\n", got)
+		_, _ = fmt.Fprintf(os.Stderr, "args : %v\n", os.Args)
+		_, _ = fmt.Fprintf(os.Stderr, "env : %v\n", os.Environ())
 		return 1
 	}
-	fmt.Fprintf(os.Stdout, "%s", stub.stdout)
-	fmt.Fprintf(os.Stderr, "%s", stub.stderr)
+	_, _ = fmt.Fprintf(os.Stdout, "%s", stub.stdout)
+	_, _ = fmt.Fprintf(os.Stderr, "%s", stub.stderr)
 	return stub.exitCode
 }

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ func printDiffRecords(suppressedKinds []string, kind string, context int, diffs`
`332`	`332`	`for _, ckind := range suppressedKinds {`
`333`	`333`	`if ckind == kind {`
`334`	`334`	`str := fmt.Sprintf("+ Changes suppressed on sensitive content of type %s\n", kind)`
`335`		`- fmt.Fprint(to, ansi.Color(str, "yellow"))`
	`335`	`+ _, _ = fmt.Fprint(to, ansi.Color(str, "yellow"))`
`336`	`336`	`return`
`337`	`337`	`}`
`338`	`338`	`}`
`@@ -343,7 +343,7 @@ func printDiffRecords(suppressedKinds []string, kind string, context int, diffs`
`343`	`343`	`for i, diff := range diffs {`
`344`	`344`	`if distances[i] > context {`
`345`	`345`	`if !omitting {`
`346`		`- fmt.Fprintln(to, "...")`
	`346`	`+ _, _ = fmt.Fprintln(to, "...")`
`347`	`347`	`omitting = true`
`348`	`348`	`}`
`349`	`349`	`} else {`
`@@ -363,14 +363,14 @@ func printDiffRecord(diff difflib.DiffRecord, to io.Writer) {`
`363`	`363`
`364`	`364`	`switch diff.Delta {`
`365`	`365`	`case difflib.RightOnly:`
`366`		`- fmt.Fprintf(to, "%s\n", ansi.Color("+ "+text, "green"))`
	`366`	`+ _, _ = fmt.Fprintf(to, "%s\n", ansi.Color("+ "+text, "green"))`
`367`	`367`	`case difflib.LeftOnly:`
`368`		`- fmt.Fprintf(to, "%s\n", ansi.Color("- "+text, "red"))`
	`368`	`+ _, _ = fmt.Fprintf(to, "%s\n", ansi.Color("- "+text, "red"))`
`369`	`369`	`case difflib.Common:`
`370`	`370`	`if text == "" {`
`371`		`- fmt.Fprintln(to)`
	`371`	`+ _, _ = fmt.Fprintln(to)`
`372`	`372`	`} else {`
`373`		`- fmt.Fprintf(to, "%s\n", " "+text)`
	`373`	`+ _, _ = fmt.Fprintf(to, "%s\n", " "+text)`
`374`	`374`	`}`
`375`	`375`	`}`
`376`	`376`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ func setupDiffReport(r *Report) {`
`148`	`148`	`// print report for default output: diff`
`149`	`149`	`func printDiffReport(r *Report, to io.Writer) {`
`150`	`150`	`for _, entry := range r.entries {`
`151`		`- fmt.Fprintf(to, ansi.Color("%s %s", "yellow")+"\n", entry.key, r.format.changestyles[entry.changeType].message)`
	`151`	`+ _, _ = fmt.Fprintf(to, ansi.Color("%s %s", "yellow")+"\n", entry.key, r.format.changestyles[entry.changeType].message)`
`152`	`152`	`printDiffRecords(entry.suppressedKinds, entry.kind, entry.context, entry.diffs, to)`
`153`	`153`	`}`
`154`	`154`	`}`
`@@ -170,13 +170,13 @@ func printSimpleReport(r *Report, to io.Writer) {`
`170`	`170`	`"MODIFY": 0,`
`171`	`171`	`}`
`172`	`172`	`for _, entry := range r.entries {`
`173`		`- fmt.Fprintf(to, ansi.Color("%s %s", r.format.changestyles[entry.changeType].color)+"\n",`
	`173`	`+ _, _ = fmt.Fprintf(to, ansi.Color("%s %s", r.format.changestyles[entry.changeType].color)+"\n",`
`174`	`174`	`entry.key,`
`175`	`175`	`r.format.changestyles[entry.changeType].message,`
`176`	`176`	`)`
`177`	`177`	`summary[entry.changeType]++`
`178`	`178`	`}`
`179`		`- fmt.Fprintf(to, "Plan: %d to add, %d to change, %d to destroy.\n", summary["ADD"], summary["MODIFY"], summary["REMOVE"])`
	`179`	`+ _, _ = fmt.Fprintf(to, "Plan: %d to add, %d to change, %d to destroy.\n", summary["ADD"], summary["MODIFY"], summary["REMOVE"])`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`func newTemplate(name string) *template.Template {`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func runFakeHelm() int {`
`76`	`76`	`var stub *fakeHelmSubcmd`
`77`	`77`
`78`	`78`	`if len(os.Args) < 2 {`
`79`		`- fmt.Fprintln(os.Stderr, "fake helm does not support invocations without subcommands")`
	`79`	`+ _, _ = fmt.Fprintln(os.Stderr, "fake helm does not support invocations without subcommands")`
`80`	`80`	`return 1`
`81`	`81`	`}`
`82`	`82`
`@@ -90,7 +90,7 @@ func runFakeHelm() int {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`if stub == nil {`
`93`		`- fmt.Fprintf(os.Stderr, "no stub for %s\n", cmdAndArgs)`
	`93`	`+ _, _ = fmt.Fprintf(os.Stderr, "no stub for %s\n", cmdAndArgs)`
`94`	`94`	`return 1`
`95`	`95`	`}`
`96`	`96`
`@@ -100,13 +100,13 @@ func runFakeHelm() int {`
`100`	`100`	`}`
`101`	`101`	`got := cmdAndArgs[len(stub.cmd):]`
`102`	`102`	`if !reflect.DeepEqual(want, got) {`
`103`		`- fmt.Fprintf(os.Stderr, "want: %v\n", want)`
`104`		`- fmt.Fprintf(os.Stderr, "got : %v\n", got)`
`105`		`- fmt.Fprintf(os.Stderr, "args : %v\n", os.Args)`
`106`		`- fmt.Fprintf(os.Stderr, "env : %v\n", os.Environ())`
	`103`	`+ _, _ = fmt.Fprintf(os.Stderr, "want: %v\n", want)`
	`104`	`+ _, _ = fmt.Fprintf(os.Stderr, "got : %v\n", got)`
	`105`	`+ _, _ = fmt.Fprintf(os.Stderr, "args : %v\n", os.Args)`
	`106`	`+ _, _ = fmt.Fprintf(os.Stderr, "env : %v\n", os.Environ())`
`107`	`107`	`return 1`
`108`	`108`	`}`
`109`		`- fmt.Fprintf(os.Stdout, "%s", stub.stdout)`
`110`		`- fmt.Fprintf(os.Stderr, "%s", stub.stderr)`
	`109`	`+ _, _ = fmt.Fprintf(os.Stdout, "%s", stub.stdout)`
	`110`	`+ _, _ = fmt.Fprintf(os.Stderr, "%s", stub.stderr)`
`111`	`111`	`return stub.exitCode`
`112`	`112`	`}`