Skip to content

fix(serveredition): move orphaned broker connector into serveredition pkg (MCP-2455)#679

Merged
Dumbris merged 1 commit into
mainfrom
fix/mcp-2455-broker-connector-rename
Jun 15, 2026
Merged

fix(serveredition): move orphaned broker connector into serveredition pkg (MCP-2455)#679
Dumbris merged 1 commit into
mainfrom
fix/mcp-2455-broker-connector-rename

Conversation

@Dumbris

@Dumbris Dumbris commented Jun 15, 2026

Copy link
Copy Markdown
Member

Problem

Server Edition CI (-tags server) is red on main, which fails the Server Edition check on every open PR (#677, #675, #674, #673, #672, #649) since #631 added that job to PR CI.

Root cause: PR #602 added internal/teams/broker/oauth_connector.go after the Teams→Server Edition rename (#603) moved internal/teams/internal/serveredition/. The connector landed in the stale path as package broker, referencing CredentialStore/UpstreamCredential as same-package symbols — but those live in internal/serveredition/broker. Result:

internal/teams/broker/oauth_connector.go:95:12: undefined: CredentialStore
internal/teams/broker/oauth_connector.go:184:78: undefined: UpstreamCredential

Fix

git mv the connector + its test into internal/serveredition/broker/ (no importers of the old path) and delete the now-empty internal/teams/ tree. Same package → all refs resolve. No code changes.

Verification

  • go build -tags server ./... → exit 0
  • go build ./... (personal edition) → exit 0
  • go test -tags server ./internal/serveredition/... → all packages ok (incl. broker connector tests)

Unblocks the 6 PRs above once they rebase. Fixes MCP-2455.

🤖 Generated with Claude Code

… pkg (MCP-2455)

PR #602 added internal/teams/broker/oauth_connector.go AFTER the Teams->Server
Edition rename (#603) moved internal/teams/ -> internal/serveredition/. The
connector landed in the stale path, in package broker, referencing
CredentialStore/UpstreamCredential as same-package symbols — but those live in
internal/serveredition/broker. Result: 'undefined: CredentialStore' under
-tags server, breaking the Server Edition CI job on main (and therefore on
every open PR after #631 added that job to PR CI).

Fix: git mv the connector + its test into internal/serveredition/broker/ (no
importers of the old path) and delete the now-empty internal/teams/ tree.
Same package, so all refs resolve. No code changes.

Verified: go build -tags server ./... (0), go build ./... (0),
go test -tags server ./internal/serveredition/... (all ok).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

@mcpproxy-gatekeeper mcpproxy-gatekeeper Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mechanical fix: git mv orphaned broker connector into serveredition pkg (no code change). Verified locally: server+personal build exit 0, all serveredition tests pass.

@Dumbris Dumbris enabled auto-merge (squash) June 15, 2026 05:58
@cloudflare-workers-and-pages

Copy link
Copy Markdown

Deploying mcpproxy-docs with  Cloudflare Pages  Cloudflare Pages

Latest commit: 1115f7c
Status: ✅  Deploy successful!
Preview URL: https://64373a91.mcpproxy-docs.pages.dev
Branch Preview URL: https://fix-mcp-2455-broker-connecto.mcpproxy-docs.pages.dev

View logs

@codecov-commenter

Copy link
Copy Markdown

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

@Dumbris Dumbris merged commit 8196ea0 into main Jun 15, 2026
33 of 34 checks passed
Dumbris added a commit that referenced this pull request Jun 15, 2026
… deleted internal/teams) (#680)

The Server Edition CI job (added #631) ran:
  go test -race -tags server ./internal/teams/... ./internal/config/...
But the Teams->Server Edition rename (#603) moved that code to
internal/serveredition/, and #679 deleted the last stale internal/teams/
file. So the job failed with 'lstat ./internal/teams/: no such file or
directory' — and before that, it was silently testing the wrong (stale,
near-empty) path, never the real serveredition packages.

Fix: test ./internal/serveredition/... instead. Verified locally:
go test -race -tags server ./internal/serveredition/... ./internal/config/...
-> all 8 packages ok.

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants