all: upd go, deps, tools, scripts

.github/workflows/build.yml

@@ -1,7 +1,7 @@
 'name': 'build'
 
 'env':
-  'GO_VERSION': '1.23.2'
+  'GO_VERSION': '1.23.3'
   'NODE_VERSION': '16'
 
 'on':

.github/workflows/lint.yml

@@ -1,7 +1,7 @@
 'name': 'lint'
 
 'env':
-  'GO_VERSION': '1.23.2'
+  'GO_VERSION': '1.23.3'
 
 'on':
   'push':

CHANGELOG.md

@@ -27,8 +27,13 @@ NOTE: Add new changes BELOW THIS COMMENT.
 
 ### Security
 
+- Go version has been updated to prevent the possibility of exploiting the Go
+  vulnerabilities fixed in [1.23.3][go-1.23.3].
+
 - The release executables are now signed.
 
+[go-1.23.3]: https://groups.google.com/g/golang-announce/c/X5KodEJYuqI
+
 <!--
 NOTE: Add new changes ABOVE THIS COMMENT.
 -->

Makefile

@@ -27,8 +27,8 @@ DEPLOY_SCRIPT_PATH = not/a/real/path
 DIST_DIR = dist
 GOAMD64 = v1
 GOPROXY = https://proxy.golang.org|direct
-GOTOOLCHAIN = go1.23.2
 GOTELEMETRY = off
+GOTOOLCHAIN = go1.23.3
 GPG_KEY = devteam@adguard.com
 GPG_KEY_PASSPHRASE = not-a-real-password
 NPM = npm

bamboo-specs/release.yaml

@@ -8,7 +8,7 @@
 'variables':
     'channel': 'edge'
     'dockerFrontend': 'adguard/home-js-builder:2.0'
-    'dockerGo': 'adguard/go-builder:1.23.2--1'
+    'dockerGo': 'adguard/go-builder:1.23.3--1'
 
 'stages':
   - 'Build frontend':
@@ -276,7 +276,7 @@
         'variables':
             'channel': 'beta'
             'dockerFrontend': 'adguard/home-js-builder:2.0'
-            'dockerGo': 'adguard/go-builder:1.23.2--1'
+            'dockerGo': 'adguard/go-builder:1.23.3--1'
     # release-vX.Y.Z branches are the branches from which the actual final
     # release is built.
   - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
@@ -292,4 +292,4 @@
         'variables':
             'channel': 'release'
             'dockerFrontend': 'adguard/home-js-builder:2.0'
-            'dockerGo': 'adguard/go-builder:1.23.2--1'
+            'dockerGo': 'adguard/go-builder:1.23.3--1'

bamboo-specs/test.yaml

@@ -6,7 +6,7 @@
     'name': 'AdGuard Home - Build and run tests'
 'variables':
     'dockerFrontend': 'adguard/home-js-builder:2.0'
-    'dockerGo': 'adguard/go-builder:1.23.2--1'
+    'dockerGo': 'adguard/go-builder:1.23.3--1'
     'channel': 'development'
 
 'stages':
@@ -196,5 +196,5 @@
         # may need to build a few of these.
         'variables':
             'dockerFrontend': 'adguard/home-js-builder:2.0'
-            'dockerGo': 'adguard/go-builder:1.23.2--1'
+            'dockerGo': 'adguard/go-builder:1.23.3--1'
             'channel': 'candidate'

go.mod

@@ -1,11 +1,11 @@
 module github.com/AdguardTeam/AdGuardHome
 
