From 86825b14a76801f7cf16b9a8ff9261a0e1c7f805 Mon Sep 17 00:00:00 2001 From: Boris Tyshkevich Date: Tue, 2 Jun 2026 18:22:12 +0200 Subject: [PATCH] =?UTF-8?q?chore:=20drop=20Altinity/clickhouse-go=20fork?= =?UTF-8?q?=20=E2=86=92=20upstream=20ClickHouse/clickhouse-go=20v2.46.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The fork was adopted solely for client-side interserver-secret ("cluster_secret") auth (PR #86), which was later dropped in favor of the ch-jwt-verify sidecar (49ecb42). No fork-only symbols remain in use — all code paths (HTTP Bearer/JWT auth, __exception__ parsing, TransportFunc, DialStrategy, HttpHeaders) are upstream-identical. Rewrites the two production import lines in pkg/clickhouse/client.go and the blank driver-registration import in pkg/server/embedded_xml_config_test.go, then re-pins go.mod/go.sum to upstream latest (v2.46.0). The cluster_secret RemovedConfigKeys deprecation entry is intentionally left as-is. Returns us to upstream security fixes + dependabot with nothing to rebase. Co-Authored-By: Claude Opus 4.8 --- go.mod | 2 +- go.sum | 6 ++---- pkg/clickhouse/client.go | 4 ++-- pkg/server/embedded_xml_config_test.go | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index df00ffb..854ce36 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.26 require ( github.com/AfterShip/clickhouse-sql-parser v0.5.1 - github.com/Altinity/clickhouse-go/v2 v2.45.1-0.20260424134931-fb5f38b1cac7 + github.com/ClickHouse/clickhouse-go/v2 v2.46.0 github.com/franchb/embedded-clickhouse v0.4.0 github.com/go-jose/go-jose/v4 v4.1.4 github.com/modelcontextprotocol/go-sdk v1.6.1 diff --git a/go.sum b/go.sum index 245b944..fff78ea 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,9 @@ github.com/AfterShip/clickhouse-sql-parser v0.5.1 h1:Re4BZXx0v4zVKvtumqwFSVy6Xmaui6QT/OgYL6zM3aI= github.com/AfterShip/clickhouse-sql-parser v0.5.1/go.mod h1:Qi3qvPTfZb/aFwI5V4WFOahgjsLJa4MzVijIAfwOhDw= -github.com/Altinity/clickhouse-go/v2 v2.45.1-0.20260424134931-fb5f38b1cac7 h1:/vBQtlgdQ2URiFPjIxHwF0YUnAEkwk87B/edeu/G36Q= -github.com/Altinity/clickhouse-go/v2 v2.45.1-0.20260424134931-fb5f38b1cac7/go.mod h1:SqvoxopcNPeJWv3lSv3hpBYlwanQ24hWkorGjEWKmdg= github.com/ClickHouse/ch-go v0.71.0 h1:bUdZ/EZj/LcVHsMqaRUP2holqygrPWQKeMjc6nZoyRM= github.com/ClickHouse/ch-go v0.71.0/go.mod h1:NwbNc+7jaqfY58dmdDUbG4Jl22vThgx1cYjBw0vtgXw= -github.com/ClickHouse/clickhouse-go/v2 v2.44.0 h1:9pxs5pRwIvhni5BDRPn/n5A8DeUod5TnBaeulFBX8EQ= -github.com/ClickHouse/clickhouse-go/v2 v2.44.0/go.mod h1:giJfUVlMkcfUEPVfRpt51zZaGEx9i17gCos8gBl392c= +github.com/ClickHouse/clickhouse-go/v2 v2.46.0 h1:s3eRy+hYmu5uzotB6ZhDofgHu8kDgGN/fpmjxRkqSpk= +github.com/ClickHouse/clickhouse-go/v2 v2.46.0/go.mod h1:giJfUVlMkcfUEPVfRpt51zZaGEx9i17gCos8gBl392c= github.com/altinity/go-mcp-oauth-sdk v0.1.1-0.20260527145654-bdefa859fd1b h1:b6XHGgSAedsoRet5sahr4YABFC2tG+0Imd+8JGx16SY= github.com/altinity/go-mcp-oauth-sdk v0.1.1-0.20260527145654-bdefa859fd1b/go.mod h1:yLgv0x586vIzPB5JaA6DkqQsSe4PLRT3PhU2iHO7qsI= github.com/andybalholm/brotli v1.2.1 h1:R+f5xP285VArJDRgowrfb9DqL18yVK0gKAW/F+eTWro= diff --git a/pkg/clickhouse/client.go b/pkg/clickhouse/client.go index b163c53..2464aaf 100644 --- a/pkg/clickhouse/client.go +++ b/pkg/clickhouse/client.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/Altinity/clickhouse-go/v2" - "github.com/Altinity/clickhouse-go/v2/lib/driver" + "github.com/ClickHouse/clickhouse-go/v2" + "github.com/ClickHouse/clickhouse-go/v2/lib/driver" "github.com/altinity/altinity-mcp/pkg/config" "github.com/rs/zerolog/log" ) diff --git a/pkg/server/embedded_xml_config_test.go b/pkg/server/embedded_xml_config_test.go index 32f5f3e..07eb684 100644 --- a/pkg/server/embedded_xml_config_test.go +++ b/pkg/server/embedded_xml_config_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - _ "github.com/Altinity/clickhouse-go/v2" + _ "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/require" )