Merge pull request #127 from NETWAYS/gofix

Apply go fix

Author: martialblog

hp/cntlr/controllers.go

@@ -24,7 +24,7 @@ func (t *CpqDaCntlrTable) ListIds() []string {
 	return t.Snmp.GetSortedOIDs()
 }
 
-func (t *CpqDaCntlrTable) GetValue(id string, oid string) (interface{}, error) {
+func (t *CpqDaCntlrTable) GetValue(id string, oid string) (any, error) {
 	return t.Snmp.GetValue(id, oid)
 }
 

hp/cntlr/firmware_data.go

@@ -5,6 +5,7 @@ package cntlr
 // Effective date: 2020-04-06
 
 // Note: Always validate IsAffected() when changing values here!!
+
 const VersionAffectedRaid1 = "2.62"
 
 var VersionAffectedRaid5 = []string{"1.98", "1.99", "2.02", "2.03"}

hp/drive/drives.go

@@ -24,7 +24,7 @@ func (t *CpqDaPhyDrvTable) ListIds() []string {
 	return t.Snmp.GetSortedOIDs()
 }
 
-func (t *CpqDaPhyDrvTable) GetValue(id string, oid string) (interface{}, error) {
+func (t *CpqDaPhyDrvTable) GetValue(id string, oid string) (any, error) {
 	return t.Snmp.GetValue(id, oid)
 }
 

hp/ilo/firmware.go

@@ -26,7 +26,6 @@ func GetIloInformation(client gosnmp.Handler) (ilo *Ilo, err error) {
 	ilo = &Ilo{}
 
 	iloVariables, err := client.Get(oids)
-
 	if err != nil {
 		err = fmt.Errorf("could not get SNMP data for iLO: %w", err)
 		return

main.go

@@ -139,7 +139,6 @@ func main() {
 
 		// Extract controller data from SNMP Table
 		controllers, err := cntlr.GetControllersFromTable(cntlrTable)
-
 		if err != nil {
 			check.ExitError(err)
 		}

snmp/file_handler.go

@@ -3,33 +3,34 @@ package snmp
 import (
 	"fmt"
 	"io"
+	"maps"
 	"os"
 
 	"github.com/gosnmp/gosnmp"
 )
 
-// Provides a GoSNMP like data interface, but with data from a snmpwalk output
+// FileHandler provides a GoSNMP like data interface, but with data from a snmpwalk output
 //
 // Anyone can generate an output by running:
 //
 //	snmpwalk -c public -v2c -On HOST .1.3.6.1 >snmp-data.txt
 //
 // Warning: This does not implement all functions of gosnmp.Handler
 type FileHandler struct {
-	Data WalkData
-
 	gosnmp.Handler
+
+	Data WalkData
 }
 
-// Create a new file handler and initialize it with data from an io.Reader
+// NewFileHandler creates a new file handler and initialize it with data from an io.Reader
 func NewFileHandler(r io.Reader) (h *FileHandler, err error) {
 	h = &FileHandler{}
 	err = h.ReadFromWalk(r)
 
 	return
 }
 
-// Create a new file handler and initialize it with data by reading from a file
+// NewFileHandlerFromFile creates a new file handler and initialize it with data by reading from a file
 func NewFileHandlerFromFile(filePath string) (h *FileHandler, err error) {
 	fh, err := os.Open(filePath)
 	if err != nil {
@@ -42,7 +43,7 @@ func NewFileHandlerFromFile(filePath string) (h *FileHandler, err error) {
 	return NewFileHandler(fh)
 }
 
-// Read data from a io.Reader and parse it for PDUs
+// ReadFromWalk reads data from a io.Reader and parse it for PDUs
 //
 // They will be stored in Data for later use.
 func (h *FileHandler) ReadFromWalk(r io.Reader) error {
@@ -55,34 +56,32 @@ func (h *FileHandler) ReadFromWalk(r io.Reader) error {
 		return err
 	}
 
-	for k, v := range pduList {
-		h.Data[k] = v
-	}
+	maps.Copy(h.Data, pduList)
 
 	return nil
 }
 
-// Simulate Connect behavior by returning no error
+// Connect simulates Connect behavior by returning no error
 func (h *FileHandler) Connect() error {
 	return nil
 }
 
-// Simulate ConnectIPv4 behavior by returning no error
+// ConnectIPv4 simulates ConnectIPv4 behavior by returning no error
 func (h *FileHandler) ConnectIPv4() error {
 	return nil
 }
 
-// Simulate ConnectIPv6 behavior by returning no error
+// ConnectIPv6 simulates ConnectIPv6 behavior by returning no error
 func (h *FileHandler) ConnectIPv6() error {
 	return nil
 }
 
-// Simulate Close behavior by returning no error
+// Close simulates Close behavior by returning no error
 func (h *FileHandler) Close() error {
 	return nil
 }
 
-// Simulating Get() behavior by searching read in data
+// Get simulates Get() behavior by searching read in data
 func (h *FileHandler) Get(oids []string) (result *gosnmp.SnmpPacket, err error) {
 	result = &gosnmp.SnmpPacket{
 		Version: gosnmp.Version2c,
@@ -102,18 +101,18 @@ func (h *FileHandler) Get(oids []string) (result *gosnmp.SnmpPacket, err error)
 	return
 }
 
-// Not yet implemented
+// GetBulk is not yet implemented
 func (h *FileHandler) GetBulk(oids []string, nonRepeaters uint8,
 	maxRepetitions uint32) (result *gosnmp.SnmpPacket, err error) {
 	panic("not implemented")
 }
 
-// Not yet implemented
+// GetNext is not yet implemented
 func (h *FileHandler) GetNext(oids []string) (result *gosnmp.SnmpPacket, err error) {
 	panic("not implemented")
 }
 
-// Simulating Walk() behavior by searching read in data
+// Walk simulates Walk() behavior by searching read in data
 func (h *FileHandler) Walk(rootOid string, walkFn gosnmp.WalkFunc) (err error) {
 	rootOid, err = EnsureValidOid(rootOid)
 	if err != nil {
@@ -134,17 +133,17 @@ func (h *FileHandler) Walk(rootOid string, walkFn gosnmp.WalkFunc) (err error) {
 	return
 }
 
-// Not yet implemented
+// WalkAll is not yet implemented
 func (h *FileHandler) WalkAll(rootOid string) (results []gosnmp.SnmpPDU, err error) {
 	panic("not implemented")
 }
 
-// Not yet implemented
+// BulkWalk is not yet implemented
 func (h *FileHandler) BulkWalk(rootOid string, walkFn gosnmp.WalkFunc) error {
 	panic("not implemented")
 }
 
-// Not yet implemented
+// BulkWalkAll is not yet implemented
 func (h *FileHandler) BulkWalkAll(rootOid string) (results []gosnmp.SnmpPDU, err error) {
 	panic("not implemented")
 }

snmp/snmpwalk.go

@@ -146,7 +146,7 @@ func ParseWalkLine(line string) (pdu *gosnmp.SnmpPDU, err error) {
 	return
 }
 
-// Test if an OID is in a valid format like `.1.23.456`
+// IsValidOid tests whether an OID is in a valid format like `.1.23.456`
 func IsValidOid(oid string) error {
 	if len(oid) == 0 {
 		return fmt.Errorf("oid is empty")
@@ -168,8 +168,7 @@ func IsValidOid(oid string) error {
 	return nil
 }
 
-// Test an OID, but prefix a missing dot
-//
+// EnsureValidOid tests whether an OID is valid, but prefix a missing dot
 // Useful to be compatible with the base implementation of SNMP, where it is optional.
 func EnsureValidOid(oid string) (string, error) {
 	if oid[0] != '.' {

snmp/table.go

@@ -28,7 +28,8 @@ func (t *Table) Reset() {
 func (t *Table) Walk() error {
 	t.Reset()
 
-	if err := t.Client.Walk(t.Oid, t.addWalkValue); err != nil {
+	err := t.Client.Walk(t.Oid, t.addWalkValue)
+	if err != nil {
 		return err
 	}
 
@@ -39,7 +40,7 @@ func (t *Table) Walk() error {
 	return nil
 }
 
-func (t *Table) GetValue(id string, oid string) (interface{}, error) {
+func (t *Table) GetValue(id string, oid string) (any, error) {
 	parts := strings.Split(oid, ".")
 	column := parts[len(parts)-1]