Skip to content

fix(serveredition): move orphaned OAuth broker connector to fix Server Edition CI#678

Closed
Dumbris wants to merge 1 commit into
mainfrom
fix/mcp-2455-teams-broker-serveredition
Closed

fix(serveredition): move orphaned OAuth broker connector to fix Server Edition CI#678
Dumbris wants to merge 1 commit into
mainfrom
fix/mcp-2455-teams-broker-serveredition

Conversation

@Dumbris

@Dumbris Dumbris commented Jun 15, 2026

Copy link
Copy Markdown
Member

Problem

The Server Edition CI job (unit-tests.ymlTest server edition packages) is red on main (9f3e1abf), blocking every server-edition merge (surfaced by #672 / MCP-2442):

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

Root cause

The teams→serveredition rename (MCP-1086, #602) moved credential_store.go, bbolt_aes.go and token_exchanger.go into internal/serveredition/broker/ but left oauth_connector.go + its test orphaned in internal/teams/broker/. That package referenced CredentialStore / UpstreamCredential (now in serveredition/broker) by their old same-package names, and its test referenced helpers (newTestStore/newTestKey) that also moved → the internal/teams/broker package no longer compiles under -tags server.

oauth_connector.go (spec 074 Path B, OAuthConnector) is unique functionality — not duplicated in serveredition/broker, and imported by nothing outside its own package — so the correct fix is to complete the rename, not delete it.

Fix

  • git mv oauth_connector.go + oauth_connector_test.go into internal/serveredition/broker/ (same package broker, where the moved types and test helpers live); remove the now-empty internal/teams tree.
  • Update unit-tests.yml server-edition step to test ./internal/serveredition/... — the old ./internal/teams/... path no longer exists and was itself hard-failing with no such file or directory.

Verification

  • go build ./cmd/mcpproxy (personal) ✅
  • go build -tags server ./cmd/mcpproxy
  • go test -race -tags server ./internal/serveredition/... ./internal/config/... — all packages ok
  • golangci-lint v2.5.0 --config .github/.golangci.yml (server tags) — 0 issues ✅

Related #672
Related MCP-2455

…dition package

The teams→serveredition rename (MCP-1086) moved credential_store.go,
bbolt_aes.go and token_exchanger.go into internal/serveredition/broker but
left oauth_connector.go + its test behind in internal/teams/broker. That
orphaned package referenced CredentialStore/UpstreamCredential (now in
serveredition/broker) by their old same-package names, so internal/teams/broker
no longer compiled under -tags server and broke the "Server Edition" CI job on
main, blocking every server-edition merge.

Move oauth_connector.go and oauth_connector_test.go into
internal/serveredition/broker (same package name, where the moved types and the
test helpers newTestStore/newTestKey live) and remove the now-empty
internal/teams tree. Update the unit-tests workflow's server-edition step to
test ./internal/serveredition/... since ./internal/teams/... no longer exists
(it was hard-failing with "no such file or directory").

Verified: go build (personal + server), go test -race -tags server
./internal/serveredition/... ./internal/config/..., and golangci-lint v2.5.0
all green.

Related #672
Related MCP-2455
@cloudflare-workers-and-pages

Copy link
Copy Markdown

Deploying mcpproxy-docs with  Cloudflare Pages  Cloudflare Pages

Latest commit: 6028610
Status: ✅  Deploy successful!
Preview URL: https://db6f0fd2.mcpproxy-docs.pages.dev
Branch Preview URL: https://fix-mcp-2455-teams-broker-se.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!

@github-actions

Copy link
Copy Markdown

📦 Build Artifacts

Workflow Run: View Run
Branch: fix/mcp-2455-teams-broker-serveredition

Available Artifacts

  • archive-darwin-amd64 (28 MB)
  • archive-darwin-arm64 (25 MB)
  • archive-linux-amd64 (16 MB)
  • archive-linux-arm64 (14 MB)
  • archive-windows-amd64 (28 MB)
  • archive-windows-arm64 (25 MB)
  • frontend-dist-pr (0 MB)
  • installer-dmg-darwin-amd64 (21 MB)
  • installer-dmg-darwin-arm64 (19 MB)

How to Download

Option 1: GitHub Web UI (easiest)

  1. Go to the workflow run page linked above
  2. Scroll to the bottom "Artifacts" section
  3. Click on the artifact you want to download

Option 2: GitHub CLI

gh run download 27523116833 --repo smart-mcp-proxy/mcpproxy-go

Note: Artifacts expire in 14 days.

@Dumbris

Dumbris commented Jun 15, 2026

Copy link
Copy Markdown
Member Author

Superseded by #679 (connector move into internal/serveredition/broker) + #680 (Server Edition CI path fix), both already merged to main. MCP-2455 is fully resolved on main; this PR's changes are now a no-op. Closing as duplicate.

@Dumbris Dumbris closed this Jun 15, 2026
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