go fix: modernize code (interface{} -> any, SplitSeq, fmt.Appendf, drop build constraints)

Author: dangra

cmd/flexctl/backups.go

@@ -308,7 +308,7 @@ type successfulUpdateResult struct {
 }
 
 type configUpdateResult struct {
-	Result successfulUpdateResult `json:"result,omitempty"`
+	Result successfulUpdateResult `json:"result"`
 	Error  string                 `json:"error,omitempty"`
 }
 

internal/api/handle_admin.go

@@ -3,6 +3,7 @@ package api
 import (
 	"encoding/json"
 	"fmt"
+	"maps"
 	"net/http"
 	"os"
 	"strings"
@@ -145,7 +146,7 @@ func handleUpdatePostgresSettings(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var requestedChanges map[string]interface{}
+	var requestedChanges map[string]any
 	if err := json.NewDecoder(r.Body).Decode(&requestedChanges); err != nil {
 		renderErr(w, err)
 		return
@@ -158,9 +159,7 @@ func handleUpdatePostgresSettings(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	for k, v := range requestedChanges {
-		cfg[k] = v
-	}
+	maps.Copy(cfg, requestedChanges)
 
 	node.PGConfig.SetUserConfig(cfg)
 
@@ -287,7 +286,7 @@ func handleViewRepmgrSettings(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	out := map[string]interface{}{}
+	out := map[string]any{}
 
 	for key := range all {
 		val := all[key]
@@ -362,7 +361,7 @@ func handleUpdateBarmanSettings(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var requestedChanges map[string]interface{}
+	var requestedChanges map[string]any
 	if err := json.NewDecoder(r.Body).Decode(&requestedChanges); err != nil {
 		renderErr(w, err)
 		return
@@ -373,9 +372,7 @@ func handleUpdateBarmanSettings(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	for k, v := range requestedChanges {
-		cfg[k] = v
-	}
+	maps.Copy(cfg, requestedChanges)
 
 	barman.SetUserConfig(cfg)
 

internal/api/response.go

@@ -10,7 +10,7 @@ import (
 	"github.com/jackc/pgx/v5"
 )
 
-func renderJSON(w http.ResponseWriter, data interface{}, status int) {
+func renderJSON(w http.ResponseWriter, data any, status int) {
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(status)
 	if err := json.NewEncoder(w).Encode(data); err != nil {

internal/api/types.go

@@ -16,6 +16,6 @@ type errRes struct {
 }
 
 type Response struct {
-	Result interface{} `json:"result,omitempty"`
-	Error  string      `json:"error,omitempty"`
+	Result any    `json:"result,omitempty"`
+	Error  string `json:"error,omitempty"`
 }

internal/flycheck/barman.go

@@ -25,9 +25,9 @@ func CheckBarmanConnection(checks *check.CheckSuite) *check.CheckSuite {
 	// Each line besides the first represents a check and will include FAILED or OK
 	// We just separate those lines and create a health check entry of our own
 	// so it's uniform how we handle it
-	lines := strings.Split(string(output), "\n")
+	lines := strings.SplitSeq(string(output), "\n")
 
-	for _, line := range lines {
+	for line := range lines {
 		pattern := `\s*(.*?):(.*)$`
 		regex := regexp.MustCompile(pattern)
 		matches := regex.FindStringSubmatch(line)

internal/flypg/admin/admin.go

@@ -330,7 +330,7 @@ func DropOwned(ctx context.Context, conn *pgx.Conn, user string) error {
 	return nil
 }
 
-func SetConfigurationSetting(ctx context.Context, conn *pgx.Conn, key string, value interface{}) error {
+func SetConfigurationSetting(ctx context.Context, conn *pgx.Conn, key string, value any) error {
 	sql := fmt.Sprintf("SET %s to %s", key, value)
 	_, err := conn.Exec(ctx, sql)
 	return err
@@ -400,7 +400,7 @@ func GetSetting(ctx context.Context, pg *pgx.Conn, setting string) (*PGSetting,
 	return &out, nil
 }
 
-func ValidatePGSettings(ctx context.Context, conn *pgx.Conn, requested map[string]interface{}) error {
+func ValidatePGSettings(ctx context.Context, conn *pgx.Conn, requested map[string]any) error {
 	for k, v := range requested {
 		exists, err := SettingExists(ctx, conn, k)
 		if err != nil {
@@ -413,8 +413,8 @@ func ValidatePGSettings(ctx context.Context, conn *pgx.Conn, requested map[strin
 		// Verify specified extensions are installed
 		if k == "shared_preload_libraries" {
 			extensions := strings.Trim(v.(string), "'")
-			extSlice := strings.Split(extensions, ",")
-			for _, e := range extSlice {
+			extSlice := strings.SplitSeq(extensions, ",")
+			for e := range extSlice {
 				available, err := ExtensionAvailable(ctx, conn, e)
 				if err != nil {
 					return fmt.Errorf("failed to verify pg extension %s: %s", e, err)

internal/privnet/sixpn.go

@@ -56,8 +56,8 @@ func AllMachines(ctx context.Context, appName string) ([]Machine, error) {
 
 	machines := make([]Machine, 0)
 	for _, txt := range txts {
-		parts := strings.Split(txt, ",")
-		for _, part := range parts {
+		parts := strings.SplitSeq(txt, ",")
+		for part := range parts {
 			parts := strings.Split(part, " ")
 			if len(parts) != 2 {
 				return nil, fmt.Errorf("invalid machine DNS TXT format: %s", txt)

internal/supervisor/ensure_kill.go

@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 // Package supervisor manages the lifecycle of supervised processes.
 package supervisor

internal/supervisor/ensure_kill_linux.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package supervisor
 

internal/supervisor/output.go

@@ -109,7 +109,6 @@ func (m *multiOutput) ClosePipe(proc *process) {
 }
 
 func (m *multiOutput) WriteErr(proc *process, err error) {
-	m.WriteLine(proc, []byte(
-		fmt.Sprintf("\033[0;31m%v\033[0m", err),
-	))
+	m.WriteLine(proc,
+		fmt.Appendf(nil, "\033[0;31m%v\033[0m", err))
 }