[!] bump Go to v1.26 (#1207)

pashagolub · web-flow · commit a8e7e004d4ee · 2026-02-16T17:33:48.000+01:00
* bump Go to v1.26

* remove `greenteagc` option

* fix new `url.Parse()` behavior

`net/url.Parse()` now rejects malformed URLs containing colons in the
host subcomponent
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
     - name: Set up Golang
       uses: actions/setup-go@v6
       with:
-        go-version: '1.25'
+        go-version: '1.26'
         cache-dependency-path: 'go.sum'
 
     - name: Setup Protobuf
@@ -84,7 +84,7 @@ jobs:
     - name: Set up Golang
       uses: actions/setup-go@v6
       with:
-        go-version: '1.25'
+        go-version: '1.26'
         cache-dependency-path: 'go.sum'
 
     - name: Download webui artifact
@@ -119,7 +119,7 @@ jobs:
     - name: Set up Golang
       uses: actions/setup-go@v6
       with:
-        go-version: '1.25'
+        go-version: '1.26'
         cache-dependency-path: 'go.sum'
 
     - name: Set up Node.js
@@ -187,7 +187,7 @@ jobs:
     - name: Set up Golang
       uses: actions/setup-go@v6
       with:
-        go-version: '1.25'      
+        go-version: '1.26'      
     
     - name: Set up gopages
       run: go install github.com/johnstarich/go/gopages@v0.1.29
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Set up Golang
       uses: actions/setup-go@v6
       with:
-        go-version: '1.25'
+        go-version: '1.26'
 
     - name: Check out code into the Go module directory
       uses: actions/checkout@v6
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -8,7 +8,6 @@ builds:
 - main: ./cmd/pgwatch
   env:
     - CGO_ENABLED=0
-    - GOEXPERIMENT=greenteagc
   goos:
     - linux
     - darwin
diff --git a/cmd/convert_metrics/convert_metrics_test.go b/cmd/convert_metrics/convert_metrics_test.go
@@ -53,8 +53,8 @@ func downloadAndExtractMetrics(t *testing.T, dest string) string {
 
 	var extracted string
 	for _, f := range r.File {
-		if strings.HasPrefix(f.Name, metricsRoot) {
-			rel := strings.TrimPrefix(f.Name, metricsRoot)
+		if after, ok := strings.CutPrefix(f.Name, metricsRoot); ok {
+			rel := after
 			if rel == "" {
 				extracted = filepath.Join(dest, "metrics")
 				_ = os.MkdirAll(extracted, 0755)
diff --git a/cmd/pgwatch/main_integration_test.go b/cmd/pgwatch/main_integration_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
 	"time"
 
@@ -144,18 +145,18 @@ metrics:
 		specialSourcesYaml := filepath.Join(tempDir, "special_sources.yaml")
 
 		// Build YAML with all special source names
-		yamlContent := ""
+		var yamlContent strings.Builder
 		for _, name := range specialNames {
-			yamlContent += `
+			yamlContent.WriteString(`
 - name: ` + name + `
   conn_str: ` + connStr + `
   kind: postgres
   is_enabled: true
   custom_metrics:
     test_metric: 60
-`
+`)
 		}
-		require.NoError(t, os.WriteFile(specialSourcesYaml, []byte(yamlContent), 0644))
+		require.NoError(t, os.WriteFile(specialSourcesYaml, []byte(yamlContent.String()), 0644))
 
 		os.Args = []string{
 			"pgwatch",
@@ -262,7 +263,7 @@ presets:
 
 	go main()
 
-	// Below tests are expected to run sequentially and depend on 
+	// Below tests are expected to run sequentially and depend on
 	// data generated by each other
 
 	t.Run("Ensure tag changes are applied", func(t *testing.T) {
@@ -323,7 +324,7 @@ presets:
 		require.GreaterOrEqual(t, len(epochNsBefore), 2, "we need at least 2 measurements")
 
 		// Calculate interval before change
-		intervalBefore := float64(epochNsBefore[0] - epochNsBefore[1]) / 1e9
+		intervalBefore := float64(epochNsBefore[0]-epochNsBefore[1]) / 1e9
 		assert.InDelta(t, 1.0, intervalBefore, 0.5, "interval should be approximately 1 second")
 
 		// Change interval to 2 seconds
@@ -355,7 +356,7 @@ presets:
 		require.GreaterOrEqual(t, len(epochNsAfter), 2, "we need at least 2 measurements after interval change")
 
 		// Calculate interval after change
-		intervalAfter := float64(epochNsAfter[0] - epochNsAfter[1]) / 1e9
+		intervalAfter := float64(epochNsAfter[0]-epochNsAfter[1]) / 1e9
 		assert.InDelta(t, 2.0, intervalAfter, 0.5, "new interval should be approximately 2 seconds")
 		assert.Greater(t, intervalAfter, intervalBefore, "new interval should be greater than old interval")
 	})
@@ -387,7 +388,7 @@ presets:
 			`SELECT count(*) FROM public.test_metric WHERE dbname = 'test_source'`).Scan(&countAfter)
 		require.NoError(t, err)
 
-		assert.LessOrEqual(t, countAfter - countBefore, 2)
+		assert.LessOrEqual(t, countAfter-countBefore, 2)
 	})
 
 	t.Run("Ensure preset intervals updates are applied - issue #1091", func(t *testing.T) {
@@ -420,7 +421,7 @@ presets:
 		require.GreaterOrEqual(t, len(epochNsBefore), 2, "should have at least 2 measurements")
 
 		// Calculate interval before change
-		intervalBefore := float64(epochNsBefore[0] - epochNsBefore[1]) / 1e9
+		intervalBefore := float64(epochNsBefore[0]-epochNsBefore[1]) / 1e9
 		assert.InDelta(t, 1.0, intervalBefore, 0.5, "interval should be approximately 1 second")
 
 		require.NoError(t, os.WriteFile(sourcesYaml, []byte(`
@@ -463,7 +464,7 @@ presets:
 		require.GreaterOrEqual(t, len(epochNsAfter), 2, "should have at least 2 measurements")
 
 		// Calculate interval after change
-		intervalAfter := float64(epochNsAfter[0] - epochNsAfter[1]) / 1e9
+		intervalAfter := float64(epochNsAfter[0]-epochNsAfter[1]) / 1e9
 		assert.InDelta(t, 2.0, intervalAfter, 0.5, "interval should be approximately 2 seconds")
 	})
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -23,7 +23,7 @@ RUN yarn build
 # ----------------------------------------------------------------
 # 3. Go Dependencies and Tools (cached separately)
 # ----------------------------------------------------------------
-FROM golang:1.25 AS go-deps
+FROM golang:1.26 AS go-deps
 # Install protoc and required tools for protobuf generation
 RUN apt-get update && apt-get install -y protobuf-compiler && rm -rf /var/lib/apt/lists/*
 RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
@@ -50,7 +50,7 @@ COPY --from=webui-builder /webserver/build ./internal/webserver/build
 
 # Generate protobuf and build the application
 RUN go generate ./api/pb/ && \
-    CGO_ENABLED=0 GOEXPERIMENT=greenteagc go build -ldflags "\
+    CGO_ENABLED=0 go build -ldflags "\
         -X 'main.commit=${GIT_HASH}' \
         -X 'main.date=${GIT_TIME}' \
         -X 'main.version=${VERSION}'" ./cmd/pgwatch
diff --git a/docker/demo/Dockerfile b/docker/demo/Dockerfile
@@ -23,7 +23,7 @@ RUN yarn build
 # ----------------------------------------------------------------
 # 3. Go Dependencies and Tools (cached separately)
 # ----------------------------------------------------------------
-FROM golang:1.25 AS go-deps
+FROM golang:1.26 AS go-deps
 # Install protoc and required tools for protobuf generation
 RUN apt-get update && apt-get install -y protobuf-compiler && rm -rf /var/lib/apt/lists/*
 RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
@@ -50,7 +50,7 @@ COPY --from=webui-builder /webserver/build ./internal/webserver/build
 
 # Generate protobuf and build the application
 RUN go generate ./api/pb/ && \
-    CGO_ENABLED=0 GOEXPERIMENT=greenteagc go build -ldflags "\
+    CGO_ENABLED=0 go build -ldflags "\
         -X 'main.commit=${GIT_HASH}' \
         -X 'main.date=${GIT_TIME}' \
         -X 'main.version=${VERSION}'" ./cmd/pgwatch
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/cybertec-postgresql/pgwatch/v5
 
-go 1.25.0
+go 1.26.0
 
 require (
 	github.com/cybertec-postgresql/pgx-migrator v1.3.0
diff --git a/internal/build.sh b/internal/build.sh
@@ -6,4 +6,4 @@ set -x
 GIT_HASH=$(git show -s --format=%H HEAD)
 GIT_TIME=$(git show -s --format=%cI HEAD)
 VERSION=$(git rev-parse --abbrev-ref HEAD)
-GOEXPERIMENT=greenteagc go build -ldflags "-X 'main.commit=$GIT_HASH' -X 'main.date=$GIT_TIME' -X 'main.version=$VERSION'"
+go build -ldflags "-X 'main.commit=$GIT_HASH' -X 'main.date=$GIT_TIME' -X 'main.version=$VERSION'"
diff --git a/internal/db/conn.go b/internal/db/conn.go
@@ -15,15 +15,15 @@ import (
 )
 
 type Querier interface {
-	Query(ctx context.Context, query string, args ...interface{}) (pgx.Rows, error)
+	Query(ctx context.Context, query string, args ...any) (pgx.Rows, error)
 }
 
 // PgxIface is common interface for every pgx class
 type PgxIface interface {
 	Begin(ctx context.Context) (pgx.Tx, error)
-	Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error)
-	QueryRow(context.Context, string, ...interface{}) pgx.Row
-	Query(ctx context.Context, query string, args ...interface{}) (pgx.Rows, error)
+	Exec(context.Context, string, ...any) (pgconn.CommandTag, error)
+	QueryRow(context.Context, string, ...any) pgx.Row
+	Query(ctx context.Context, query string, args ...any) (pgx.Rows, error)
 	CopyFrom(ctx context.Context, tableName pgx.Identifier, columnNames []string, rowSrc pgx.CopyFromSource) (int64, error)
 }
 
diff --git a/internal/log/formatter.go b/internal/log/formatter.go
@@ -141,11 +141,11 @@ func (f *Formatter) Format(entry *logrus.Entry) ([]byte, error) {
 
 func trimFilename(s string) string {
 	const sub = "internal/"
-	idx := strings.Index(s, sub)
-	if idx == -1 {
+	_, after, ok := strings.Cut(s, sub)
+	if !ok {
 		return s
 	}
-	return s[idx+len(sub):]
+	return after
 }
 
 func (f *Formatter) writeCaller(b *bytes.Buffer, entry *logrus.Entry) {
diff --git a/internal/log/log_test.go b/internal/log/log_test.go
@@ -31,6 +31,6 @@ func TestPgxLog(_ *testing.T) {
 	pgxl := log.NewPgxLogger(log.Init(log.CmdOpts{LogLevel: "trace"}))
 	var level tracelog.LogLevel
 	for level = tracelog.LogLevelNone; level <= tracelog.LogLevelTrace; level++ {
-		pgxl.Log(context.Background(), level, "foo", map[string]interface{}{"func": "TestPgxLog"})
+		pgxl.Log(context.Background(), level, "foo", map[string]any{"func": "TestPgxLog"})
 	}
 }
diff --git a/internal/sources/resolver.go b/internal/sources/resolver.go
@@ -213,25 +213,60 @@ func (hc HostConfig) IsScopeSpecified() bool {
 }
 
 func NewHostConfig(URI string) (hc HostConfig, err error) {
+	// Extract scheme
+	before, after, ok := strings.Cut(URI, "://")
+	if !ok {
+		return hc, fmt.Errorf("invalid URI: missing scheme")
+	}
+	scheme := before
+	remainder := after // skip "://"
+
+	// Find where the host portion ends (at first '/' or '?' or end of string)
+	hostEnd := strings.IndexAny(remainder, "/?")
+	var hostPart, pathAndQuery string
+	if hostEnd == -1 {
+		hostPart = remainder
+		pathAndQuery = ""
+	} else {
+		hostPart = remainder[:hostEnd]
+		pathAndQuery = remainder[hostEnd:]
+	}
+
+	// Check for user info (username:password@)
+	var userInfo string
+	if atIdx := strings.LastIndex(hostPart, "@"); atIdx != -1 {
+		userInfo = hostPart[:atIdx]
+		hostPart = hostPart[atIdx+1:]
+	}
+
+	// Split hosts by comma for multiple endpoints
+	hosts := strings.Split(hostPart, ",")
+
+	// Parse a clean URL with just the first host to extract other components
+	cleanURI := scheme + "://"
+	if userInfo != "" {
+		cleanURI += userInfo + "@"
+	}
+	cleanURI += hosts[0] + pathAndQuery
+
 	var url *url.URL
-	url, err = url.Parse(URI)
+	url, err = url.Parse(cleanURI)
 	if err != nil {
 		return
 	}
 
 	switch url.Scheme {
 	case dcsTypeEtcd:
 		hc.DcsType = dcsTypeEtcd
-		for h := range strings.SplitSeq(url.Host, ",") {
+		for _, h := range hosts {
 			hc.DcsEndpoints = append(hc.DcsEndpoints, "http://"+h)
 		}
 	case dcsTypeZookeeper:
 		hc.DcsType = dcsTypeZookeeper
-		hc.DcsEndpoints = []string{url.Host} // Zookeeper usually has a
-		// single endpoint, but can be a list of hosts separated by commas
+		hc.DcsEndpoints = hosts // Use the split hosts directly
 	case dcsTypeConsul:
 		hc.DcsType = dcsTypeConsul
-		hc.DcsEndpoints = strings.Split(url.Host, ",")
+		hc.DcsEndpoints = hosts // Use the split hosts directly
 	default:
 		return hc, fmt.Errorf("unsupported DCS type: %s", url.Scheme)
 	}
diff --git a/internal/sources/resolver_test.go b/internal/sources/resolver_test.go

Original file line number	Diff line number	Diff line change
`@@ -15,15 +15,15 @@ import (`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`type Querier interface {`
`18`		`- Query(ctx context.Context, query string, args ...interface{}) (pgx.Rows, error)`
	`18`	`+ Query(ctx context.Context, query string, args ...any) (pgx.Rows, error)`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`// PgxIface is common interface for every pgx class`
`22`	`22`	`type PgxIface interface {`
`23`	`23`	`Begin(ctx context.Context) (pgx.Tx, error)`
`24`		`- Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error)`
`25`		`- QueryRow(context.Context, string, ...interface{}) pgx.Row`
`26`		`- Query(ctx context.Context, query string, args ...interface{}) (pgx.Rows, error)`
	`24`	`+ Exec(context.Context, string, ...any) (pgconn.CommandTag, error)`
	`25`	`+ QueryRow(context.Context, string, ...any) pgx.Row`
	`26`	`+ Query(ctx context.Context, query string, args ...any) (pgx.Rows, error)`
`27`	`27`	`CopyFrom(ctx context.Context, tableName pgx.Identifier, columnNames []string, rowSrc pgx.CopyFromSource) (int64, error)`
`28`	`28`	`}`
`29`	`29`