Update for golangci-lint 2.0

Author: aramprice

.gitattributes

@@ -0,0 +1 @@
+*.go text eol=lf

.github/workflows/go.yml

@@ -19,8 +19,3 @@ jobs:
       run: |
         make generate-fake-stemcell-automation
     - uses: golangci/golangci-lint-action@v7
-      if: ${{ matrix.os == 'windows-2019' }}
-    - uses: golangci/golangci-lint-action@v7
-      if: ${{ matrix.os != 'windows-2019' }}
-      with:
-        args: --enable goimports

.golangci.yml

@@ -1,11 +1,12 @@
-# https://golangci-lint.run/usage/configuration/
-run:
-  timeout: 5m # 1m default times out on github-action runners
+version: "2"
 
-output:
-  # Sort results by: filepath, line and column.
-  sort-results: true
+linters:
+  default: standard
 
-issues:
-  max-issues-per-linter: 0
-  max-same-issues: 0
+  settings:
+    errcheck:
+      check-blank: true # assignment to blank identifier: `_ := someFunc()`.
+
+formatters:
+  enable:
+  - goimports

commandparser/construct_messenger.go

@@ -10,7 +10,7 @@ type ConstructCmdMessenger struct {
 }
 
 func (m *ConstructCmdMessenger) printMessage(message string) {
-	fmt.Fprintln(m.OutputChannel, message)
+	fmt.Fprintln(m.OutputChannel, message) //nolint:errcheck
 }
 
 func (m *ConstructCmdMessenger) ArgumentsNotProvided() {

commandparser/construct_validator.go

@@ -17,7 +17,7 @@ func (c *ConstructValidator) PopulatedArgs(args ...string) bool {
 }
 
 func (c *ConstructValidator) LGPOInDirectory() bool {
-	dir, _ := os.Getwd()
+	dir, _ := os.Getwd() //nolint:errcheck
 	_, err := os.Stat(filepath.Join(dir, "LGPO.zip"))
 
 	return err == nil

commandparser/construct_validator_test.go

@@ -47,7 +47,7 @@ var _ = Describe("ConstructValidator", func() {
 	})
 
 	Describe("LGPOInDirectory", func() {
-		wd, _ := os.Getwd()
+		wd, _ := os.Getwd() //nolint:errcheck
 		LGPOPath := filepath.Join(wd, "LGPO.zip")
 
 		It("should return true if LGPO exists in the directory", func() {

commandparser/help.go

@@ -63,24 +63,24 @@ func (h *stembuildHelp) Execute(c context.Context, f *flag.FlagSet, args ...inte
 
 func (h *stembuildHelp) Explain(w io.Writer) {
 
-	_, _ = fmt.Fprintf(w, "%s version %s, Windows Stemcell Building Tool\n\n", path.Base(os.Args[0]), version.Version)
-	_, _ = fmt.Fprintf(w, "Usage: %s <global options> <command> <command flags>\n\n", path.Base(os.Args[0]))
+	fmt.Fprintf(w, "%s version %s, Windows Stemcell Building Tool\n\n", path.Base(os.Args[0]), version.Version) //nolint:errcheck
+	fmt.Fprintf(w, "Usage: %s <global options> <command> <command flags>\n\n", path.Base(os.Args[0]))           //nolint:errcheck
 
-	_, _ = fmt.Fprint(w, "Commands:\n")
+	fmt.Fprint(w, "Commands:\n") //nolint:errcheck
 	for _, command := range *h.commands {
 		if len(command.Name()) < 5 { // This help align the synopses when the commands are of different lengths
-			_, _ = fmt.Fprintf(w, "  %s\t\t%s\n", command.Name(), command.Synopsis())
+			fmt.Fprintf(w, "  %s\t\t%s\n", command.Name(), command.Synopsis()) //nolint:errcheck
 		} else {
-			_, _ = fmt.Fprintf(w, "  %s\t%s\n", command.Name(), command.Synopsis())
+			fmt.Fprintf(w, "  %s\t%s\n", command.Name(), command.Synopsis()) //nolint:errcheck
 		}
 	}
 
-	_, _ = fmt.Fprint(w, "\nGlobal Options:\n")
+	fmt.Fprint(w, "\nGlobal Options:\n") //nolint:errcheck
 	h.topLevelFlags.VisitAll(func(f *flag.Flag) {
 		if len(f.Name) > 1 {
-			_, _ = fmt.Fprintf(w, "  -%s\t%s\n", f.Name, f.Usage)
+			fmt.Fprintf(w, "  -%s\t%s\n", f.Name, f.Usage) //nolint:errcheck
 		} else {
-			_, _ = fmt.Fprintf(w, "  -%s\t\t%s\n", f.Name, f.Usage)
+			fmt.Fprintf(w, "  -%s\t\t%s\n", f.Name, f.Usage) //nolint:errcheck
 		}
 	})
 }

commandparser/package_messenger.go

@@ -10,22 +10,22 @@ type PackageMessenger struct {
 }
 
 func (m *PackageMessenger) InvalidOutputConfig(e error) {
-	fmt.Fprintln(m.Output, e)
+	fmt.Fprintln(m.Output, e) //nolint:errcheck
 }
 
 func (m *PackageMessenger) CannotCreatePackager(e error) {
-	fmt.Fprintln(m.Output, e)
+	fmt.Fprintln(m.Output, e) //nolint:errcheck
 }
 
 func (m *PackageMessenger) DoesNotHaveEnoughSpace(e error) {
-	fmt.Fprintln(m.Output, e)
+	fmt.Fprintln(m.Output, e) //nolint:errcheck
 }
 
 func (m *PackageMessenger) SourceParametersAreInvalid(e error) {
-	fmt.Fprintln(m.Output, e)
+	fmt.Fprintln(m.Output, e) //nolint:errcheck
 }
 
 func (m *PackageMessenger) PackageFailed(e error) {
-	fmt.Fprintln(m.Output, e)
-	fmt.Fprintln(m.Output, "Please provide the error logs to [email protected]")
+	fmt.Fprintln(m.Output, e)                                                              //nolint:errcheck
+	fmt.Fprintln(m.Output, "Please provide the error logs to [email protected]") //nolint:errcheck
 }

construct/messenger.go

@@ -86,7 +86,7 @@ func (m *Messenger) ExecutePostRebootWarning(warning string) {
 }
 
 func (m *Messenger) UploadFileStarted(artifact string) {
-	m.out.Write([]byte(fmt.Sprintf("\tUploading %s to target VM...", artifact))) //nolint:errcheck
+	m.out.Write([]byte(fmt.Sprintf("\tUploading %s to target VM...", artifact))) //nolint:errcheck,staticcheck
 }
 
 func (m *Messenger) UploadFileSucceeded() {
@@ -116,13 +116,13 @@ func (m *Messenger) DownloadFileFailed(errorMessage string) {
 func (m *Messenger) logValidateOSWarning(log string, errorMessage string) {
 	matchingVersionWarning := "Ensure the version of the stemcell you're trying to build matches the corresponding base ISO you're using.\n" +
 		"For example: If you're building 2019.x, then you should be using 'Windows Server 2019' only"
-	m.out.Write([]byte(fmt.Sprintf("Warning: %s:\n%s\n%s", log, matchingVersionWarning, errorMessage))) //nolint:errcheck
+	m.out.Write([]byte(fmt.Sprintf("Warning: %s:\n%s\n%s", log, matchingVersionWarning, errorMessage))) //nolint:errcheck,staticcheck
 }
 
 func (m *Messenger) WaitingForShutdown() {
 	t := time.Now()
 	timeStampFormat := "2006-01-02T15:04:05.999999-07:00"
-	m.out.Write([]byte(fmt.Sprintf("%s Still preparing VM...\n", t.Format(timeStampFormat)))) //nolint:errcheck
+	m.out.Write([]byte(fmt.Sprintf("%s Still preparing VM...\n", t.Format(timeStampFormat)))) //nolint:errcheck,staticcheck
 }
 
 func (m *Messenger) ShutdownCompleted() {

iaas_cli/govc_cli.go

@@ -31,8 +31,8 @@ func (r *GovcRunner) Run(args []string) int {
 }
 
 func (r *GovcRunner) RunWithOutput(args []string) (string, int, error) {
-	old := os.Stdout // keep backup of the real stdout
-	reader, w, _ := os.Pipe()
+	old := os.Stdout          // keep backup of the real stdout
+	reader, w, _ := os.Pipe() //nolint:errcheck
 	os.Stdout = w
 
 	print()