run go fix

Author: majst01

.github/workflows/main.yml

@@ -31,10 +31,10 @@ jobs:
     - name: Check out code into the Go module directory
       uses: actions/checkout@v6
 
-    - name: Set up Go 1.25
+    - name: Set up Go 1.26
       uses: actions/setup-go@v6
       with:
-        go-version: "1.25"
+        go-version: "1.26"
         cache: false
 
     - name: fake ipxe binary

Dockerfile

@@ -14,7 +14,7 @@ RUN apt update \
     make \
  && make ipxe
 
-FROM golang:1.25-trixie AS builder
+FROM golang:1.26-trixie AS builder
 WORKDIR /work
 COPY . .
 COPY --from=ipxe-builder /work/ipxe/ipxe /work/ipxe/ipxe

dhcp4/options.go

@@ -21,6 +21,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"maps"
 	"net"
 	"sort"
 )
@@ -134,9 +135,7 @@ func (o Options) Marshal() ([]byte, error) {
 // Copy returns a shallow copy of o.
 func (o Options) Copy() Options {
 	ret := make(Options, len(o))
-	for k, v := range o {
-		ret[k] = v
-	}
+	maps.Copy(ret, o)
 	return ret
 }
 

dhcp4/packet.go

@@ -20,6 +20,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"maps"
 	"net"
 	"sort"
 )
@@ -197,9 +198,7 @@ func (p *Packet) Marshal() ([]byte, error) {
 	ret.Write([]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0})
 
 	opts := make(Options, len(p.Options)+1)
-	for k, v := range p.Options {
-		opts[k] = v
-	}
+	maps.Copy(opts, p.Options)
 	opts[53] = []byte{byte(p.Type)}
 	if optsInSname {
 		opts, err = opts.marshalLimited(ret, 64, true)
@@ -339,9 +338,9 @@ func Unmarshal(bs []byte) (*Packet, error) {
 }
 
 func nullStr(bs []byte) (string, bool) {
-	i := bytes.IndexByte(bs, 0)
-	if i == -1 {
+	before, _, ok := bytes.Cut(bs, []byte{0})
+	if !ok {
 		return "", false
 	}
-	return string(bs[:i]), true
+	return string(before), true
 }

go.mod

@@ -1,6 +1,6 @@
 module github.com/metal-stack/pixie
 
-go 1.25
+go 1.26
 
 require (
 	github.com/metal-stack/api v0.0.45
@@ -12,6 +12,7 @@ require (
 	github.com/stretchr/testify v1.11.1
 	golang.org/x/crypto v0.47.0
 	golang.org/x/net v0.49.0
+	google.golang.org/protobuf v1.36.11
 )
 
 require (
@@ -42,6 +43,5 @@ require (
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/sys v0.40.0 // indirect
 	golang.org/x/text v0.33.0 // indirect
-	google.golang.org/protobuf v1.36.11 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

pixiecore/cli/cli.go

@@ -18,6 +18,7 @@ package cli // import "github.com/metal-stack/pixie/cli"
 import (
 	"fmt"
 	"log/slog"
+	"maps"
 	"os"
 
 	"github.com/metal-stack/pixie/pixiecore"
@@ -142,9 +143,7 @@ func serverFromFlags(cmd *cobra.Command) *pixiecore.Server {
 		MetricsAddress: metricsAddr,
 		DHCPNoBind:     dhcpNoBind,
 	}
-	for fwtype, bs := range Ipxe {
-		ret.Ipxe[fwtype] = bs
-	}
+	maps.Copy(ret.Ipxe, Ipxe)
 	if ipxeBios != "" {
 		ret.Ipxe[pixiecore.FirmwareX86PC] = mustFile(ipxeBios)
 	}

pixiecore/cli/ipv6apicmd.go

@@ -55,7 +55,7 @@ var ipv6ApiCmd = &cobra.Command{
 		}
 		dnsServerAddresses := make([]net.IP, 0)
 		if cmd.Flags().Changed("dns-servers") {
-			for _, dnsServerAddress := range strings.Split(dnsServers, ",") {
+			for dnsServerAddress := range strings.SplitSeq(dnsServers, ",") {
 				dnsServerAddresses = append(dnsServerAddresses, net.ParseIP(dnsServerAddress))
 			}
 		}