Update to Go 1.26 refactor with suggested fixes

Author: mrmelon54

agent/agent_test.go

@@ -174,11 +174,9 @@ func setupFakeSSH(wg *sync.WaitGroup, call func(addrPort netip.AddrPort, pubKey
 	addrPort := tcp.Addr().(*net.TCPAddr).AddrPort()
 
 	var wg2 sync.WaitGroup
-	wg2.Add(1)
-	go func() {
-		defer wg2.Done()
+	wg2.Go(func() {
 		call(addrPort, sshPubKey)
-	}()
+	})
 
 	tcpConn, err := tcp.AcceptTCP()
 	if err != nil {
@@ -205,15 +203,11 @@ func setupFakeSSH(wg *sync.WaitGroup, call func(addrPort netip.AddrPort, pubKey
 	}
 
 	// The incoming Request channel must be serviced.
-	wg.Add(1)
-	go func() {
+	wg.Go(func() {
 		ssh.DiscardRequests(reqs)
-		wg.Done()
-	}()
+	})
 
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 
 		// Service the incoming channel.
 		for newChannel := range chans {
@@ -326,7 +320,7 @@ func setupFakeSSH(wg *sync.WaitGroup, call func(addrPort netip.AddrPort, pubKey
 				channel.SendRequest("exit-status", false, binary.BigEndian.AppendUint32(nil, 0))
 			}()
 		}
-	}()
+	})
 
 	wg2.Wait()
 

cmd/orchid/setup.go

@@ -175,7 +175,7 @@ func runSetup(wd string) error {
 	return nil
 }
 
-func listenAddressValidator(ans interface{}) error {
+func listenAddressValidator(ans any) error {
 	if ansStr, ok := ans.(string); ok {
 		// empty string means disable
 		if ansStr == "" {
@@ -189,7 +189,7 @@ func listenAddressValidator(ans interface{}) error {
 	return nil
 }
 
-func urlValidator(ans interface{}) error {
+func urlValidator(ans any) error {
 	if ansStr, ok := ans.(string); ok {
 		_, err := url.Parse(ansStr)
 		return err

go.mod

@@ -1,6 +1,6 @@
 module github.com/1f349/orchid
 
-go 1.24.2
+go 1.26
 
 require (
 	github.com/1f349/cache v0.0.7

utils/domain-checker.go

@@ -1,15 +1,16 @@
 package utils
 
-import "github.com/1f349/violet/utils"
+import (
+	"github.com/1f349/violet/utils"
+	"slices"
+)
 
 type DomainChecker []string
 
 func (d DomainChecker) ValidateDomain(a string) bool {
 	if fqdn, ok := utils.GetTopFqdn(a); ok {
-		for _, i := range d {
-			if i == fqdn {
-				return true
-			}
+		if slices.Contains(d, fqdn) {
+			return true
 		}
 	}
 	return false