run modernize -fix ./...

Author: majewsky

internal/agent/f5/as3/as3_test.go

@@ -120,7 +120,7 @@ func TestGetServiceTenants(t *testing.T) {
 			Label:    "",
 			Remark:   "",
 			Template: "shared",
-			Services: map[string]interface{}{
+			Services: map[string]any{
 				"pool-test-service-id": Pool{
 					Class:  "Pool",
 					Label:  "service-test-service-id",
@@ -151,6 +151,6 @@ func TestGetServiceTenants(t *testing.T) {
 }
 
 func TestGetServiceTenantsWithoutServices(t *testing.T) {
-	expected := Tenant{Class: "Tenant", Label: "", Remark: "", Applications: map[string]Application{"Shared": {Class: "Application", Label: "", Remark: "", Template: "shared", Services: map[string]interface{}{}}}}
+	expected := Tenant{Class: "Tenant", Label: "", Remark: "", Applications: map[string]Application{"Shared": {Class: "Application", Label: "", Remark: "", Template: "shared", Services: map[string]any{}}}}
 	assert.EqualValues(t, expected, GetServiceTenants([]*ExtendedService{}))
 }

internal/agent/f5/bigip/bigip.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"net/url"
 	"os"
+	"slices"
 	"strings"
 	"time"
 
@@ -240,11 +241,9 @@ func (b *BigIP) EnsureGuestVlan(segmentId int) error {
 		for _, deviceHost := range config.Global.Agent.Devices {
 			if strings.HasSuffix(deviceHost, guest.Hostname) {
 				vlanName := fmt.Sprintf("/Common/vlan-%d", segmentId)
-				for _, vlan := range guest.Vlans {
-					if vlan == vlanName {
-						// found, nothing to do
-						return nil
-					}
+				if slices.Contains(guest.Vlans, vlanName) {
+					// found, nothing to do
+					return nil
 				}
 				newGuest := bigip.VcmpGuest{Vlans: internal.Unique(append(guest.Vlans, vlanName))}
 				return (*bigip.BigIP)(b).UpdateVcmpGuest(guest.Name, &newGuest)

internal/agent/f5/f5os/f5os.go

@@ -16,6 +16,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"slices"
 	"strings"
 	"time"
 
@@ -42,7 +43,7 @@ func (t token) Valid() bool {
 		return false
 	}
 
-	var payload map[string]interface{}
+	var payload map[string]any
 	if err = json.Unmarshal(decoded, &payload); err != nil {
 		log.Errorf("error unmarshalling JWT payload: %v", err)
 		return false
@@ -223,15 +224,13 @@ func (f *F5OS) EnsureInterfaceVlan(segmentID int) error {
 		return fmt.Errorf("error fetching trunk VLANs: %w", err)
 	}
 
-	for _, v := range vlans.OpenconfigVlanTrunkVlans {
-		if v == segmentID {
-			log.WithFields(log.Fields{
-				"host":      f.GetHostname(),
-				"segmentID": segmentID,
-				"interface": config.Global.Agent.PhysicalInterface,
-			}).Debug("Trunk VLAN already exists")
-			return nil
-		}
+	if slices.Contains(vlans.OpenconfigVlanTrunkVlans, segmentID) {
+		log.WithFields(log.Fields{
+			"host":      f.GetHostname(),
+			"segmentID": segmentID,
+			"interface": config.Global.Agent.PhysicalInterface,
+		}).Debug("Trunk VLAN already exists")
+		return nil
 	}
 
 	vlans.OpenconfigVlanTrunkVlans = append(vlans.OpenconfigVlanTrunkVlans, segmentID)
@@ -249,23 +248,19 @@ func (f *F5OS) EnsureGuestVlan(segmentId int) error {
 		return fmt.Errorf("error getTenant: %w", err)
 	}
 
-	for _, v := range tenant.State.Vlans {
-		if v == segmentId {
-			log.WithField("host", f.GetHostname()).
-				Debugf("Guest VLAN %d already exists on tenant %s", segmentId, tenant.Name)
-			return nil
-		}
+	if slices.Contains(tenant.State.Vlans, segmentId) {
+		log.WithField("host", f.GetHostname()).
+			Debugf("Guest VLAN %d already exists on tenant %s", segmentId, tenant.Name)
+		return nil
 	}
 
 	path := fmt.Sprintf("api/data/f5-tenants:tenants/tenant=%s/config/vlans", tenant.Name)
 	existingVlans := F5TenantVlans{
 		F5TenantsVlans: tenant.State.Vlans,
 	}
 
-	for _, v := range existingVlans.F5TenantsVlans {
-		if v == segmentId {
-			return nil
-		}
+	if slices.Contains(existingVlans.F5TenantsVlans, segmentId) {
+		return nil
 	}
 
 	existingVlans.F5TenantsVlans = append(existingVlans.F5TenantsVlans, segmentId)
@@ -316,15 +311,7 @@ func (f *F5OS) SyncGuestVLANs(usedSegments map[int]string) error {
 	}
 
 	for _, vid := range tenant.State.Vlans {
-		managed := false
-		for _, vlanName := range VlanNames {
-			if fmt.Sprintf("vlan-%d", vid) == vlanName {
-				managed = true
-				break
-			}
-		}
-
-		if !managed {
+		if !slices.Contains(VlanNames, fmt.Sprintf("vlan-%d", vid)) {
 			// it is a management VLAN, keep it
 			updatedVlans = append(updatedVlans, vid)
 			continue

internal/agent/f5/f5os/openconfig_vlan.go

@@ -17,7 +17,7 @@ type vlan struct {
 	} `json:"config"`
 	Members struct {
 		Member []member `json:"member,omitempty"`
-	} `json:"members,omitempty"`
+	} `json:"members"`
 }
 
 type trunkVlans struct {

internal/client/table_writer.go

@@ -41,7 +41,7 @@ func getRow(row reflect.Value, iMap [][]int) table.Row {
 	}
 
 	r := make([]any, 0)
-	for i := 0; i < len(iMap); i++ {
+	for i := range iMap {
 		r = append(r, formatValue(reflectx.FieldByIndexes(row, iMap[i])))
 	}
 	return r