Bump up github action versions and linter

And adjust code to new linter settings

Signed-off-by: Anna Khmelnitsky <[email protected]>

Author: Anna Khmelnitsky

.github/workflows/golangci-lint.yml

@@ -5,10 +5,10 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: 1.22
-      - uses: actions/checkout@v3
+          go-version-file: 'go.mod'
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:

.github/workflows/golangci-ut.yml

@@ -5,10 +5,10 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.22
-      - uses: actions/checkout@v4
+          go-version-file: 'go.mod'
       - name: Install dependencies
         run: |
           go get .

.github/workflows/release.yml

@@ -14,27 +14,29 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       -
         name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version-file: 'go.mod'
       -
         name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.50
-          args: --issues-exit-code=1
+          version: v1.61
+          args: --issues-exit-code=1 --timeout=30m
+          skip-pkg-cache: true
+          skip-build-cache: true
       -
         name: Import GPG key
         id: import_gpg
         uses: crazy-max/ghaction-import-gpg@v6
         with:
-          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
-          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY2 }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE2 }}
       -
         name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v5

.golangci.yml

@@ -6,10 +6,11 @@ issues:
      - SA1019
      - G402
      - G404
+     - G115
      - GetOkExists
 
 run:
-  deadline: 5m
+  deadline: 30m
 
 linters:
   disable-all: true
@@ -20,8 +21,7 @@ linters:
     - staticcheck
     - gosec
     - goimports
-    - vet
-    - revive
+    - govet
     - misspell
     - gosimple
     - staticcheck

nsxt/data_source_nsxt_policy_host_transport_node_collection_realization.go

@@ -4,6 +4,7 @@
 package nsxt
 
 import (
+	"errors"
 	"fmt"
 	"log"
 	"time"
@@ -122,5 +123,5 @@ func getErrorFromState(state *model.TransportNodeCollectionState) error {
 		result += fmt.Sprintf("VCLM transition error: %v\n", *state.VlcmTransitionError)
 	}
 
-	return fmt.Errorf(result)
+	return errors.New(result)
 }

nsxt/data_source_nsxt_policy_uplink_host_switch_profile.go

@@ -5,6 +5,7 @@ package nsxt
 
 import (
 	"fmt"
+
 	"github.com/vmware/vsphere-automation-sdk-go/runtime/bindings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"

nsxt/data_source_nsxt_upgrade_prepare_ready.go

@@ -4,7 +4,9 @@
 package nsxt
 
 import (
+	"errors"
 	"fmt"
+
 	"github.com/vmware/terraform-provider-nsxt/nsxt/util"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -84,7 +86,7 @@ func dataSourceNsxtUpgradePrepareReadyRead(d *schema.ResourceData, m interface{}
 		errMessage += fmt.Sprintf("\nThere are unacknowledged warnings in prechecks:\n%s\nPlease address these errors from NSX or using nsxt_upgrade_precheck_acknowledge resource", preCheckText)
 	}
 	if len(errMessage) > 0 {
-		return fmt.Errorf(errMessage)
+		return errors.New(errMessage)
 	}
 	objID := util.GetVerifiableID(newUUID(), "nsxt_upgrade_prepare_ready")
 	d.SetId(objID)

nsxt/policy_errors.go

@@ -4,6 +4,7 @@
 package nsxt
 
 import (
+	liberrors "errors"
 	"fmt"
 	"log"
 
@@ -104,7 +105,7 @@ func logVapiErrorData(message string, vapiMessages []std.LocalizableMessage, vap
 		}
 	}
 	log.Printf("[ERROR]: %s", details)
-	return fmt.Errorf(details)
+	return liberrors.New(details)
 }
 
 func logAPIError(message string, err error) error {

nsxt/resource_nsxt_lb_pool.go

@@ -251,7 +251,7 @@ func setSnatTranslationInSchema(d *schema.ResourceData, snatTranslation *loadbal
 	if snatTranslation != nil {
 		if snatTranslation.Type_ == "LbSnatIpPool" {
 			elem["type"] = "SNAT_IP_POOL"
-			if snatTranslation.IpAddresses != nil && len(snatTranslation.IpAddresses) > 0 {
+			if len(snatTranslation.IpAddresses) > 0 {
 				elem["ip"] = snatTranslation.IpAddresses[0].IpAddress
 			}
 		} else {
@@ -421,7 +421,7 @@ func resourceNsxtLbPoolRead(d *schema.ResourceData, m interface{}) error {
 	d.Set("description", lbPool.Description)
 	d.Set("display_name", lbPool.DisplayName)
 	setTagsInSchema(d, lbPool.Tags)
-	if lbPool.ActiveMonitorIds != nil && len(lbPool.ActiveMonitorIds) > 0 {
+	if len(lbPool.ActiveMonitorIds) > 0 {
 		d.Set("active_monitor_id", lbPool.ActiveMonitorIds[0])
 	} else {
 		d.Set("active_monitor_id", "")

nsxt/resource_nsxt_policy_ipsec_vpn_session.go

@@ -638,7 +638,7 @@ func resourceNsxtPolicyIPSecVpnSessionRead(d *schema.ResourceData, m interface{}
 		}
 		var subnets []string
 		var prefixLength int64
-		if blockVPN.TunnelInterfaces != nil && len(blockVPN.TunnelInterfaces) > 0 {
+		if len(blockVPN.TunnelInterfaces) > 0 {
 			for _, tunnelInterface := range blockVPN.TunnelInterfaces {
 				ipSubnets := tunnelInterface.IpSubnets
 				for _, ipSubnet := range ipSubnets {