Update for golangci-lint 2.0

Author: aramprice

.github/workflows/go.yml

@@ -18,8 +18,6 @@ jobs:
         with:
           go-version-file: go.mod
       - uses: golangci/golangci-lint-action@v7
-        with:
-          args: --enable goimports
 
   test-unit:
     runs-on: ubuntu-latest

.golangci.yml

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

acceptance-tests/actors/aws.go

@@ -4,19 +4,17 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/cloudfoundry/bosh-bootloader/application"
-	"github.com/cloudfoundry/bosh-bootloader/aws"
-	"github.com/cloudfoundry/bosh-bootloader/storage"
-	"github.com/cloudfoundry/bosh-bootloader/testhelpers"
-
-	. "github.com/onsi/gomega"
-
 	awslib "github.com/aws/aws-sdk-go/aws"
-	acceptance "github.com/cloudfoundry/bosh-bootloader/acceptance-tests"
-
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/elb"
+	"github.com/cloudfoundry/bosh-bootloader/acceptance-tests"
+	. "github.com/onsi/gomega" //nolint:staticcheck
+
+	"github.com/cloudfoundry/bosh-bootloader/application"
+	"github.com/cloudfoundry/bosh-bootloader/aws"
+	"github.com/cloudfoundry/bosh-bootloader/storage"
+	"github.com/cloudfoundry/bosh-bootloader/testhelpers"
 )
 
 func NewAWSLBHelper(c acceptance.Config) awsLBHelper {

acceptance-tests/actors/azure.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"                         //nolint:staticcheck
-	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork" //nolint:staticcheck
-	acceptance "github.com/cloudfoundry/bosh-bootloader/acceptance-tests"
+	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
+	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork"
+	"github.com/cloudfoundry/bosh-bootloader/acceptance-tests"
 
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega" //nolint:staticcheck
 )
 
 type azureLBHelper struct {

acceptance-tests/actors/bbl.go

@@ -10,11 +10,12 @@ import (
 	"syscall"
 	"time"
 
-	acceptance "github.com/cloudfoundry/bosh-bootloader/acceptance-tests"
 	"github.com/kr/pty"
 
+	"github.com/cloudfoundry/bosh-bootloader/acceptance-tests"
+
 	"github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega" //nolint:staticcheck
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
 )
@@ -80,9 +81,9 @@ func (b BBL) Rotate() *gexec.Session {
 
 func (b BBL) VerifySSH(session *gexec.Session, ptmx *os.File) {
 	time.Sleep(5 * time.Second)
-	fmt.Fprintln(ptmx, "whoami | rev")
+	fmt.Fprintln(ptmx, "whoami | rev")                        //nolint:errcheck
 	Eventually(session.Out, 10).Should(gbytes.Say("xobpmuj")) // jumpbox in reverse
-	fmt.Fprintln(ptmx, "exit 0")
+	fmt.Fprintln(ptmx, "exit 0")                              //nolint:errcheck
 	Eventually(session, 5).Should(gexec.Exit(0))
 }
 
@@ -185,7 +186,7 @@ func (b BBL) SaveDirectorCA() string {
 
 	file, err := os.CreateTemp("", "")
 	Expect(err).NotTo(HaveOccurred())
-	defer file.Close()
+	defer file.Close() //nolint:errcheck
 
 	file.Write(stdout.Bytes()) //nolint:errcheck
 
@@ -207,8 +208,8 @@ func (b BBL) StartSSHTunnel() *gexec.Session {
 	for i := 0; i < len(printEnvLines); i++ {
 		if strings.HasPrefix(printEnvLines[i], "ssh ") {
 			sshCmd := strings.TrimPrefix(printEnvLines[i], "ssh ")
-			sshCmd = strings.Replace(sshCmd, "$JUMPBOX_PRIVATE_KEY", getExport("JUMPBOX_PRIVATE_KEY", printEnvLines), -1)
-			sshCmd = strings.Replace(sshCmd, "-f ", "", -1)
+			sshCmd = strings.Replace(sshCmd, "$JUMPBOX_PRIVATE_KEY", getExport("JUMPBOX_PRIVATE_KEY", printEnvLines), -1) //nolint:staticcheck
+			sshCmd = strings.Replace(sshCmd, "-f ", "", -1)                                                               //nolint:staticcheck
 			sshArgs = strings.Split(sshCmd, " ")
 		}
 	}
@@ -280,7 +281,7 @@ func (b BBL) interactiveExecute(args []string, stdout io.Writer, stderr io.Write
 
 	ptmx, pts, err := pty.Open()
 	Expect(err).NotTo(HaveOccurred())
-	defer ptmx.Close()
+	defer ptmx.Close() //nolint:errcheck
 
 	cmd.Stdin = pts
 	cmd.Stdout = pts
@@ -295,7 +296,7 @@ func (b BBL) interactiveExecute(args []string, stdout io.Writer, stderr io.Write
 	Expect(err).NotTo(HaveOccurred())
 
 	// Close our open reference to pts so that ptmx recieves EOF
-	pts.Close()
+	pts.Close() //nolint:errcheck
 
 	actions(session, ptmx)
 

acceptance-tests/actors/gcp.go

@@ -5,13 +5,11 @@ import (
 	"encoding/json"
 	"os"
 
-	"golang.org/x/oauth2/google"
-
-	acceptance "github.com/cloudfoundry/bosh-bootloader/acceptance-tests"
+	"github.com/cloudfoundry/bosh-bootloader/acceptance-tests"
 	"github.com/cloudfoundry/bosh-bootloader/testhelpers"
-	compute "google.golang.org/api/compute/v1"
-
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega" //nolint:staticcheck
+	"golang.org/x/oauth2/google"
+	"google.golang.org/api/compute/v1"
 )
 
 type gcpLBHelper struct {

acceptance-tests/actors/iaas_helper.go

@@ -3,7 +3,7 @@ package actors
 import (
 	"fmt"
 
-	acceptance "github.com/cloudfoundry/bosh-bootloader/acceptance-tests"
+	"github.com/cloudfoundry/bosh-bootloader/acceptance-tests"
 )
 
 type IAASLBHelper interface {

acceptance-tests/bbl/latest_error_test.go

@@ -5,7 +5,7 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	acceptance "github.com/cloudfoundry/bosh-bootloader/acceptance-tests"
+	"github.com/cloudfoundry/bosh-bootloader/acceptance-tests"
 	"github.com/cloudfoundry/bosh-bootloader/storage"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

acceptance-tests/bbl/plan_test.go

@@ -5,13 +5,14 @@ import (
 	"path/filepath"
 	"strings"
 
-	acceptance "github.com/cloudfoundry/bosh-bootloader/acceptance-tests"
-	"github.com/cloudfoundry/bosh-bootloader/acceptance-tests/actors"
-	"github.com/cloudfoundry/bosh-bootloader/storage"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
+
+	"github.com/cloudfoundry/bosh-bootloader/acceptance-tests"
+	"github.com/cloudfoundry/bosh-bootloader/acceptance-tests/actors"
+	"github.com/cloudfoundry/bosh-bootloader/storage"
 )
 
 var _ = Describe("plan", func() {
@@ -80,7 +81,7 @@ var _ = Describe("plan", func() {
 			patchFileHandle, err = os.Create(patchFile)
 			Expect(err).NotTo(HaveOccurred())
 		})
-		defer patchFileHandle.Close()
+		defer patchFileHandle.Close() //nolint:errcheck
 
 		By("rerunning bbl plan", func() {
 			session = bbl.Plan("--name", bbl.PredefinedEnvID())

acceptance-tests/bbl/print_env_test.go

@@ -3,7 +3,7 @@ package acceptance_test
 import (
 	"fmt"
 
-	acceptance "github.com/cloudfoundry/bosh-bootloader/acceptance-tests"
+	"github.com/cloudfoundry/bosh-bootloader/acceptance-tests"
 	"github.com/cloudfoundry/bosh-bootloader/acceptance-tests/actors"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"