Skip to content

Antalya 26.5: Add OAuth2 login to clickhouse-client (--login / --login=device)#1973

Draft
zvonand wants to merge 2 commits into
antalya-26.5from
feature/antalya-26.5/pr-1799
Draft

Antalya 26.5: Add OAuth2 login to clickhouse-client (--login / --login=device)#1973
zvonand wants to merge 2 commits into
antalya-26.5from
feature/antalya-26.5/pr-1799

Conversation

@zvonand

@zvonand zvonand commented Jun 26, 2026

Copy link
Copy Markdown
Member

This PR needs manual intervention.
Cherry-pick of #1799 could not be resolved automatically (AI resolver was disabled, exhausted its iteration budget, or gave up).
The branch contains the first 1 commit(s) of the group; 0 later PR(s) were not attempted.
Conflicted files at the failure point:

  • docs/en/operations/external-authenticators/tokens.md
  • src/Access/TokenAccessStorage.cpp
  • src/Access/TokenProcessors.h
  • src/Access/TokenProcessorsOpaque.cpp
  • src/Access/TokenProcessorsParse.cpp
    Resolve the conflict locally, push the fix, and mark this PR ready for review.

Changelog category (leave one):

  • New Feature

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):

Add OAuth2 login flow to clickhouse-client (#1606 by @BorisTyshkevich, #1799 by @zvonand).

CI/CD Options

Exclude tests:

  • Fast test
  • Integration Tests
  • Stateless tests
  • Stateful tests
  • Performance tests
  • All with ASAN
  • All with TSAN
  • All with MSAN
  • All with UBSAN
  • All with Coverage
  • All with Aarch64
  • All Regression
  • Disable CI Cache

Regression jobs to run:

  • Fast suites (mostly <1h)
  • Aggregate Functions (2h)
  • Alter (1.5h)
  • Benchmark (30m)
  • ClickHouse Keeper (1h)
  • Iceberg (2h)
  • LDAP (1h)
  • Parquet (1.5h)
  • RBAC (1.5h)
  • SSL Server (1h)
  • S3 (2h)
  • S3 Export (2h)
  • Swarms (30m)
  • Tiered Storage (2h)

Combined port of 2 PR(s) (group pr-1799). Cherry-picked from #1606, #1799.

zvonand added 2 commits June 26, 2026 02:35
…next commit)

---
Original cherry-pick message follows:

Merge pull request #1606 from Altinity/feature/client-IdP

Add OAuth2 login to clickhouse-client (--login / --login=device)
# Conflicts:
#	docs/en/interfaces/cli.md
#	programs/client/Client.cpp
#	src/Access/TokenProcessorsOpaque.cpp
docs/en/interfaces/cli.md: kept the `clickhousectl skills` flags table
("ours"); discarded the `clickhouse-client` content from "theirs" because
commit 266165b on antalya-26.5 moved all clickhouse-client docs from
cli.md to client.md, so the clickhouse-client block no longer belongs here.

docs/en/interfaces/client.md: applied the source PR's documentation changes
here instead of cli.md — bucket-2 adaptation forced by the file move above.
Updated the `login` table row to `--login[=<mode>]`, added the
`--oauth-credentials` row, and added the "OAuth credentials file" section.

programs/client/Client.cpp: kept both `one-time-password` from "ours" (an
antalya-26.5 addition) and the source PR's new `login`/`oauth-credentials`
option definitions from "theirs".
@zvonand zvonand added ai-needs-attention Releasy stopped on a conflict it could not resolve — needs human review releasy Created/managed by RelEasy antalya-26.5 labels Jun 26, 2026
@github-actions

Copy link
Copy Markdown

Workflow [PR], commit [76b5f1b]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ai-needs-attention Releasy stopped on a conflict it could not resolve — needs human review antalya-26.5 releasy Created/managed by RelEasy

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant