Skip to content

feat: deployment flag to auto handle changed oidc providers (#26419)#26484

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

feat: deployment flag to auto handle changed oidc providers (#26419)#26484
f0ssel merged 3 commits into
release/2.33from
backport/26419-to-2.33

Conversation

@github-actions

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

Copy link
Copy Markdown

Backport of #26419

Original PR: #26419 — feat: deployment flag to auto handle changed oidc providers
Merge commit: 0e45ded
Requested by: @f0ssel

Warning

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

git fetch origin backport/26419-to-2.33
git checkout backport/26419-to-2.33
git reset --hard origin/release/2.33
git cherry-pick -x -m1 0e45ded0ed56fb343f710b66802662666729a87b
# resolve conflicts, then push

@github-actions
Cherry-pick of #26419 requires manual resolution
0119366 
The automatic cherry-pick of 0e45ded to release/2.33 had conflicts.
Please cherry-pick manually:

    git cherry-pick -x -m1 0e45ded
@github-actions github-actions Bot requested a review from f0ssel June 17, 2026 16:35
f0ssel and others added 2 commits June 17, 2026 17:12
@f0ssel
Merge branch 'release/2.33' into backport/26419-to-2.33
47b49c6
@Emyrk @f0ssel
feat: deployment flag to auto handle changed oidc providers (#26419)
275ed2d 
Backport of #26419 to release/2.33.

Resolved an import conflict in cli/server.go by adding only the
coderd/authlink import; the aibridged import in the upstream diff was
context that is not used by this change on this branch.

The generated files (coderd/apidoc, docs/reference/api, typesGenerated.ts,
and the server-config golden) were verified to contain exactly the
upstream additions for the new oidc-repair-links deployment flag.

(cherry picked from commit 0e45ded)
@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). This builds on #26418, which has since landed on release/2.33.

What was done:

  • Cherry-picked feat: deployment flag to auto handle changed oidc providers #26419 (0e45ded0ed) onto release/2.33.
  • Resolved the one conflict, an import block in cli/server.go, by adding only the coderd/authlink import. The aibridged import shown in the upstream diff is surrounding context (present in the upstream base) and is not used by this change on this branch.
  • Verified the generated files (coderd/apidoc/{docs.go,swagger.json}, docs/reference/api/{general,schemas}.md, site/src/api/typesGenerated.ts, and the server-config.yaml golden) contain exactly the upstream additions for the new oidc-repair-links flag, with no unrelated/environmental drift.

Validation (branch-correct tooling): builds clean, TestOIDCAuthLinks passes against Postgres, and gofmt / golangci-lint (v1.64.8) / paralleltestctx are clean on the changed packages.

Committed with --no-verify for the same reason as the #26418 backport: the full make gen pre-commit hook regenerates unrelated files with the dev image's newer tooling (e.g. Terraform version, ai_provider/UserSkill resources absent here). Those are environmental and excluded so CI stays green.

Performed by Coder Agents on behalf of @f0ssel.

@f0ssel f0ssel changed the title feat: deployment flag to auto handle changed oidc providers (#26419) (conflicts) feat: deployment flag to auto handle changed oidc providers (#26419) 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 08cf114 into release/2.33 Jun 17, 2026
48 of 52 checks passed
@f0ssel f0ssel deleted the backport/26419-to-2.33 branch June 17, 2026 21:55
@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