Merge pull request #38 from grishy/sg-update-2025-10

grishy · web-flow · commit 91812c51fc37 · 2025-10-13T14:01:05.000+04:00
Update deps  2025-10
diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml
@@ -16,26 +16,26 @@ jobs:
   test:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v6
         with:
-          go-version: "1.25.0"
+          go-version: "1.25.2"
 
       - run: go mod verify
 
       - run: go test -v ./...
 
       - uses: golangci/golangci-lint-action@v8
         with:
-          version: v2.4.0
+          version: v2.5.0
 
   build:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v6
         with:
-          go-version: "1.25.0"
+          go-version: "1.25.2"
 
       - name: Set up QEMU for cross-compilation of Docker images
         uses: docker/setup-qemu-action@v3
@@ -64,7 +64,7 @@ jobs:
             type=raw,value=${{ fromJSON(steps.goreleaser.outputs.metadata).version }}
 
       - name: Test build of Docker images
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: false
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,13 +13,13 @@ jobs:
   release:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
-          go-version: "1.25.0"
+          go-version: "1.25.2"
 
       - name: Set up QEMU for cross-compilation of Docker images
         uses: docker/setup-qemu-action@v3
@@ -56,7 +56,7 @@ jobs:
             type=raw,value=${{ fromJSON(steps.goreleaser.outputs.metadata).version }}
 
       - name: Build and push Docker images
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
@@ -72,3 +72,5 @@ jobs:
             DATE=${{ fromJSON(steps.goreleaser.outputs.metadata).date }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+          provenance: true
+          sbom: true
diff --git a/.golangci.yml b/.golangci.yml
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -38,7 +38,7 @@ release:
   target_commitish: "{{ .Commit }}"
   mode: replace
   header: |
-    ## ℹ️ For information on how to install and use, please see [README.md](https://github.com/grishy/go-avahi-cname)
+    ## [README.md](https://github.com/grishy/go-avahi-cname) - for information on how to install and use
   footer: |
     Your PRs and issues are welcome! Thanks 🙂
   disable: false
diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@
 # Need a lot of additional configuration to build multi-arch images
 
 # STAGE 1: building the executable
-FROM docker.io/golang:1.25.0-alpine3.22 AS builder
+FROM docker.io/golang:1.25.2-alpine3.22 AS builder
 WORKDIR /build
 
 ARG VERSION
diff --git a/avahi/publisher.go b/avahi/publisher.go
@@ -10,10 +10,10 @@ import (
 )
 
 const (
-	// https://github.com/lathiat/avahi/blob/v0.8/avahi-common/defs.h#L343
-	AVAHI_DNS_CLASS_IN = uint16(0x01)
-	// https://github.com/lathiat/avahi/blob/v0.8/avahi-common/defs.h#L331
-	AVAHI_DNS_TYPE_CNAME = uint16(0x05)
+	// AvahiDNSClassIn from  https://github.com/lathiat/avahi/blob/v0.8/avahi-common/defs.h#L343
+	AvahiDNSClassIn = uint16(0x01)
+	// AvahiDNSTypeCName from https://github.com/lathiat/avahi/blob/v0.8/avahi-common/defs.h#L331
+	AvahiDNSTypeCName = uint16(0x05)
 )
 
 type Publisher struct {
@@ -91,8 +91,8 @@ func (p *Publisher) PublishCNAMES(cnames []string, ttl uint32) error {
 			avahi.ProtoUnspec,
 			uint32(0), // From Avahi Python bindings https://gist.github.com/gdamjan/3168336#file-avahi-alias-py-L42
 			cname,
-			AVAHI_DNS_CLASS_IN,
-			AVAHI_DNS_TYPE_CNAME,
+			AvahiDNSClassIn,
+			AvahiDNSTypeCName,
 			ttl,
 			p.rdataField,
 		)
diff --git a/cmd/cname.go b/cmd/cname.go
@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 	"time"
@@ -117,7 +118,7 @@ func Cname(ctx context.Context) *cli.Command {
 			cnames := cCtx.Args().Slice()
 
 			if len(cnames) == 0 {
-				return fmt.Errorf("at least one CNAME should be provided")
+				return errors.New("at least one CNAME should be provided")
 			}
 
 			slog.Info("creating publisher")
diff --git a/cmd/subdomain.go b/cmd/subdomain.go
@@ -66,8 +66,8 @@ func reader(ctx context.Context, conn *net.UDPConn) chan *dnsMsg {
 			}
 			slog.Debug("received UDP message", "bytes", bytesRead, "from", remoteAddress)
 
-			if err := dnsMsg.msg.Unpack(buf[:bytesRead]); err != nil {
-				dnsMsg.err = errors.Join(dnsMsg.err, fmt.Errorf("failed to unpack message: %w", err))
+			if unpackErr := dnsMsg.msg.Unpack(buf[:bytesRead]); unpackErr != nil {
+				dnsMsg.err = errors.Join(dnsMsg.err, fmt.Errorf("failed to unpack message: %w", unpackErr))
 				msgCh <- dnsMsg
 				continue
 			}
@@ -81,10 +81,11 @@ func reader(ctx context.Context, conn *net.UDPConn) chan *dnsMsg {
 }
 
 // selectQuestion filters and selects questions with the given FQDN suffix.
-func selectQuestion(fqdn string, qs []dns.Question) (res []string) {
+func selectQuestion(fqdn string, qs []dns.Question) []string {
 	suffix := strings.ToLower("." + fqdn)
 	slog.Debug("filtering DNS questions", "suffix", suffix, "questions", len(qs))
 
+	res := make([]string, 0, len(qs))
 	for _, q := range qs {
 		slog.Debug("processing question", "name", q.Name, "type", dns.TypeToString[q.Qtype])
 
@@ -114,8 +115,8 @@ func runSubdomain(ctx context.Context, publisher *avahi.Publisher, fqdn string,
 		<-ctx.Done()
 		fmt.Println() // Add new line after ^C
 		slog.Info("closing connection")
-		if err := conn.Close(); err != nil {
-			slog.Error("failed to close connection", "error", err)
+		if closeErr := conn.Close(); closeErr != nil {
+			slog.Error("failed to close connection", "error", closeErr)
 		}
 	}()
 
@@ -132,8 +133,8 @@ func runSubdomain(ctx context.Context, publisher *avahi.Publisher, fqdn string,
 
 		if len(found) > 0 {
 			slog.Debug("publishing matching CNAMEs", "count", len(found))
-			if err := publisher.PublishCNAMES(found, ttl); err != nil {
-				return fmt.Errorf("failed to publish CNAMEs: %w", err)
+			if publishErr := publisher.PublishCNAMES(found, ttl); publishErr != nil {
+				return fmt.Errorf("failed to publish CNAMEs: %w", publishErr)
 			}
 		}
 	}
diff --git a/go.mod b/go.mod
@@ -1,9 +1,9 @@
 module github.com/grishy/go-avahi-cname
 
-go 1.25.0
+go 1.25.2
 
 require (
-	github.com/caarlos0/go-version v0.2.1
+	github.com/caarlos0/go-version v0.2.2
 	github.com/godbus/dbus/v5 v5.1.0
 	github.com/holoplot/go-avahi v1.0.1
 	github.com/lmittmann/tint v1.1.2
@@ -16,9 +16,9 @@ require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 // indirect
-	golang.org/x/mod v0.27.0 // indirect
-	golang.org/x/net v0.43.0 // indirect
-	golang.org/x/sync v0.16.0 // indirect
-	golang.org/x/sys v0.35.0 // indirect
-	golang.org/x/tools v0.36.0 // indirect
+	golang.org/x/mod v0.29.0 // indirect
+	golang.org/x/net v0.46.0 // indirect
+	golang.org/x/sync v0.17.0 // indirect
+	golang.org/x/sys v0.37.0 // indirect
+	golang.org/x/tools v0.38.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-github.com/caarlos0/go-version v0.2.1 h1:bJY5WRvs2RXErLKBELd1WR0U72whX8ELbKg0WtQ9/7A=
-github.com/caarlos0/go-version v0.2.1/go.mod h1:X+rI5VAtJDpcjCjeEIXpxGa5+rTcgur1FK66wS0/944=
+github.com/caarlos0/go-version v0.2.2 h1:5r+nlrg4H2wOVwWjqRqRRIRbZ7ytRmjC9xoMIP0a5kQ=
+github.com/caarlos0/go-version v0.2.2/go.mod h1:X+rI5VAtJDpcjCjeEIXpxGa5+rTcgur1FK66wS0/944=
 github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo=
 github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -21,14 +21,14 @@ github.com/urfave/cli/v2 v2.27.7 h1:bH59vdhbjLv3LAvIu6gd0usJHgoTTPhCFib8qqOwXYU=
 github.com/urfave/cli/v2 v2.27.7/go.mod h1:CyNAG/xg+iAOg0N4MPGZqVmv2rCoP267496AOXUZjA4=
 github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 h1:FnBeRrxr7OU4VvAzt5X7s6266i6cSVkkFPS0TuXWbIg=
 github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
-golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
-golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
-golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
-golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
-golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
-golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
+golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
+golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
+golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
-golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
-golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
+golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
+golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
+golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
diff --git a/main.go b/main.go
@@ -22,7 +22,7 @@ const (
 	appName          = "go-avahi-cname"
 )
 
-// Version information set during build
+// Version information set during build.
 var (
 	version = "dev"
 	commit  = "none"
@@ -48,9 +48,9 @@ func runMain() int {
 	return 0
 }
 
-// run starts and configures the CLI application
+// run starts and configures the CLI application.
 func run(ctx context.Context) error {
-	cli.VersionPrinter = func(c *cli.Context) {
+	cli.VersionPrinter = func(_ *cli.Context) {
 		fmt.Print(buildVersion().String())
 	}
 
@@ -61,7 +61,7 @@ func run(ctx context.Context) error {
 		Description: `A tool that helps you create local domain names for your computer by using the Avahi daemon.
 
 It works in two ways:
-1. Automatic mode (use 'subdomain' command): 
+1. Automatic mode (use 'subdomain' command):
    Any subdomain you try to use (like myapp.computer.local) will automatically point to your computer
 
 2. Manual mode (use 'cname' command):
@@ -91,7 +91,7 @@ Need help? Visit https://github.com/grishy/go-avahi-cname`,
 	return app.Run(os.Args)
 }
 
-// handleGracefulShutdown manages graceful shutdown with timeout
+// handleGracefulShutdown manages graceful shutdown with timeout.
 func handleGracefulShutdown(ctx context.Context) {
 	<-ctx.Done()
 	slog.Info("initiating graceful shutdown...")
@@ -108,7 +108,7 @@ func handleGracefulShutdown(ctx context.Context) {
 	}
 }
 
-// setupLogger configures the global structured logger with appropriate settings
+// setupLogger configures the global structured logger with appropriate settings.
 func setupLogger(c *cli.Context) error {
 	w := os.Stdout
 	level := slog.LevelInfo
@@ -127,7 +127,7 @@ func setupLogger(c *cli.Context) error {
 	return nil
 }
 
-// buildVersion constructs version information for the application
+// buildVersion constructs version information for the application.
 func buildVersion() goversion.Info {
 	return goversion.GetVersionInfo(
 		func(i *goversion.Info) {

Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,8 @@ func reader(ctx context.Context, conn net.UDPConn) chan dnsMsg {`
`66`	`66`	`}`
`67`	`67`	`slog.Debug("received UDP message", "bytes", bytesRead, "from", remoteAddress)`
`68`	`68`
`69`		`- if err := dnsMsg.msg.Unpack(buf[:bytesRead]); err != nil {`
`70`		`- dnsMsg.err = errors.Join(dnsMsg.err, fmt.Errorf("failed to unpack message: %w", err))`
	`69`	`+ if unpackErr := dnsMsg.msg.Unpack(buf[:bytesRead]); unpackErr != nil {`
	`70`	`+ dnsMsg.err = errors.Join(dnsMsg.err, fmt.Errorf("failed to unpack message: %w", unpackErr))`
`71`	`71`	`msgCh <- dnsMsg`
`72`	`72`	`continue`
`73`	`73`	`}`
`@@ -81,10 +81,11 @@ func reader(ctx context.Context, conn net.UDPConn) chan dnsMsg {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`// selectQuestion filters and selects questions with the given FQDN suffix.`
`84`		`-func selectQuestion(fqdn string, qs []dns.Question) (res []string) {`
	`84`	`+func selectQuestion(fqdn string, qs []dns.Question) []string {`
`85`	`85`	`suffix := strings.ToLower("." + fqdn)`
`86`	`86`	`slog.Debug("filtering DNS questions", "suffix", suffix, "questions", len(qs))`
`87`	`87`
	`88`	`+ res := make([]string, 0, len(qs))`
`88`	`89`	`for _, q := range qs {`
`89`	`90`	`slog.Debug("processing question", "name", q.Name, "type", dns.TypeToString[q.Qtype])`
`90`	`91`
`@@ -114,8 +115,8 @@ func runSubdomain(ctx context.Context, publisher *avahi.Publisher, fqdn string,`
`114`	`115`	`<-ctx.Done()`
`115`	`116`	`fmt.Println() // Add new line after ^C`
`116`	`117`	`slog.Info("closing connection")`
`117`		`- if err := conn.Close(); err != nil {`
`118`		`- slog.Error("failed to close connection", "error", err)`
	`118`	`+ if closeErr := conn.Close(); closeErr != nil {`
	`119`	`+ slog.Error("failed to close connection", "error", closeErr)`
`119`	`120`	`}`
`120`	`121`	`}()`
`121`	`122`
`@@ -132,8 +133,8 @@ func runSubdomain(ctx context.Context, publisher *avahi.Publisher, fqdn string,`
`132`	`133`
`133`	`134`	`if len(found) > 0 {`
`134`	`135`	`slog.Debug("publishing matching CNAMEs", "count", len(found))`
`135`		`- if err := publisher.PublishCNAMES(found, ttl); err != nil {`
`136`		`- return fmt.Errorf("failed to publish CNAMEs: %w", err)`
	`136`	`+ if publishErr := publisher.PublishCNAMES(found, ttl); publishErr != nil {`
	`137`	`+ return fmt.Errorf("failed to publish CNAMEs: %w", publishErr)`
`137`	`138`	`}`
`138`	`139`	`}`
`139`	`140`	`}`