update golangci-lint to v1.61.0

Author: dmacvicar

.github/workflows/test.yml

@@ -34,7 +34,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.55.2
+          version: v1.61.0
           only-new-issues: true
   build:
     name: Build

.golangci.yaml

@@ -6,7 +6,7 @@ linters-settings:
     excludes:
       - G402
       - G106
-  gomnd:
+  mnd:
     ignored-functions:
       - strings.SplitN
   depguard:
@@ -47,7 +47,7 @@ linters:
     - lll
     - errorlint
     - errcheck
-    - gomnd
+    - mnd
     - nolintlint
 
 issues:
@@ -57,7 +57,7 @@ issues:
         - errcheck
     - text: "Magic number: 1024, in <argument> detected"
       linters:
-        - gomnd
+        - mnd
     - text: "ifElseChain: rewrite if-else to switch statement"
       linters:
         - gocritic

libvirt/cloudinit_def.go

@@ -128,7 +128,7 @@ func (ci *defCloudInit) buildTerraformKey(volumeKey string) string {
 	return fmt.Sprintf("%s;%s", volumeKey, uuid.New())
 }
 
-//nolint:gomnd
+//nolint:mnd
 func getCloudInitVolumeKeyFromTerraformID(id string) (string, error) {
 	s := strings.SplitN(id, ";", 2)
 	if len(s) != 2 {

libvirt/coreos_ignition_def.go

@@ -117,7 +117,7 @@ func (ign *defIgnition) buildTerraformKey(volumeKey string) string {
 	return fmt.Sprintf("%s;%s", volumeKey, uuid.New())
 }
 
-//nolint:gomnd
+//nolint:mnd
 func getIgnitionVolumeKeyFromTerraformID(id string) (string, error) {
 	s := strings.SplitN(id, ";", 2)
 	if len(s) != 2 {

libvirt/domain.go

@@ -492,7 +492,7 @@ func setDisks(d *schema.ResourceData, domainDef *libvirtxml.Domain, virConn *lib
 			if wwn, ok := d.GetOk(prefix + ".wwn"); ok {
 				disk.WWN = wwn.(string)
 			} else {
-				//nolint:gomnd
+				//nolint:mnd
 				disk.WWN = randomWWN(10)
 			}
 

libvirt/network.go

@@ -149,7 +149,7 @@ func getNetworkIPConfig(address string) (*libvirtxml.NetworkIP, *libvirtxml.Netw
 
 	ones, bits := ipNet.Mask.Size()
 	family := "ipv4"
-	if bits == (net.IPv6len * 8) { //nolint:gomnd
+	if bits == (net.IPv6len * 8) { //nolint:mnd
 		family = "ipv6"
 	}
 

libvirt/resource_libvirt_domain.go

@@ -39,7 +39,7 @@ func resourceLibvirtDomain() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Timeouts: &schema.ResourceTimeout{
-			//nolint:gomnd
+			//nolint:mnd
 			Create: schema.DefaultTimeout(5 * time.Minute),
 		},
 		Schema: map[string]*schema.Schema{

libvirt/resource_libvirt_network.go

@@ -538,7 +538,7 @@ func resourceLibvirtNetworkRead(ctx context.Context, d *schema.ResourceData, met
 
 	// read add the IP addresses
 	addresses := []string{}
-	//nolint:gomnd
+	//nolint:mnd
 	for _, address := range networkDef.IPs {
 		// we get the host interface IP (ie, 10.10.8.1) but we want the network CIDR (ie, 10.10.8.0/24)
 		// so we need some transformations...

libvirt/utils_net.go

@@ -9,7 +9,7 @@ import (
 // randomMACAddress returns a randomized MAC address
 // with libvirt prefix.
 //
-//nolint:gomnd
+//nolint:mnd
 func randomMACAddress() (string, error) {
 	buf := make([]byte, 3)
 	//nolint:gosec // math.rand is enough for this
@@ -31,7 +31,7 @@ func randomMACAddress() (string, error) {
 		buf[0], buf[1], buf[2]), nil
 }
 
-//nolint:gomnd
+//nolint:mnd
 func getNetMaskWithMax16Bits(m net.IPMask) net.IPMask {
 	ones, bits := m.Size()
 

libvirt/utils_volume.go

@@ -29,7 +29,7 @@ func newCopier(virConn *libvirt.Libvirt, volume *libvirt.StorageVol, size uint64
 	return copier
 }
 
-//nolint:gomnd
+//nolint:mnd
 func timeFromEpoch(str string) time.Time {
 	var s, ns int