-go 1.23.2
+go 1.23.3
 
 require (
 	// TODO(a.garipov):  Update when v0.73.3 is released.
 	github.com/AdguardTeam/dnsproxy v0.73.3-0.20241004151328-c7c7b977a2a3
-	github.com/AdguardTeam/golibs v0.30.1
+	github.com/AdguardTeam/golibs v0.30.2
 	github.com/AdguardTeam/urlfilter v0.20.0
 	github.com/NYTimes/gziphandler v1.1.1
 	github.com/ameshkov/dnscrypt/v2 v2.3.0
@@ -13,7 +13,7 @@ require (
 	github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500
 	github.com/digineo/go-ipset/v2 v2.2.1
 	github.com/dimfeld/httptreemux/v5 v5.5.0
-	github.com/fsnotify/fsnotify v1.7.0
+	github.com/fsnotify/fsnotify v1.8.0
 	github.com/go-ping/ping v1.1.0
 	github.com/google/go-cmp v0.6.0
 	github.com/google/gopacket v1.1.19
@@ -49,9 +49,9 @@ require (
 	github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
-	github.com/google/pprof v0.0.0-20241029010322-833c56d90c8e // indirect
+	github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 // indirect
 	github.com/mdlayher/socket v0.5.1 // indirect
-	github.com/onsi/ginkgo/v2 v2.20.2 // indirect
+	github.com/onsi/ginkgo/v2 v2.21.0 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pierrec/lz4/v4 v4.1.21 // indirect
 	github.com/pkg/errors v0.9.1 // indirect

go.sum

@@ -1,7 +1,7 @@
 github.com/AdguardTeam/dnsproxy v0.73.3-0.20241004151328-c7c7b977a2a3 h1:IGXwBjdKDzUm007QzZyxSllMnkbdXe7K79x7JWcBW/E=
 github.com/AdguardTeam/dnsproxy v0.73.3-0.20241004151328-c7c7b977a2a3/go.mod h1:356iHROxo+SOdBVifp1MXEh6qHyydtzGCcsQMfx+ZVs=
-github.com/AdguardTeam/golibs v0.30.1 h1:/yv7dq2h7WXw/jTDxkE3FP9zHerRT+i03PZRHJX4fPU=
+github.com/AdguardTeam/golibs v0.30.2 h1:urU/NAyIvQOeArBqDmKCDpaRkfTCJ26uSiSuDMKQfuY=
-github.com/AdguardTeam/golibs v0.30.1/go.mod h1:FkwcNQEJoGsgDGXcalrVa/4gWbE68KsmE2guXWtBQUE=
+github.com/AdguardTeam/golibs v0.30.2/go.mod h1:FkwcNQEJoGsgDGXcalrVa/4gWbE68KsmE2guXWtBQUE=
 github.com/AdguardTeam/urlfilter v0.20.0 h1:X32qiuVCVd8WDYCEsbdZKfXMzwdVqrdulamtUi4rmzs=
 github.com/AdguardTeam/urlfilter v0.20.0/go.mod h1:gjrywLTxfJh6JOkwi9SU+frhP7kVVEZ5exFGkR99qpk=
 github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
@@ -27,8 +27,8 @@ github.com/digineo/go-ipset/v2 v2.2.1 h1:k6skY+0fMqeUjjeWO/m5OuWPSZUAn7AucHMnQ1M
 github.com/digineo/go-ipset/v2 v2.2.1/go.mod h1:wBsNzJlZlABHUITkesrggFnZQtgW5wkqw1uo8Qxe0VU=
 github.com/dimfeld/httptreemux/v5 v5.5.0 h1:p8jkiMrCuZ0CmhwYLcbNbl7DDo21fozhKHQ2PccwOFQ=
 github.com/dimfeld/httptreemux/v5 v5.5.0/go.mod h1:QeEylH57C0v3VO0tkKraVz9oD3Uu93CKPnTLbsidvSw=
-github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
-github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
+github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
@@ -44,8 +44,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
 github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
-github.com/google/pprof v0.0.0-20241029010322-833c56d90c8e h1:v7R0PZoC2p1KWQmv1+GqCXQe59Ab1TkDF8Y9Lg2W6m4=
+github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 h1:sAGdeJj0bnMgUNVeUpp6AYlVdCt3/GdI3pGRqsNSQLs=
-github.com/google/pprof v0.0.0-20241029010322-833c56d90c8e/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
+github.com/google/pprof v0.0.0-20241101162523-b92577c0c142/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/renameio/v2 v2.0.0 h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg=
 github.com/google/renameio/v2 v2.0.0/go.mod h1:BtmJXm5YlszgC+TD4HOEEUFgkJP3nLxehU6hfe7jRt4=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -82,10 +82,10 @@ github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
 github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4=
+github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
-github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag=
+github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
-github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
+github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8=
-github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
+github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=

internal/client/index.go

@@ -2,6 +2,7 @@ package client
 
 import (
 	"fmt"
+	"maps"
 	"net"
 	"net/netip"
 	"slices"
@@ -9,7 +10,6 @@ import (
 
 	"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
 	"github.com/AdguardTeam/golibs/errors"
-	"golang.org/x/exp/maps"
 )
 
 // macKey contains MAC as byte array of 6, 8, or 20 bytes.
@@ -330,12 +330,14 @@ func (ci *index) size() (n int) {
 // rangeByName is like [Index.Range] but sorts the persistent clients by name
 // before iterating ensuring a predictable order.
 func (ci *index) rangeByName(f func(c *Persistent) (cont bool)) {
-	cs := maps.Values(ci.uidToClient)
+	clients := slices.SortedStableFunc(
-	slices.SortFunc(cs, func(a, b *Persistent) (n int) {
+		maps.Values(ci.uidToClient),
+		func(a, b *Persistent) (res int) {
 			return strings.Compare(a.Name, b.Name)
-	})
+		},
+	)
 
-	for _, c := range cs {
+	for _, c := range clients {
 		if !f(c) {
 			break
 		}

internal/stats/unit.go

@@ -5,6 +5,7 @@ import (
 	"encoding/binary"
 	"encoding/gob"
 	"fmt"
+	"maps"
 	"slices"
 	"time"
 
@@ -12,7 +13,6 @@ import (
 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/logutil/slogutil"
 	"go.etcd.io/bbolt"
-	"golang.org/x/exp/maps"
 )
 
 const (
@@ -234,18 +234,15 @@ func (a countPair) compareCount(b countPair) (res int) {
 	}
 }
 
-func convertMapToSlice(m map[string]uint64, max int) (s []countPair) {
+func convertMapToSlice(m map[string]uint64, maxVal int) (s []countPair) {
 	s = make([]countPair, 0, len(m))
 	for k, v := range m {
 		s = append(s, countPair{Name: k, Count: v})
 	}
 
 	slices.SortFunc(s, countPair.compareCount)
-	if max > len(s) {
-		max = len(s)
-	}
 
-	return s[:max]
+	return s[:min(maxVal, len(s))]
 }
 
 func convertSliceToMap(a []countPair) (m map[string]uint64) {
@@ -611,9 +608,7 @@ func microsecondsToSeconds(n float64) (r float64) {
 func prepareTopUpstreamsAvgTime(
 	upstreamsAvgTime topAddrsFloat,
 ) (topUpstreamsAvgTime []topAddrsFloat) {
-	keys := maps.Keys(upstreamsAvgTime)
+	keys := slices.SortedStableFunc(maps.Keys(upstreamsAvgTime), func(a, b string) (res int) {
-
-	slices.SortFunc(keys, func(a, b string) (res int) {
 		switch x, y := upstreamsAvgTime[a], upstreamsAvgTime[b]; {
 		case x > y:
 			return -1

internal/tools/go.mod

@@ -1,27 +1,28 @@
 module github.com/AdguardTeam/AdGuardHome/internal/tools
 
-go 1.23.2
+go 1.23.3
 
 require (
 	github.com/fzipp/gocyclo v0.6.0
 	github.com/golangci/misspell v0.6.0
 	github.com/gordonklaus/ineffassign v0.1.0
+	github.com/jstemmer/go-junit-report/v2 v2.1.0
 	github.com/kisielk/errcheck v1.8.0
-	github.com/kyoh86/looppointer v0.2.1
 	github.com/securego/gosec/v2 v2.21.4
 	github.com/uudashr/gocognit v1.1.3
 	golang.org/x/tools v0.26.0
 	golang.org/x/vuln v1.1.3
 	honnef.co/go/tools v0.5.1
 	mvdan.cc/gofumpt v0.7.0
+	mvdan.cc/sh/v3 v3.10.0
 	mvdan.cc/unparam v0.0.0-20240917084806-57a3b4290ba3
 )
 
 require (
 	cloud.google.com/go v0.116.0 // indirect
 	cloud.google.com/go/ai v0.8.2 // indirect
-	cloud.google.com/go/auth v0.9.9 // indirect
+	cloud.google.com/go/auth v0.10.1 // indirect
-	cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
+	cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect
 	cloud.google.com/go/compute/metadata v0.5.2 // indirect
 	cloud.google.com/go/longrunning v0.6.2 // indirect
 	github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
@@ -32,12 +33,13 @@ require (
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/generative-ai-go v0.18.0 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/renameio/v2 v2.0.0 // indirect
 	github.com/google/s2a-go v0.1.8 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
 	github.com/googleapis/gax-go/v2 v2.13.0 // indirect
 	github.com/gookit/color v1.5.4 // indirect
-	github.com/kyoh86/nolint v0.0.1 // indirect
+	github.com/rogpeppe/go-internal v1.13.1 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 // indirect
@@ -53,13 +55,15 @@ require (
 	golang.org/x/oauth2 v0.23.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
 	golang.org/x/sys v0.26.0 // indirect
-	golang.org/x/telemetry v0.0.0-20241028140143-9c0d19e65ba0 // indirect
+	golang.org/x/telemetry v0.0.0-20241106142447-58a1122356f5 // indirect
+	golang.org/x/term v0.25.0 // indirect
 	golang.org/x/text v0.19.0 // indirect
 	golang.org/x/time v0.7.0 // indirect
-	google.golang.org/api v0.203.0 // indirect
+	google.golang.org/api v0.205.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
 	google.golang.org/grpc v1.67.1 // indirect
 	google.golang.org/protobuf v1.35.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	mvdan.cc/editorconfig v0.3.0 // indirect
 )

internal/tools/go.sum

@@ -3,10 +3,10 @@ cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE=
 cloud.google.com/go v0.116.0/go.mod h1:cEPSRWPzZEswwdr9BxE6ChEn01dWlTaF05LiC2Xs70U=
 cloud.google.com/go/ai v0.8.2 h1:LEaQwqBv+k2ybrcdTtCTc9OPZXoEdcQaGrfvDYS6Bnk=
 cloud.google.com/go/ai v0.8.2/go.mod h1:Wb3EUUGWwB6yHBaUf/+oxUq/6XbCaU1yh0GrwUS8lr4=
-cloud.google.com/go/auth v0.9.9 h1:BmtbpNQozo8ZwW2t7QJjnrQtdganSdmqeIBxHxNkEZQ=
+cloud.google.com/go/auth v0.10.1 h1:TnK46qldSfHWt2a0b/hciaiVJsmDXWy9FqyUan0uYiI=
-cloud.google.com/go/auth v0.9.9/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI=
+cloud.google.com/go/auth v0.10.1/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI=
-cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY=
+cloud.google.com/go/auth/oauth2adapt v0.2.5 h1:2p29+dePqsCHPP1bqDJcKj4qxRyYCcbzKpFyKGt3MTk=
-cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc=
+cloud.google.com/go/auth/oauth2adapt v0.2.5/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8=
 cloud.google.com/go/compute/metadata v0.5.2 h1:UxK4uu/Tn+I3p2dYWTfiX4wva7aYlKixAHn3fyqngqo=
 cloud.google.com/go/compute/metadata v0.5.2/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k=
 cloud.google.com/go/longrunning v0.6.2 h1:xjDfh1pQcWPEvnfjZmwjKQEcHnpz6lHjfy7Fo0MK+hc=
@@ -67,12 +67,15 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA=
 github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/renameio/v2 v2.0.0 h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg=
+github.com/google/renameio/v2 v2.0.0/go.mod h1:BtmJXm5YlszgC+TD4HOEEUFgkJP3nLxehU6hfe7jRt4=
 github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM=
 github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -86,16 +89,14 @@ github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0=
 github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w=
 github.com/gordonklaus/ineffassign v0.1.0 h1:y2Gd/9I7MdY1oEIt+n+rowjBNDcLQq3RsH5hwJd0f9s=
 github.com/gordonklaus/ineffassign v0.1.0/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0=
+github.com/jstemmer/go-junit-report/v2 v2.1.0 h1:X3+hPYlSczH9IMIpSC9CQSZA0L+BipYafciZUWHEmsc=
+github.com/jstemmer/go-junit-report/v2 v2.1.0/go.mod h1:mgHVr7VUo5Tn8OLVr1cKnLuEy0M92wdRntM99h7RkgQ=
 github.com/kisielk/errcheck v1.8.0 h1:ZX/URYa7ilESY19ik/vBmCn6zdGQLxACwjAcWbHlYlg=
 github.com/kisielk/errcheck v1.8.0/go.mod h1:1kLL+jV4e+CFfueBmI1dSK2ADDyQnlrnrY/FqKluHJQ=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kyoh86/looppointer v0.2.1 h1:Jx9fnkBj/JrIryBLMTYNTj9rvc2SrPS98Dg0w7fxdJg=
-github.com/kyoh86/looppointer v0.2.1/go.mod h1:q358WcM8cMWU+5vzqukvaZtnJi1kw/MpRHQm3xvTrjw=
-github.com/kyoh86/nolint v0.0.1 h1:GjNxDEkVn2wAxKHtP7iNTrRxytRZ1wXxLV5j4XzGfRU=
-github.com/kyoh86/nolint v0.0.1/go.mod h1:1ZiZZ7qqrZ9dZegU96phwVcdQOMKIqRzFJL3ewq9gtI=
 github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4=
 github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag=
 github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8=
@@ -103,8 +104,8 @@ github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
+github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/securego/gosec/v2 v2.21.4 h1:Le8MSj0PDmOnHJgUATjD96PaXRvCpKC+DGJvwyy0Mlk=
 github.com/securego/gosec/v2 v2.21.4/go.mod h1:Jtb/MwRQfRxCXyCm1rfM1BEiiiTfUOdyzzAhlr6lUTA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -121,7 +122,6 @@ github.com/uudashr/gocognit v1.1.3 h1:l+a111VcDbKfynh+airAy/DJQKaXh2m9vkoysMPSZy
 github.com/uudashr/gocognit v1.1.3/go.mod h1:aKH8/e8xbTRBwjbCkwZ8qt4l2EpKXl31KMHgSS+lZ2U=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
@@ -148,7 +148,6 @@ golang.org/x/exp/typeparams v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:AbB0pIl
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
 golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
@@ -158,7 +157,6 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
@@ -169,23 +167,23 @@ golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbht
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
 golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
 golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/telemetry v0.0.0-20241028140143-9c0d19e65ba0 h1:od0RE4kmouF+x/o4zkTTSvBnGPZ2azGgCUmZdrbnEXM=
+golang.org/x/telemetry v0.0.0-20241106142447-58a1122356f5 h1:TCDqnvbBsFapViksHcHySl/sW4+rTGNIAoJJesHRuMM=
-golang.org/x/telemetry v0.0.0-20241028140143-9c0d19e65ba0/go.mod h1:8nZWdGp9pq73ZI//QJyckMQab3yq7hoWi7SI0UIusVI=
+golang.org/x/telemetry v0.0.0-20241106142447-58a1122356f5/go.mod h1:8nZWdGp9pq73ZI//QJyckMQab3yq7hoWi7SI0UIusVI=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
+golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
@@ -198,7 +196,6 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20201007032633-0806396f153e/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
 golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
@@ -208,17 +205,17 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.203.0 h1:SrEeuwU3S11Wlscsn+LA1kb/Y5xT8uggJSkIhD08NAU=
+google.golang.org/api v0.205.0 h1:LFaxkAIpDb/GsrWV20dMMo5MR0h8UARTbn24LmD+0Pg=
-google.golang.org/api v0.203.0/go.mod h1:BuOVyCSYEPwJb3npWvDnNmFI92f3GeRnHNkETneT3SI=
+google.golang.org/api v0.205.0/go.mod h1:NrK1EMqO8Xk6l6QwRAmrXXg2v6dzukhlOyvkYtnvUuc=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 h1:2oV8dfuIkM1Ti7DwXc0BJfnwr9csz4TDXI9EmiI+Rbw=
+google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 h1:M0KvPgPmDZHPlbRbaNU1APr28TvwvvdUPlSv7PUvy8g=
-google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38/go.mod h1:vuAjtvlwkDKF6L1GQ0SokiRLCGFfeBUXWr/aFFkHACc=
+google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:dguCy7UOdZhTvLzDyt15+rOrawrpM4q7DD9dQ1P11P4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
@@ -246,7 +243,11 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.5.1 h1:4bH5o3b5ZULQ4UrBmP+63W9r7qIkqJClEA9ko5YKx+I=
 honnef.co/go/tools v0.5.1/go.mod h1:e9irvo83WDG9/irijV44wr3tbhcFeRnfpVlRqVwpzMs=
+mvdan.cc/editorconfig v0.3.0 h1:D1D2wLYEYGpawWT5SpM5pRivgEgXjtEXwC9MWhEY0gQ=
+mvdan.cc/editorconfig v0.3.0/go.mod h1:NcJHuDtNOTEJ6251indKiWuzK6+VcrMuLzGMLKBFupQ=
 mvdan.cc/gofumpt v0.7.0 h1:bg91ttqXmi9y2xawvkuMXyvAA/1ZGJqYAEGjXuP0JXU=
 mvdan.cc/gofumpt v0.7.0/go.mod h1:txVFJy/Sc/mvaycET54pV8SW8gWxTlUuGHVEcncmNUo=
+mvdan.cc/sh/v3 v3.10.0 h1:v9z7N1DLZ7owyLM/SXZQkBSXcwr2IGMm2LY2pmhVXj4=
+mvdan.cc/sh/v3 v3.10.0/go.mod h1:z/mSSVyLFGZzqb3ZIKojjyqIx/xbmz/UHdCSv9HmqXY=
 mvdan.cc/unparam v0.0.0-20240917084806-57a3b4290ba3 h1:YkmTN1n5U60NM02j7TCSWRlW3fqNiuXe/eVXf0dLFN8=
 mvdan.cc/unparam v0.0.0-20240917084806-57a3b4290ba3/go.mod h1:z5yboO1sP1Q9pcfvS597TpfbNXQjphDlkCJHzt13ybc=

internal/tools/tools.go

@@ -10,8 +10,8 @@ import (
 	_ "github.com/fzipp/gocyclo/cmd/gocyclo"
 	_ "github.com/golangci/misspell/cmd/misspell"
 	_ "github.com/gordonklaus/ineffassign"
+	_ "github.com/jstemmer/go-junit-report/v2"
 	_ "github.com/kisielk/errcheck"
-	_ "github.com/kyoh86/looppointer"
 	_ "github.com/securego/gosec/v2/cmd/gosec"
 	_ "github.com/uudashr/gocognit/cmd/gocognit"
 	_ "golang.org/x/tools/go/analysis/passes/nilness/cmd/nilness"
@@ -19,5 +19,6 @@ import (
 	_ "golang.org/x/vuln/cmd/govulncheck"
 	_ "honnef.co/go/tools/cmd/staticcheck"
 	_ "mvdan.cc/gofumpt"
+	_ "mvdan.cc/sh/v3/cmd/shfmt"
 	_ "mvdan.cc/unparam"
 )

internal/updater/check.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"maps"
 	"net/http"
 	"slices"
 	"time"
@@ -12,7 +13,6 @@ import (
 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/ioutil"
 	"github.com/AdguardTeam/golibs/log"
-	"golang.org/x/exp/maps"
 )
 
 // TODO(a.garipov): Make configurable.
@@ -120,8 +120,8 @@ func (u *Updater) downloadURL(versionObj map[string]string) (dlURL, key string,
 		return dlURL, key, true
 	}
 
-	keys := maps.Keys(versionObj)
+	keys := slices.Sorted(maps.Keys(versionObj))
-	slices.Sort(keys)
+
 	log.Error("updater: key %q not found; got keys %q", key, keys)
 
 	return "", key, false

scripts/blocked-services/main.go

@@ -16,6 +16,7 @@ import (
 	"text/template"
 	"time"
 
+	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/logutil/slogutil"
 )
 
@@ -30,14 +31,13 @@ func main() {
 
 	// Validate the URL.
 	_, err := url.Parse(urlStr)
-	check(err)
+	errors.Check(err)
 
 	c := &http.Client{
 		Timeout: 10 * time.Second,
 	}
 
-	resp, err := c.Get(urlStr)
+	resp := errors.Must(c.Get(urlStr))
-	check(err)
 	defer slogutil.CloseAndLog(ctx, l, resp.Body, slog.LevelError)
 
 	if resp.StatusCode != http.StatusOK {
@@ -46,7 +46,7 @@ func main() {
 
 	hlSvcs := &hlServices{}
 	err = json.NewDecoder(resp.Body).Decode(hlSvcs)
-	check(err)
+	errors.Check(err)
 
 	// Sort all services and rules to make the output more predictable.
 	slices.SortStableFunc(hlSvcs.BlockedServices, func(a, b *hlServicesService) (res int) {
@@ -59,20 +59,21 @@ func main() {
 	// Use another set of delimiters to prevent them interfering with the Go
 	// code.
 	tmpl, err := template.New("main").Delims("<%", "%>").Funcs(template.FuncMap{
-		"isnotlast": func(idx, sliceLen int) (ok bool) { return idx != sliceLen-1 },
+		"isnotlast": func(idx, sliceLen int) (ok bool) {
+			return idx != sliceLen-1
+		},
 	}).Parse(tmplStr)
-	check(err)
+	errors.Check(err)
 
 	f, err := os.OpenFile(
 		"./internal/filtering/servicelist.go",
 		os.O_CREATE|os.O_TRUNC|os.O_WRONLY,
 		0o644,
 	)
-	check(err)
+	errors.Check(err)
 	defer slogutil.CloseAndLog(ctx, l, f, slog.LevelError)
 
-	err = tmpl.Execute(f, hlSvcs)
+	errors.Check(tmpl.Execute(f, hlSvcs))
-	check(err)
 }
 
 // tmplStr is the template for the Go source file with the services.
@@ -100,13 +101,6 @@ var blockedServices = []blockedService{<% $l := len .BlockedServices %>
 }<% if isnotlast $i $l %>, <% end %><% end %>}
 `
 
-// check is a simple error-checking helper for scripts.
-func check(err error) {
-	if err != nil {
-		panic(err)
-	}
-}
-
 // hlServices is the JSON structure for the Hostlists Registry blocked service
 // index.
 type hlServices struct {

scripts/hooks/pre-commit

@@ -2,60 +2,54 @@
 
 set -e -f -u
 
-# This comment is used to simplify checking local copies of the script.
+# This comment is used to simplify checking local copies of the script.  Bump
-# Bump this number every time a significant change is made to this
+# this number every time a significant change is made to this script.
-# script.
 #
-# AdGuard-Project-Version: 3
+# AdGuard-Project-Version: 5
 
 # TODO(a.garipov): Add pre-merge-commit.
 
-# Only show interactive prompts if there a terminal is attached to
+# Only show interactive prompts if there a terminal is attached to stdout.
-# stdout.  While this technically doesn't guarantee that reading from
+# While this technically doesn't guarantee that reading from /dev/tty works,
-# /dev/tty works, this should work reasonably well on all of our
+# this should work reasonably well on all of our supported development systems
-# supported development systems and in most terminal emulators.
+# and in most terminal emulators.
 is_tty='0'
-if [ -t '1' ]
+if [ -t '1' ]; then
-then
 	is_tty='1'
 fi
 readonly is_tty
 
-# prompt is a helper that prompts the user for interactive input if that
+# prompt is a helper that prompts the user for interactive input if that can be
-# can be done.  If there is no terminal attached, it sleeps for two
+# done.  If there is no terminal attached, it sleeps for two seconds, giving the
-# seconds, giving the programmer some time to react, and returns with
+# programmer some time to react, and returns with a zero exit code.
-# a zero exit code.
 prompt() {
-	if [ "$is_tty" -eq '0' ]
+	if [ "$is_tty" -eq '0' ]; then
-	then
 		sleep 2
 
 		return 0
 	fi
 
-	while true
+	while true; do
-	do
 		printf 'commit anyway? y/[n]: '
 		read -r ans </dev/tty
 
-		case "$ans"
+		case "$ans" in
-		in
+		'y' | 'Y')
-		('y'|'Y')
 			break
 			;;
-		(''|'n'|'N')
+		'' | 'n' | 'N')
 			exit 1
 			;;
-		(*)
+		*)
 			continue
 			;;
 		esac
 	done
 }
 
-# Warn the programmer about unstaged changes and untracked files, but do
+# Warn the programmer about unstaged changes and untracked files, but do not
-# not fail the commit, because those changes might be temporary or for
+# fail the commit, because those changes might be temporary or for a different
-# a different branch.
+# branch.
 #
 # shellcheck disable=SC2016
 awk_prog='substr($2, 2, 1) != "." { print $9; } $1 == "?" { print $2; }'
@@ -64,19 +58,22 @@ readonly awk_prog
 unstaged="$(git status --porcelain=2 | awk "$awk_prog")"
 readonly unstaged
 
-if [ "$unstaged" != '' ]
+if [ "$unstaged" != '' ]; then
-then
 	printf 'WARNING: you have unstaged changes:\n\n%s\n\n' "$unstaged"
 	prompt
 fi
 
-# Warn the programmer about temporary todos, but do not fail the commit,
+# Warn the programmer about temporary todos and skel FIXMEs, but do not fail the
-# because the commit could be in a temporary branch.
+# commit, because the commit could be in a temporary branch.
-temp_todos="$( git grep -e 'TODO.*!!' -- ':!scripts/hooks/pre-commit' || : )"
+temp_todos="$(
+	git grep -e 'FIXME' -e 'TODO.*!!' -- \
+		':!./scripts/hooks/pre-commit' \
+		':!./client' \
+		|| :
+)"
 readonly temp_todos
 
-if [ "$temp_todos" != '' ]
+if [ "$temp_todos" != '' ]; then
-then
 	printf 'WARNING: you have temporary todos:\n\n%s\n\n' "$temp_todos"
 	prompt
 fi
@@ -84,32 +81,18 @@ fi
 verbose="${VERBOSE:-0}"
 readonly verbose
 
-if [ "$( git diff --cached --name-only -- 'client/*.js' || true )" != '' ]
+if [ "$(git diff --cached --name-only -- '*.md' || :)" != '' ]; then
-then
-	make VERBOSE="$verbose" js-lint js-test
-fi
-
-if [ "$( git diff --cached --name-only -- '*.go' '*.mod' 'Makefile' || true )" != '' ]
-then
-	make VERBOSE="$verbose" go-os-check go-lint go-test
-fi
-
-if [ "$( git diff --cached --name-only -- '*.md' || true )" != '' ]
-then
 	make VERBOSE="$verbose" md-lint
 fi
 
-if [ "$( git diff --cached --name-only -- '*.sh' || true )" != '' ]
+if [ "$(git diff --cached --name-only -- '*.sh' || :)" != '' ]; then
-then
 	make VERBOSE="$verbose" sh-lint
 fi
 
-if [ "$( git diff --cached --name-only -- '*.md' '*.txt' '*.yaml' '*.yml' || true )" != '' ]
+if [ "$(git diff --cached --name-only -- '*.md' '*.yaml' '*.yml' || :)" != '' ]; then
-then
 	make VERBOSE="$verbose" txt-lint
 fi
 
-if [ "$( git diff --cached --name-only -- './openapi/openapi.yaml' || true )" != '' ]
+if [ "$(git diff --cached --name-only -- '*.go' '*.mod' 'Makefile' || :)" != '' ]; then
-then
+	make VERBOSE="$verbose" go-os-check go-lint go-test
-	make VERBOSE="$verbose" openapi-lint
 fi

scripts/make/clean.sh

@@ -3,8 +3,7 @@
 verbose="${VERBOSE:-0}"
 readonly verbose
 
-if [ "$verbose" -gt '0' ]
+if [ "$verbose" -gt '0' ]; then
-then
 	set -x
 fi
 

scripts/make/go-bench.sh

@@ -7,13 +7,11 @@ readonly verbose
 #   0 = Don't print anything except for errors.
 #   1 = Print commands, but not nested commands.
 #   2 = Print everything.
-if [ "$verbose" -gt '1' ]
+if [ "$verbose" -gt '1' ]; then
-then
 	set -x
 	v_flags='-v=1'
 	x_flags='-x=1'
-elif [ "$verbose" -gt '0' ]
+elif [ "$verbose" -gt '0' ]; then
-then
 	set -x
 	v_flags='-v=1'
 	x_flags='-x=0'
@@ -26,8 +24,7 @@ readonly v_flags x_flags
 
 set -e -f -u
 
-if [ "${RACE:-1}" -eq '0' ]
+if [ "${RACE:-1}" -eq '0' ]; then
-then
 	race_flags='--race=0'
 else
 	race_flags='--race=1'
@@ -50,6 +47,6 @@ readonly go count_flags shuffle_flags timeout_flags
 	"$v_flags" \
 	--bench='.' \
 	--benchmem \
-	--benchtime=1s\
+	--benchtime='1s' \
 	--run='^$' \
 	./...

scripts/make/go-build.sh

@@ -9,7 +9,7 @@
 # This comment is used to simplify checking local copies of the script.  Bump
 # this number every time a significant change is made to this script.
 #
-# AdGuard-Project-Version: 1
+# AdGuard-Project-Version: 2
 
 # The default verbosity level is 0.  Show every command that is run and every
 # package that is processed if the caller requested verbosity level greater than
@@ -18,14 +18,12 @@
 verbose="${VERBOSE:-0}"
 readonly verbose
 
-if [ "$verbose" -gt '1' ]
+if [ "$verbose" -gt '1' ]; then
-then
 	env
 	set -x
 	v_flags='-v=1'
 	x_flags='-x=1'
-elif [ "$verbose" -gt '0' ]
+elif [ "$verbose" -gt '0' ]; then
-then
 	set -x
 	v_flags='-v=1'
 	x_flags='-x=0'
@@ -49,12 +47,11 @@ readonly go
 channel="${CHANNEL:?please set CHANNEL}"
 readonly channel
 
-case "$channel"
+case "$channel" in
-in
+'development' | 'edge' | 'beta' | 'release' | 'candidate')
-('development'|'edge'|'beta'|'release'|'candidate')
 	# All is well, go on.
 	;;
-(*)
+*)
 	echo "invalid channel '$channel', supported values are \
 		'development', 'edge', 'beta', 'release', and 'candidate'" 1>&2
 	exit 1
@@ -64,8 +61,7 @@ esac
 # Check VERSION against the default value from the Makefile.  If it is that, use
 # the version calculation script.
 version="${VERSION:-}"
-if [ "$version" = 'v0.0.0' ] || [ "$version" = '' ]
+if [ "$version" = 'v0.0.0' ] || [ "$version" = '' ]; then
-then
 	version="$(sh ./scripts/make/version.sh)"
 fi
 readonly version
@@ -84,11 +80,9 @@ ldflags="-s -w"
 ldflags="${ldflags} -X ${version_pkg}.version=${version}"
 ldflags="${ldflags} -X ${version_pkg}.channel=${channel}"
 ldflags="${ldflags} -X ${version_pkg}.committime=${committime}"
-if [ "${GOARM:-}" != '' ]
+if [ "${GOARM:-}" != '' ]; then
-then
 	ldflags="${ldflags} -X ${version_pkg}.goarm=${GOARM}"
-elif [ "${GOMIPS:-}" != '' ]
+elif [ "${GOMIPS:-}" != '' ]; then
-then
 	ldflags="${ldflags} -X ${version_pkg}.gomips=${GOMIPS}"
 fi
 readonly ldflags
@@ -99,8 +93,7 @@ readonly parallelism
 
 # Use GOFLAGS for -p, because -p=0 simply disables the build instead of leaving
 # the default value.
-if [ "${parallelism}" != '' ]
+if [ "${parallelism}" != '' ]; then
-then
 	GOFLAGS="${GOFLAGS:-} -p=${parallelism}"
 fi
 readonly GOFLAGS
@@ -115,8 +108,7 @@ readonly o_flags
 
 # Allow users to enable the race detector.  Unfortunately, that means that cgo
 # must be enabled.
-if [ "${RACE:-0}" -eq '0' ]
+if [ "${RACE:-0}" -eq '0' ]; then
-then
 	CGO_ENABLED='0'
 	race_flags='--race=0'
 else
@@ -130,16 +122,14 @@ GO111MODULE='on'
 export GO111MODULE
 
 # Build the new binary if requested.
-if [ "${NEXTAPI:-0}" -eq '0' ]
+if [ "${NEXTAPI:-0}" -eq '0' ]; then
-then
 	tags_flags='--tags='
 else
 	tags_flags='--tags=next'
 fi
 readonly tags_flags
 
-if [ "$verbose" -gt '0' ]
+if [ "$verbose" -gt '0' ]; then
-then
 	"$go" env
 fi
 
@@ -150,4 +140,5 @@ fi
 	--trimpath \
 	"$o_flags" \
 	"$v_flags" \
-	"$x_flags"
+	"$x_flags" \
+	;

scripts/make/go-deps.sh

@@ -3,18 +3,16 @@
 # This comment is used to simplify checking local copies of the script.  Bump
 # this number every time a significant change is made to this script.
 #
-# AdGuard-Project-Version: 1
+# AdGuard-Project-Version: 2
 
 verbose="${VERBOSE:-0}"
 readonly verbose
 
-if [ "$verbose" -gt '1' ]
+if [ "$verbose" -gt '1' ]; then
-then
 	env
 	set -x
 	x_flags='-x=1'
-elif [ "$verbose" -gt '0' ]
+elif [ "$verbose" -gt '0' ]; then
-then
 	set -x
 	x_flags='-x=0'
 else

scripts/make/go-fuzz.sh

@@ -7,13 +7,11 @@ readonly verbose
 #   0 = Don't print anything except for errors.
 #   1 = Print commands, but not nested commands.
 #   2 = Print everything.
-if [ "$verbose" -gt '1' ]
+if [ "$verbose" -gt '1' ]; then
-then
 	set -x
 	v_flags='-v=1'
 	x_flags='-x=1'
-elif [ "$verbose" -gt '0' ]
+elif [ "$verbose" -gt '0' ]; then
-then
 	set -x
 	v_flags='-v=1'
 	x_flags='-x=0'
@@ -26,8 +24,7 @@ readonly v_flags x_flags
 
 set -e -f -u
 
-if [ "${RACE:-1}" -eq '0' ]
+if [ "${RACE:-1}" -eq '0' ]; then
-then
 	race_flags='--race=0'
 else
 	race_flags='--race=1'

scripts/make/go-lint.sh

@@ -3,19 +3,17 @@
 # This comment is used to simplify checking local copies of the script.  Bump
 # this number every time a significant change is made to this script.
 #
-# AdGuard-Project-Version: 8
+# AdGuard-Project-Version: 13
 
 verbose="${VERBOSE:-0}"
 readonly verbose
 
-if [ "$verbose" -gt '0' ]
+if [ "$verbose" -gt '0' ]; then
-then
 	set -x
 fi
 
 # Set $EXIT_ON_ERROR to zero to see all errors.
-if [ "${EXIT_ON_ERROR:-1}" -eq '0' ]
+if [ "${EXIT_ON_ERROR:-1}" -eq '0' ]; then
-then
 	set +e
 else
 	set -e
@@ -23,13 +21,9 @@ fi
 
 set -f -u
 
-
-
 # Source the common helpers, including not_found and run_linter.
 . ./scripts/make/helper.sh
 
-
-
 # Simple analyzers
 
 # blocklist_imports is a simple check against unwanted packages.  The following
@@ -38,8 +32,15 @@ set -f -u
 #   *  Package errors is replaced by our own package in the
 #      github.com/AdguardTeam/golibs module.
 #
-#   *  Packages golang.org/x/exp/slices and golang.org/x/net/context have been
+#   *  Packages log and github.com/AdguardTeam/golibs/log are replaced by
-#      moved into stdlib.
+#      stdlib's new package log/slog and AdGuard's new utilities package
+#      github.com/AdguardTeam/golibs/logutil/slogutil.
+#
+#   *  Package github.com/prometheus/client_golang/prometheus/promauto is not
+#      recommended, as it encourages reliance on global state.
+#
+#   *  Packages golang.org/x/exp/maps, golang.org/x/exp/slices, and
+#      golang.org/x/net/context have been moved into stdlib.
 #
 #   *  Package io/ioutil is soft-deprecated.
 #
@@ -54,33 +55,41 @@ set -f -u
 #
 #   *  Package unsafe is… unsafe.
 #
-# If your project needs more exceptions, add and document them.  Currently,
+# Currently, the only standard exception are files generated from protobuf
-# there are only two standard exceptions:
+# schemas, which use package reflect.  If your project needs more exceptions,
+# add and document them.
 #
-#   *  Files generated from protobuf schemas, which use package reflect.
+# NOTE:  Flag -H for grep is non-POSIX but all of Busybox, GNU, macOS, and
+# OpenBSD support it.
 #
-#   *  Windows-specific code caused by golang.org/x/sys/windows API design.
+# NOTE:  Exclude the permission_windows.go, because it requires unsafe for the
+# OS APIs.
 #
 # TODO(a.garipov): Add golibs/log.
-#
-# TODO(a.garipov): Add deprecated package golang.org/x/exp/maps once all
-# projects switch to Go 1.23.
 blocklist_imports() {
-	git grep\
+	find . \
-		-e '[[:space:]]"errors"$'\
+		-type 'f' \
-		-e '[[:space:]]"golang.org/x/exp/slices"$'\
+		-name '*.go' \
-		-e '[[:space:]]"golang.org/x/net/context"$'\
+		'!' '(' \
-		-e '[[:space:]]"io/ioutil"$'\
+		-name '*.pb.go' \
-		-e '[[:space:]]"log"$'\
+		-o -path './internal/aghos/permission_windows.go' \
-		-e '[[:space:]]"reflect"$'\
+		')' \
-		-e '[[:space:]]"sort"$'\
+		-exec \
-		-e '[[:space:]]"unsafe"$'\
+		'grep' \
-		-n\
+		'-H' \
-		-- '*.go'\
+		'-e' '[[:space:]]"errors"$' \
-		':!*.pb.go'\
+		'-e' '[[:space:]]"github.com/prometheus/client_golang/prometheus/promauto"$' \
-		':!./internal/aghos/permission_windows.go'\
+		'-e' '[[:space:]]"golang.org/x/exp/maps"$' \
-		| sed -e 's/^\([^[:space:]]\+\)\(.*\)$/\1 blocked import:\2/'\
+		'-e' '[[:space:]]"golang.org/x/exp/slices"$' \
-		|| exit 0
+		'-e' '[[:space:]]"golang.org/x/net/context"$' \
+		'-e' '[[:space:]]"io/ioutil"$' \
+		'-e' '[[:space:]]"log"$' \
+		'-e' '[[:space:]]"reflect"$' \
+		'-e' '[[:space:]]"sort"$' \
+		'-e' '[[:space:]]"unsafe"$' \
+		'-n' \
+		'{}' \
+		';'
 }
 
 # method_const is a simple check against the usage of some raw strings and
@@ -121,8 +130,7 @@ underscores() {
 	)"
 	readonly underscore_files
 
-	if [ "$underscore_files" != '' ]
+	if [ "$underscore_files" != '' ]; then
-	then
 		echo 'found file names with underscores:'
 		echo "$underscore_files"
 	fi
@@ -130,10 +138,6 @@ underscores() {
 
 # TODO(a.garipov): Add an analyzer to look for `fallthrough`, `goto`, and `new`?
 
-
-
-# Checks
-
 run_linter -e blocklist_imports
 
 run_linter -e method_const

scripts/make/go-test.sh

@@ -3,7 +3,7 @@
 # This comment is used to simplify checking local copies of the script.  Bump
 # this number every time a significant change is made to this script.
 #
-# AdGuard-Project-Version: 1
+# AdGuard-Project-Version: 6
 
 verbose="${VERBOSE:-0}"
 readonly verbose
@@ -12,13 +12,11 @@ readonly verbose
 #   0 = Don't print anything except for errors.
 #   1 = Print commands, but not nested commands.
 #   2 = Print everything.
-if [ "$verbose" -gt '1' ]
+if [ "$verbose" -gt '1' ]; then
-then
 	set -x
 	v_flags='-v=1'
 	x_flags='-x=1'
-elif [ "$verbose" -gt '0' ]
+elif [ "$verbose" -gt '0' ]; then
-then
 	set -x
 	v_flags='-v=1'
 	x_flags='-x=0'
@@ -31,23 +29,21 @@ readonly v_flags x_flags
 
 set -e -f -u
 
-if [ "${RACE:-1}" -eq '0' ]
+if [ "${RACE:-1}" -eq '0' ]; then
-then
 	race_flags='--race=0'
 else
 	race_flags='--race=1'
 fi
 readonly race_flags
 
+count_flags='--count=2'
+cover_flags='--coverprofile=./cover.out'
 go="${GO:-go}"
-readonly go
-
-count_flags='--count=1'
-cover_flags='--coverprofile=./coverage.txt'
 shuffle_flags='--shuffle=on'
 timeout_flags="${TIMEOUT_FLAGS:---timeout=90s}"
-readonly count_flags cover_flags shuffle_flags timeout_flags
+readonly count_flags cover_flags go shuffle_flags timeout_flags
 
+go_test() {
 	"$go" test \
 		"$count_flags" \
 		"$cover_flags" \
@@ -57,3 +53,30 @@ readonly count_flags cover_flags shuffle_flags timeout_flags
 		"$v_flags" \
 		"$x_flags" \
 		./...
+}
+
+test_reports_dir="${TEST_REPORTS_DIR:-}"
+readonly test_reports_dir
+
+if [ "$test_reports_dir" = '' ]; then
+	go_test
+
+	exit "$?"
+fi
+
+mkdir -p "$test_reports_dir"
+
+# NOTE:  The pipe ignoring the exit code here is intentional, as go-junit-report
+# will set the exit code to be saved.
+go_test 2>&1 \
+	| tee "${test_reports_dir}/test-output.txt"
+
+# Don't fail on errors in exporting, because TEST_REPORTS_DIR is generally only
+# not empty in CI, and so the exit code must be preserved to exit with it later.
+set +e
+go-junit-report \
+	--in "${test_reports_dir}/test-output.txt" \
+	--set-exit-code \
+	>"${test_reports_dir}/test-report.xml"
+printf '%s\n' "$?" \
+	>"${test_reports_dir}/test-exit-code.txt"

scripts/make/go-tools.sh

@@ -3,18 +3,16 @@
 # This comment is used to simplify checking local copies of the script.  Bump
 # this number every time a significant change is made to this script.
 #
-# AdGuard-Project-Version: 4
+# AdGuard-Project-Version: 6
 
 verbose="${VERBOSE:-0}"
 readonly verbose
 
-if [ "$verbose" -gt '1' ]
+if [ "$verbose" -gt '1' ]; then
-then
 	set -x
 	v_flags='-v=1'
 	x_flags='-x=1'
-elif [ "$verbose" -gt '0' ]
+elif [ "$verbose" -gt '0' ]; then
-then
 	set -x
 	v_flags='-v=1'
 	x_flags='-x=0'
@@ -36,6 +34,7 @@ readonly go
 rm -f \
 	bin/errcheck \
 	bin/fieldalignment \
+	bin/go-junit-report \
 	bin/gocognit \
 	bin/gocyclo \
 	bin/gofumpt \
@@ -45,6 +44,7 @@ rm -f\
 	bin/misspell \
 	bin/nilness \
 	bin/shadow \
+	bin/shfmt \
 	bin/staticcheck \
 	bin/unparam \
 	;
@@ -64,6 +64,7 @@ env\
 	github.com/fzipp/gocyclo/cmd/gocyclo \
 	github.com/golangci/misspell/cmd/misspell \
 	github.com/gordonklaus/ineffassign \
+	github.com/jstemmer/go-junit-report/v2 \
 	github.com/kisielk/errcheck \
 	github.com/securego/gosec/v2/cmd/gosec \
 	github.com/uudashr/gocognit/cmd/gocognit \
@@ -73,5 +74,6 @@ env\
 	golang.org/x/vuln/cmd/govulncheck \
 	honnef.co/go/tools/cmd/staticcheck \
 	mvdan.cc/gofumpt \
+	mvdan.cc/sh/v3/cmd/shfmt \
 	mvdan.cc/unparam \
 	;

scripts/make/go-upd-tools.sh

@@ -3,18 +3,16 @@
 # This comment is used to simplify checking local copies of the script.  Bump
 # this number every time a significant change is made to this script.
 #
-# AdGuard-Project-Version: 2
+# AdGuard-Project-Version: 3
 
 verbose="${VERBOSE:-0}"
 readonly verbose
 
-if [ "$verbose" -gt '1' ]
+if [ "$verbose" -gt '1' ]; then
-then
 	env
 	set -x
 	x_flags='-x=1'
-elif [ "$verbose" -gt '0' ]
+elif [ "$verbose" -gt '0' ]; then
-then
 	set -x
 	x_flags='-x=0'
 else

scripts/make/helper.sh

@@ -8,9 +8,7 @@
 # This comment is used to simplify checking local copies of the script.  Bump
 # this number every time a remarkable change is made to this script.
 #
-# AdGuard-Project-Version: 3
+# AdGuard-Project-Version: 4
-
-
 
 # Deferred helpers
 
@@ -23,8 +21,7 @@ make sure you have installed the linter binaries using:
 readonly not_found_msg
 
 not_found() {
-	if [ "$?" -eq '127' ]
+	if [ "$?" -eq '127' ]; then
-	then
 		# Code 127 is the exit status a shell uses when a command or a file is
 		# not found, according to the Bash Hackers wiki.
 		#
@@ -34,8 +31,6 @@ not_found() {
 }
 trap not_found EXIT
 
-
-
 # Helpers
 
 # run_linter runs the given linter with two additions:
@@ -47,8 +42,7 @@ trap not_found EXIT
 run_linter() (
 	set +e
 
-	if [ "${VERBOSE:-0}" -lt '2' ]
+	if [ "${VERBOSE:-0}" -lt '2' ]; then
-	then
 		set +x
 	fi
 
@@ -56,8 +50,7 @@ run_linter() (
 	shift
 
 	exit_on_output='0'
-	if [ "$cmd" = '-e' ]
+	if [ "$cmd" = '-e' ]; then
-	then
 		exit_on_output='1'
 		cmd="${1:?run_linter: provide a command}"
 		shift
@@ -70,12 +63,10 @@ run_linter() (
 
 	readonly output
 
-	if [ "$output" != '' ]
+	if [ "$output" != '' ]; then
-	then
 		echo "$output" | sed -e "s/^/${cmd}: /"
 
-		if [ "$exitcode" -eq '0' ] && [ "$exit_on_output" -eq '1' ]
+		if [ "$exitcode" -eq '0' ] && [ "$exit_on_output" -eq '1' ]; then
-		then
 			exitcode='1'
 		fi
 	fi

scripts/make/md-lint.sh

@@ -3,21 +3,18 @@
 # This comment is used to simplify checking local copies of the script.  Bump
 # this number every time a remarkable change is made to this script.
 #
-# AdGuard-Project-Version: 2
+# AdGuard-Project-Version: 3
 
 verbose="${VERBOSE:-0}"
 readonly verbose
 
 set -e -f -u
 
-if [ "$verbose" -gt '0' ]
+if [ "$verbose" -gt '0' ]; then
-then
 	set -x
 fi
 
-# NOTE: Adjust for your project.
+# TODO(e.burkov):  Lint markdown documents within this project.
 # markdownlint \
 # 	./README.md \
 # 	;
-
-# TODO(e.burkov):  Lint markdown documents within this project.

scripts/make/sh-lint.sh

@@ -3,7 +3,7 @@
 # This comment is used to simplify checking local copies of the script.  Bump
 # this number every time a remarkable change is made to this script.
 #
-# AdGuard-Project-Version: 2
+# AdGuard-Project-Version: 3
 
 verbose="${VERBOSE:-0}"
 readonly verbose
@@ -11,16 +11,23 @@ readonly verbose
 # Don't use -f, because we use globs in this script.
 set -e -u
 
-if [ "$verbose" -gt '0' ]
+if [ "$verbose" -gt '0' ]; then
-then
 	set -x
 fi
 
-# NOTE: Adjust for your project.
+# Source the common helpers, including not_found and run_linter.
-#
+. ./scripts/make/helper.sh
-# TODO(e.burkov):  Add build-docker.sh, build-release.sh and install.sh.
+
+run_linter -e shfmt --binary-next-line -d -p -s \
+	./scripts/hooks/* \
+	./scripts/make/*.sh \
+	./scripts/snap/*.sh \
+	./snap/local/*.sh \
+	;
+
 shellcheck -e 'SC2250' -f 'gcc' -o 'all' -x -- \
 	./scripts/hooks/* \
-	./scripts/snap/*\
+	./scripts/make/*.sh \
-	./scripts/make/*\
+	./scripts/snap/*.sh \
+	./snap/local/*.sh \
 	;

scripts/make/txt-lint.sh

@@ -3,19 +3,17 @@
 # This comment is used to simplify checking local copies of the script.  Bump
 # this number every time a remarkable change is made to this script.
 #
-# AdGuard-Project-Version: 5
+# AdGuard-Project-Version: 8
 
 verbose="${VERBOSE:-0}"
 readonly verbose
 
-if [ "$verbose" -gt '0' ]
+if [ "$verbose" -gt '0' ]; then
-then
 	set -x
 fi
 
 # Set $EXIT_ON_ERROR to zero to see all errors.
-if [ "${EXIT_ON_ERROR:-1}" -eq '0' ]
+if [ "${EXIT_ON_ERROR:-1}" -eq '0' ]; then
-then
 	set +e
 else
 	set -e
@@ -32,19 +30,30 @@ set -f -u
 # trailing_newlines is a simple check that makes sure that all plain-text files
 # have a trailing newlines to make sure that all tools work correctly with them.
 trailing_newlines() (
-	nl="$( printf "\n" )"
+	nl="$(printf '\n')"
 	readonly nl
 
-	# NOTE: Adjust for your project.
+	find . \
-	git ls-files\
+		-type 'f' \
-		':!*.png'\
+		'!' '(' \
-		':!*.tar.gz'\
+		-name '*.db' \
-		':!*.zip'\
+		-o -name '*.exe' \
-		| while read -r f
+		-o -name '*.out' \
-		do
+		-o -name '*.png' \
+		-o -name '*.svg' \
+		-o -name '*.tar.gz' \
+		-o -name '*.test' \
+		-o -name '*.zip' \
+		-o -name 'AdGuardHome' \
+		-o -name 'adguard-home' \
+		-o -path '*/node_modules/*' \
+		-o -path './.git/*' \
+		-o -path './bin/*' \
+		-o -path './build/*' \
+		')' \
+		| while read -r f; do
 			final_byte="$(tail -c -1 "$f")"
-			if [ "$final_byte" != "$nl" ]
+			if [ "$final_byte" != "$nl" ]; then
-			then
 				printf '%s: must have a trailing newline\n' "$f"
 			fi
 		done
@@ -53,18 +62,25 @@ trailing_newlines() (
 # trailing_whitespace is a simple check that makes sure that there are no
 # trailing whitespace in plain-text files.
 trailing_whitespace() {
-	# NOTE: Adjust for your project.
+	find . \
-	git ls-files\
+		-type 'f' \
-		':!*.bmp'\
+		'!' '(' \
-		':!*.jpg'\
+		-name '*.db' \
-		':!*.mmdb'\
+		-o -name '*.exe' \
-		':!*.png'\
+		-o -name '*.out' \
-		':!*.svg'\
+		-o -name '*.png' \
-		':!*.tar.gz'\
+		-o -name '*.svg' \
-		':!*.webp'\
+		-o -name '*.tar.gz' \
-		':!*.zip'\
+		-o -name '*.test' \
-		| while read -r f
+		-o -name '*.zip' \
-		do
+		-o -name 'AdGuardHome' \
+		-o -name 'adguard-home' \
+		-o -path '*/node_modules/*' \
+		-o -path './.git/*' \
+		-o -path './bin/*' \
+		-o -path './build/*' \
+		')' \
+		| while read -r f; do
 			grep -e '[[:space:]]$' -n -- "$f" \
 				| sed -e "s:^:${f}\::" -e 's/ \+$/>>>&<<</'
 		done
@@ -74,7 +90,18 @@ run_linter -e trailing_newlines
 
 run_linter -e trailing_whitespace
 
-git ls-files -- '*.conf' '*.md' '*.txt' '*.yaml' '*.yml'\
+find . \
-	'client/src/__locales/en.json'\
+	-type 'f' \
-	| xargs misspell --error\
+	'!' '(' \
-	| sed -e 's/^/misspell: /'
+	-path '*/node_modules/*' \
+	-o -path './data/filters/*' \
+	')' \
+	'(' \
+	-name 'Makefile' \
+	-o -name '*.conf' \
+	-o -name '*.md' \
+	-o -name '*.txt' \
+	-o -name '*.yaml' \
+	-o -name '*.yml' \
+	')' \
+	-exec 'misspell' '--error' '{}' '+'

scripts/make/version.sh

@@ -25,8 +25,7 @@
 verbose="${VERBOSE:-0}"
 readonly verbose
 
-if [ "$verbose" -gt '0' ]
+if [ "$verbose" -gt '0' ]; then
-then
 	set -x
 fi
 
@@ -65,15 +64,15 @@ get_last_minor_zero() {
 	git tag \
 		| grep -e 'v[0-9]\+\.[0-9]\+\.0$' \
 		| sort -k 1.2,1nr -k 2,2nr -t '.' \
-		| head -n 1
+		| head -n 1 \
+		;
 }
 
 channel="${CHANNEL:?please set CHANNEL}"
 readonly channel
 
-case "$channel"
+case "$channel" in
-in
+'development')
-('development')
 	# commit_number is the number of current commit within the branch.
 	commit_number="$(git rev-list --count master..HEAD)"
 	readonly commit_number
@@ -85,7 +84,7 @@ in
 	#
 	version="v0.0.0-dev.${commit_number}+$(git rev-parse --short HEAD)"
 	;;
-('edge')
+'edge')
 	# last_minor_zero is the last new minor release.
 	last_minor_zero="$(get_last_minor_zero)"
 	readonly last_minor_zero
@@ -108,7 +107,7 @@ in
 	#
 	version="${next_minor}-a.${num_commits_since_minor}+$(git rev-parse --short HEAD)"
 	;;
-('beta'|'release')
+'beta' | 'release')
 	# current_desc is the description of the current git commit.  If the
 	# current commit is tagged, git describe will show the tag.
 	current_desc="$(git describe)"
@@ -119,8 +118,7 @@ in
 	readonly last_tag
 
 	# Require an actual tag for the beta and final releases.
-	if [ "$current_desc" != "$last_tag" ]
+	if [ "$current_desc" != "$last_tag" ]; then
-	then
 		echo 'need a tag' 1>&2
 
 		exit 1
@@ -128,7 +126,7 @@ in
 
 	version="$last_tag"
 	;;
-('candidate')
+'candidate')
 	# This pseudo-channel is used to set a proper versions into release
 	# candidate builds.
 
@@ -144,8 +142,7 @@ in
 	#
 	#   rc-v12.34.56
 	#
-	if ! echo "$current_branch" | grep -E -e '^rc-v[0-9]+\.[0-9]+\.[0-9]+$' -q
+	if ! echo "$current_branch" | grep -E -e '^rc-v[0-9]+\.[0-9]+\.[0-9]+$' -q; then
-	then
 		echo "invalid release candidate branch name '$current_branch'" 1>&2
 
 		exit 1
@@ -153,7 +150,7 @@ in
 
 	version="${current_branch#rc-}-rc.$(git rev-list --count "$last_tag"..HEAD)"
 	;;
-(*)
+*)
 	echo "invalid channel '$channel', supported values are \
 		'development', 'edge', 'beta', 'release' and 'candidate'" 1>&2
 	exit 1
@@ -161,8 +158,7 @@ in
 esac
 
 # Finally, make sure that we don't output invalid versions.
-if ! echo "$version" | grep -E -e '^v[0-9]+\.[0-9]+\.[0-9]+(-(a|b|dev|rc)\.[0-9]+)?(\+[[:xdigit:]]+)?$' -q
+if ! echo "$version" | grep -E -e '^v[0-9]+\.[0-9]+\.[0-9]+(-(a|b|dev|rc)\.[0-9]+)?(\+[[:xdigit:]]+)?$' -q; then
-then
 	echo "generated an invalid version '$version'" 1>&2
 
 	exit 1

scripts/snap/build.sh

@@ -2,8 +2,7 @@
 
 verbose="${VERBOSE:-0}"
 
-if [ "$verbose" -gt '0' ]
+if [ "$verbose" -gt '0' ]; then
-then
 	set -x
 fi
 
@@ -14,16 +13,14 @@ set -e -f -u
 #
 # TODO(a.garipov): Add to helpers.sh and use more actively in scripts.
 log() {
-	if [ "$verbose" -gt '0' ]
+	if [ "$verbose" -gt '0' ]; then
-	then
 		# Don't use quotes to get word splitting.
 		echo "$1" 1>&2
 	fi
 }
 
 version="$(./AdGuardHome_amd64 --version | cut -d ' ' -f 4)"
-if [ "$version" = '' ]
+if [ "$version" = '' ]; then
-then
 	log 'empty version from ./AdGuardHome_amd64'
 	exit 1
 fi
@@ -32,11 +29,10 @@ readonly version
 log "version '$version'"
 
 for arch in \
-	'i386'\
 	'amd64' \
+	'arm64' \
 	'armhf' \
-	'arm64'
+	'i386'; do
-do
 	build_output="./AdGuardHome_${arch}"
 	snap_output="./AdGuardHome_${arch}.snap"
 	snap_dir="${snap_output}.dir"
@@ -55,9 +51,9 @@ do
 		>"${snap_dir}/meta/snap.yaml"
 
 	# TODO(a.garipov): The snapcraft tool will *always* write everything,
-	# including errors, to stdout.  And there doesn't seem to be a way to change
+	# including errors, to stdout.  And there doesn't seem to be a way to
-	# that.  So, save the combined output, but only show it when snapcraft
+	# change that.  So, save the combined output, but only show it when
-	# actually fails.
+	# snapcraft actually fails.
 	set +e
 	snapcraft_output="$(
 		snapcraft pack "$snap_dir" --output "$snap_output" 2>&1
@@ -65,8 +61,7 @@ do
 	snapcraft_exit_code="$?"
 	set -e
 
-	if [ "$snapcraft_exit_code" -ne '0' ]
+	if [ "$snapcraft_exit_code" -ne '0' ]; then
-	then
 		log "$snapcraft_output"
 		exit "$snapcraft_exit_code"
 	fi

scripts/snap/download.sh

@@ -2,8 +2,7 @@
 
 verbose="${VERBOSE:-0}"
 
-if [ "$verbose" -gt '0' ]
+if [ "$verbose" -gt '0' ]; then
-then
 	set -x
 fi
 
@@ -17,8 +16,7 @@ printf '%s %s\n'\
 	'amd64' 'amd64' \
 	'armv7' 'armhf' \
 	'arm64' 'arm64' \
-| while read -r arch snap_arch
+	| while read -r arch snap_arch; do
-do
 		release_url="https://static.adtidy.org/adguardhome/${channel}/AdGuardHome_linux_${arch}.tar.gz"
 		output="./AdGuardHome_linux_${arch}.tar.gz"
 

scripts/snap/upload.sh

@@ -2,8 +2,7 @@
 
 verbose="${VERBOSE:-0}"
 
-if [ "$verbose" -gt '0' ]
+if [ "$verbose" -gt '0' ]; then
-then
 	set -x
 fi
 
@@ -12,8 +11,7 @@ set -e -f -u
 # Function log is an echo wrapper that writes to stderr if the caller requested
 # verbosity level greater than 0.  Otherwise, it does nothing.
 log() {
-	if [ "$verbose" -gt '0' ]
+	if [ "$verbose" -gt '0' ]; then
-	then
 		# Don't use quotes to get word splitting.
 		echo "$1" 1>&2
 	fi
@@ -21,8 +19,7 @@ log() {
 
 # Do not set a new lowercase variable, because the snapcraft tool expects the
 # uppercase form.
-if [ "${SNAPCRAFT_STORE_CREDENTIALS:-}" = '' ]
+if [ "${SNAPCRAFT_STORE_CREDENTIALS:-}" = '' ]; then
-then
 	log 'please set SNAPCRAFT_STORE_CREDENTIALS'
 
 	exit 1
@@ -41,11 +38,10 @@ kill_timeout='120s'
 readonly default_timeout kill_timeout
 
 for arch in \
-	'i386'\
 	'amd64' \
+	'arm64' \
 	'armhf' \
-	'arm64'
+	'i386'; do
-do
 	snap_file="./AdGuardHome_${arch}.snap"
 
 	# Catch the exit code and the combined output to later inspect it.
@@ -66,17 +62,15 @@ do
 	snapcraft_exit_code="$?"
 	set -e
 
-	if [ "$snapcraft_exit_code" -eq '0' ]
+	if [ "$snapcraft_exit_code" -eq '0' ]; then
-	then
 		log "successful upload: ${snapcraft_output}"
 
 		continue
 	fi
 
 	# Skip the ones that were failed by a duplicate upload error.
-	case "$snapcraft_output"
+	case "$snapcraft_output" in
-	in
+	*'A file with this exact same content has already been uploaded'* | \
-	(*'A file with this exact same content has already been uploaded'*|\
 		*'Error checking upload uniqueness'*)
 
 		log "warning: duplicate upload, skipping"
@@ -84,7 +78,7 @@ do
 
 		continue
 		;;
-	(*)
+	*)
 		echo "unexpected snapcraft upload error: ${snapcraft_output}"
 
 		return "$snapcraft_exit_code"

scripts/translations/main.go

@@ -10,6 +10,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log/slog"
+	"maps"
 	"net/url"
 	"os"
 	"os/exec"
@@ -21,7 +22,6 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/aghos"
 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/logutil/slogutil"
-	"golang.org/x/exp/maps"
 )
 
 const (
@@ -76,40 +76,30 @@ func main() {
 		usage("")
 	}
 
-	conf, err := readTwoskyConfig()
+	conf := errors.Must(readTwoskyConfig())
-	check(err)
 
 	var cli *twoskyClient
 
 	switch os.Args[1] {
 	case "summary":
-		err = summary(conf.Languages)
+		errors.Check(summary(conf.Languages))
 	case "download":
-		cli, err = conf.toClient()
+		cli = errors.Must(conf.toClient())
-		check(err)
 
-		err = cli.download(ctx, l)
+		errors.Check(cli.download(ctx, l))
 	case "unused":
-		err = unused(ctx, l, conf.LocalizableFiles[0])
+		err := unused(ctx, l, conf.LocalizableFiles[0])
+		errors.Check(err)
 	case "upload":
-		cli, err = conf.toClient()
+		cli = errors.Must(conf.toClient())
-		check(err)
 
-		err = cli.upload()
+		errors.Check(cli.upload())
 	case "auto-add":
-		err = autoAdd(conf.LocalizableFiles[0])
+		err := autoAdd(conf.LocalizableFiles[0])
+		errors.Check(err)
 	default:
 		usage("unknown command")
 	}
-
-	check(err)
-}
-
-// check is a simple error-checking helper for scripts.
-func check(err error) {
-	if err != nil {
-		panic(err)
-	}
 }
 
 // usage prints usage.  If addStr is not empty print addStr and exit with code
@@ -163,15 +153,11 @@ func readTwoskyConfig() (t *twoskyConfig, err error) {
 	var tsc []twoskyConfig
 	err = json.Unmarshal(b, &tsc)
 	if err != nil {
-		err = fmt.Errorf("unmarshalling %q: %w", twoskyConfFile, err)
+		return nil, fmt.Errorf("unmarshalling %q: %w", twoskyConfFile, err)
-
-		return nil, err
 	}
 
 	if len(tsc) == 0 {
-		err = fmt.Errorf("%q is empty", twoskyConfFile)
+		return nil, fmt.Errorf("%q is empty", twoskyConfFile)
-
-		return nil, err
 	}
 
 	conf := tsc[0]
@@ -224,7 +210,8 @@ func (t *twoskyConfig) toClient() (cli *twoskyClient, err error) {
 		baseLang = langCode(uLangStr)
 	}
 
-	langs := maps.Keys(t.Languages)
+	langs := slices.Sorted(maps.Keys(t.Languages))
+
 	dlLangStr := os.Getenv("DOWNLOAD_LANGUAGES")
 	if dlLangStr == "blocker" {
 		langs = blockerLangCodes
@@ -295,8 +282,7 @@ func summary(langs languages) (err error) {
 
 	size := float64(len(baseLoc))
 
-	keys := maps.Keys(langs)
+	keys := slices.Sorted(maps.Keys(langs))
-	slices.Sort(keys)
 
 	for _, lang := range keys {
 		name := filepath.Join(localesDir, string(lang)+".json")
@@ -399,10 +385,7 @@ func findUnused(fileNames []string, loc locales) (err error) {
 		}
 	}
 
-	keys := maps.Keys(loc)
+	for _, v := range slices.Sorted(maps.Keys(loc)) {
-	slices.Sort(keys)
-
-	for _, v := range keys {
 		fmt.Println(v)
 	}
 

scripts/vetted-filters/main.go

@@ -13,6 +13,7 @@ import (
 	"os"
 	"time"
 
+	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/logutil/slogutil"
 	"github.com/google/renameio/v2/maybe"
 )
@@ -22,20 +23,19 @@ func main() {
 	l := slogutil.New(nil)
 
 	urlStr := "https://adguardteam.github.io/HostlistsRegistry/assets/filters.json"
-	if v, ok := os.LookupEnv("URL"); ok {
+	if s := os.Getenv("URL"); s != "" {
-		urlStr = v
+		urlStr = s
 	}
 
 	// Validate the URL.
 	_, err := url.Parse(urlStr)
-	check(err)
+	errors.Check(err)
 
 	c := &http.Client{
 		Timeout: 10 * time.Second,
 	}
 
-	resp, err := c.Get(urlStr)
+	resp := errors.Must(c.Get(urlStr))
-	check(err)
 	defer slogutil.CloseAndLog(ctx, l, resp.Body, slog.LevelError)
 
 	if resp.StatusCode != http.StatusOK {
@@ -44,7 +44,7 @@ func main() {
 
 	hlFlt := &hlFilters{}
 	err = json.NewDecoder(resp.Body).Decode(hlFlt)
-	check(err)
+	errors.Check(err)
 
 	aghFlt := &aghFilters{
 		Categories: map[string]*aghFiltersCategory{
@@ -93,29 +93,21 @@ func main() {
 	enc := json.NewEncoder(buf)
 	enc.SetIndent("", "    ")
 
-	err = enc.Encode(aghFlt)
+	errors.Check(enc.Encode(aghFlt))
-	check(err)
 
 	err = maybe.WriteFile("client/src/helpers/filters/filters.ts", buf.Bytes(), 0o644)
-	check(err)
+	errors.Check(err)
 }
 
 // jsHeader is the header for the generated JavaScript file.  It informs the
 // reader that the file is generated and disables some style-related eslint
-// checks.
+// errors.Checks.
 const jsHeader = `// Code generated by go run ./scripts/vetted-filters/main.go; DO NOT EDIT.
 
 /* eslint quote-props: 'off', quotes: 'off', comma-dangle: 'off', semi: 'off' */
 
 export default `
 
-// check is a simple error-checking helper for scripts.
-func check(err error) {
-	if err != nil {
-		panic(err)
-	}
-}
-
 // hlFilters is the JSON structure for the Hostlists Registry rule list index.
 type hlFilters struct {
 	Filters []*hlFiltersFilter `json:"filters"`

snap/local/adguard-home-web.sh

@@ -1,24 +1,25 @@
 #!/bin/sh
 
+# shellcheck disable=SC2154
 conf_file="${SNAP_DATA}/AdGuardHome.yaml"
 readonly conf_file
 
-if ! [ -f "$conf_file" ]
+if ! [ -f "$conf_file" ]; then
-then
 	xdg-open 'http://localhost:3000'
 
 	exit
 fi
 
 # Get the admin interface port from the configuration.
+#
+# shellcheck disable=SC2016
 awk_prog='/^[^[:space:]]/ { is_http = /^http:/ };/^[[:space:]]+address:/ { if (is_http) print $2 }'
 readonly awk_prog
 
 bind_port="$(awk "$awk_prog" "$conf_file" | awk -F ':' '{print $NF}')"
 readonly bind_port
 
-if [ "$bind_port" = '' ]
+if [ "$bind_port" = '' ]; then
-then
 	xdg-open 'http://localhost:3000'
 else
 	xdg-open "http://localhost:${bind_port}"