chore: drop Altinity/clickhouse-go fork → upstream ClickHouse/clickhouse-go v2.46.0#138
Merged
Merged
Conversation
…use-go v2.46.0
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 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Swaps the
github.com/Altinity/clickhouse-go/v2fork back to upstreamgithub.com/ClickHouse/clickhouse-go/v2(latest stable, v2.46.0).Why
The fork was adopted for a single reason: client-side interserver-secret (
cluster_secret) authentication (#86, commitsdea9214/5c20414). That feature was later dropped in favor of thech-jwt-verifysidecar (49ecb42). Research confirms the only substantive fork delta is that interserver-secret patch — and we use zero fork-only symbols. Everything in use (HTTP Bearer/JWT auth,__exception__parsing,TransportFunc,DialStrategy,HttpHeaders) is upstream-identical.Returning to upstream gets us upstream security fixes + dependabot with nothing to rebase or maintain.
Changes
pkg/clickhouse/client.go— two import lines rewritten (the only production file importing the driver).pkg/server/embedded_xml_config_test.go— blank driver-registration import rewritten.go.mod/go.sum— forkrequirereplaced with upstreamv2.46.0;go mod tidy.cluster_secretRemovedConfigKeysdeprecation entry (pkg/config/config.go) is intentionally left as-is.Verification
go build ./...— clean.go test ./...— all green, incl.pkg/clickhouseand the embedded-ClickHouse-backedpkg/serversuite.otel(imagechore-drop-clickhouse-go-fork-86825b1, helm rev 96): via claude.ai against/mcp/otel—whoami→ non-empty email ✅execute_querySELECT 1→1✅;SELECT count() FROM system.tables→215✅Basic base64(email:JWT)→ch-jwt-verifysidecar) still works on upstream.Risk
Low. The interserver patch is untouched; all used paths are upstream-identical. Rollback is a branch revert (fork still published at its pinned pseudo-version).
🤖 Generated with Claude Code