Simplify some code with slices and for-range.

Signed-off-by: Mads Jensen <atombrella@users.noreply.github.com>

Author: atombrella

pkg/ip/ipmasq_iptables_linux.go

@@ -18,6 +18,7 @@ import (
 	"errors"
 	"fmt"
 	"net"
+	"slices"
 	"strings"
 
 	"github.com/coreos/go-iptables/iptables"
@@ -62,18 +63,11 @@ func SetupIPMasq(ipn *net.IPNet, chain string, comment string) error {
 	}
 
 	// Create chain if doesn't exist
-	exists := false
 	chains, err := ipt.ListChains("nat")
 	if err != nil {
 		return fmt.Errorf("failed to list chains: %v", err)
 	}
-	for _, ch := range chains {
-		if ch == chain {
-			exists = true
-			break
-		}
-	}
-	if !exists {
+	if !slices.Contains(chains, chain) {
 		if err = ipt.NewChain("nat", chain); err != nil {
 			return err
 		}

pkg/ip/link_linux.go

@@ -73,7 +73,7 @@ func makeVeth(name, vethPeerName string, mtu int, mac string, hostNS ns.NetNS) (
 	var peerName string
 	var veth netlink.Link
 	var err error
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		if vethPeerName != "" {
 			peerName = vethPeerName
 		} else {

pkg/ip/utils_linux.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 // Copyright 2016 CNI authors
 //

pkg/netlinksafe/netlink.go

@@ -54,7 +54,7 @@ func (h Handle) Close() {
 }
 
 func retryOnIntr(f func() error) {
-	for attempt := 0; attempt < maxAttempts; attempt++ {
+	for range maxAttempts {
 		if err := f(); !errors.Is(err, netlink.ErrDumpInterrupted) {
 			return
 		}

pkg/ns/ns_linux_test.go

@@ -129,7 +129,7 @@ var _ = Describe("Linux namespace operations", func() {
 
 				var wg sync.WaitGroup
 				wg.Add(concurrency)
-				for i := 0; i < concurrency; i++ {
+				for range concurrency {
 					go func() {
 						defer wg.Done()
 						targetNetNS.Do(func(hostNS ns.NetNS) error {

pkg/testutils/testing.go

@@ -15,6 +15,8 @@
 package testutils
 
 import (
+	"slices"
+
 	"github.com/containernetworking/cni/pkg/version"
 )
 
@@ -24,12 +26,7 @@ var AllSpecVersions = [...]string{"0.1.0", "0.2.0", "0.3.0", "0.3.1", "0.4.0", "
 // SpecVersionHasIPVersion returns true if the given CNI specification version
 // includes the "version" field in the IP address elements
 func SpecVersionHasIPVersion(ver string) bool {
-	for _, i := range []string{"0.3.0", "0.3.1", "0.4.0"} {
-		if ver == i {
-			return true
-		}
-	}
-	return false
+	return slices.Contains([]string{"0.3.0", "0.3.1", "0.4.0"}, ver)
 }
 
 // SpecVersionHasCHECK returns true if the given CNI specification version

pkg/utils/utils_test.go

@@ -122,7 +122,7 @@ var _ = Describe("Utils", func() {
 		It("is (nearly) perfect (injective function)", func() {
 			hashes := map[string]int{}
 
-			for i := 0; i < 1000; i++ {
+			for i := range 1000 {
 				name := fmt.Sprintf("string %d", i)
 				hashes[MustFormatHashWithPrefix(8, "", name)]++
 			}

plugins/ipam/dhcp/dhcp_test.go

@@ -342,7 +342,7 @@ var _ = Describe("DHCP Operations", func() {
 			wg.Add(3)
 			started := sync.WaitGroup{}
 			started.Add(3)
-			for i := 0; i < 3; i++ {
+			for range 3 {
 				go func() {
 					defer GinkgoRecover()
 

plugins/ipam/dhcp/options_test.go

@@ -46,7 +46,7 @@ func validateRoutes(t *testing.T, routes []*types.Route) {
 		t.Fatalf("wrong length slice; expected %v, got %v", len(expected), len(routes))
 	}
 
-	for i := 0; i < len(routes); i++ {
+	for i := range routes {
 		a := routes[i]
 		e := expected[i]
 

plugins/main/bridge/bridge.go

@@ -21,7 +21,7 @@ import (
 	"net"
 	"os"
 	"runtime"
-	"sort"
+	"slices"
 	"syscall"
 	"time"
 
@@ -194,7 +194,7 @@ func collectVlanTrunk(vlanTrunk []*VlanTrunk) ([]int, error) {
 	for k := range vlanMap {
 		vlans = append(vlans, k)
 	}
-	sort.Slice(vlans, func(i int, j int) bool { return vlans[i] < vlans[j] })
+	slices.Sort(vlans)
 	return vlans, nil
 }