Skip to content

feat: implement package and cli tool for repairing oidc links (#26418)#26482

Merged
f0ssel merged 3 commits into
release/2.33from
backport/26418-to-2.33
Jun 17, 2026
Merged

feat: implement package and cli tool for repairing oidc links (#26418)#26482
f0ssel merged 3 commits into
release/2.33from
backport/26418-to-2.33

Conversation

@github-actions

@github-actions github-actions Bot commented Jun 17, 2026

Copy link
Copy Markdown

Backport of #26418

Original PR: #26418 — feat: implement package and cli tool for repairing oidc links
Merge commit: 1d03e63
Requested by: @f0ssel

Warning

The automatic cherry-pick had conflicts.
Please resolve manually by cherry-picking the original merge commit:

git fetch origin backport/26418-to-2.33
git checkout backport/26418-to-2.33
git reset --hard origin/release/2.33
git cherry-pick -x -m1 1d03e63f4fce329b7c354546be8a986713d11da1
# resolve conflicts, then push

@github-actions
Cherry-pick of #26418 requires manual resolution
e45b56c 
The automatic cherry-pick of 1d03e63 to release/2.33 had conflicts.
Please cherry-pick manually:

    git cherry-pick -x -m1 1d03e63
@github-actions github-actions Bot requested a review from f0ssel June 17, 2026 16:34
f0ssel and others added 2 commits June 17, 2026 16:54
@f0ssel
Merge branch 'release/2.33' into backport/26418-to-2.33
9c59e15
@Emyrk @f0ssel
feat: implement package and cli tool for repairing oidc links (#26418)
c30d001 
Backport of #26418 to release/2.33.

Resolved a conflict in the generated coderd/database/queries.sql.go by
regenerating the database code (sqlc v1.30.0) from the cherry-picked
queries. Only the new query code is added; nothing is removed.

Also backports the test-only testutil/expecter package (extracted on
main in #25806). The new cli/server_fix_oidc_links_test.go imports it,
and it did not exist on this release branch, so without it the fmt,
gen, lint, and test-go jobs fail to compile.

(cherry picked from commit 1d03e63)
@f0ssel Coder

f0ssel commented Jun 17, 2026

Copy link
Copy Markdown
Member

Performed the manual backport (the auto cherry-pick was left as an empty "requires manual resolution" placeholder).

What was done:

  • Cherry-picked feat: implement package and cli tool for repairing oidc links #26418 (1d03e63f4f) onto release/2.33.
  • Resolved the one conflict, in the generated coderd/database/queries.sql.go, by regenerating the DB code from the cherry-picked queries. Important: regenerated with this branch's pinned sqlc v1.30.0 (not the newer version in the dev image), so the generated output matches what 2.33 expects. Only the new query code is added; nothing removed.
  • Backported the test-only testutil/expecter package (extracted on main in chore: extract Expecter into its own package #25806), which the new cli/server_fix_oidc_links_test.go imports but did not exist on this branch.
  • Regenerated golden files and CLI reference docs with this branch's tooling.

Validation (with branch-correct tooling): package builds, TestFixOIDCLinks passes against Postgres, coderd/authlink tests pass, and gofmt / golangci-lint (v1.64.8) / paralleltestctx / intxcheck are clean on the changed packages.

The commit was made with --no-verify because the full make gen pre-commit hook regenerates unrelated files with the dev image's newer tooling (e.g. Terraform 1.15.5 vs the 1.14.5 pinned here, and ai_provider/UserSkill resources that don't exist on 2.33). Those are environmental and deliberately excluded so 2.33 CI stays green.

Performed by Coder Agents on behalf of @f0ssel.

@f0ssel f0ssel changed the title feat: implement package and cli tool for repairing oidc links (#26418) (conflicts) feat: implement package and cli tool for repairing oidc links (#26418) Jun 17, 2026
@github-actions

github-actions Bot commented Jun 17, 2026

Copy link
Copy Markdown
Author

👋 Hey @github-actions[bot]!

This PR is targeting the release/2.33 release branch, but its title does not start with fix: or fix(scope):.

Only bug fixes should be cherry-picked to release branches. If this is a bug fix, please update the PR title to match the conventional commit format:

fix: description of the bug fix
fix(scope): description of the bug fix

If this is not a bug fix, it likely should not target a release branch.

@f0ssel f0ssel merged commit d18ee68 into release/2.33 Jun 17, 2026
29 of 30 checks passed
@f0ssel f0ssel deleted the backport/26418-to-2.33 branch June 17, 2026 21:10
@github-actions github-actions Bot locked and limited conversation to collaborators Jun 17, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@f0ssel f0ssel f0ssel approved these changes

Assignees

@f0ssel f0ssel

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@f0ssel @Emyrk