68aeefa296
* feat(gitlab): add GitLab integration with MR / discussions support Adds a GitLab integration parallel to the GitHub one: PAT and glab CLI auth, self-managed host configuration, MR feedback (approvals + discussions + pipelines), and discussion reply / resolve so agents can address review comments. The pr skill detects the host from git remote and creates a real GitLab merge request via glab or REST. Closes #820 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * refactor(gitlab): address review feedback and tighten lint surface - Add service_test.go covering ConfigureToken / ClearToken / ConfigureHost. - Drop speculative MRWatch / TaskMR / ReviewWatch / IssueWatch / preset scaffolding that had no migrations or handlers behind it. - Consolidate /approvals into one round-trip via fetchApprovals. - Use http.DefaultClient in CheckHost (context already carries the deadline). - Rename misleading id → configured in ConfigureToken. - Introduce mrStateOpen constant so the lint goconst rule passes. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(gitlab): address PR review feedback (CodeQL SSRF, races, atomicity) - connectivity: parse host with url.Parse, validate http/https scheme, build probe URL via &url.URL{} so user-controlled host can't smuggle into the request — clears the CodeQL go/request-forgery alert. - pat_client: guard cached username with sync.RWMutex; IsAuthenticated now propagates non-401/403 errors instead of masking transport failures; GetMRStatus skips pipelines query when HeadSHA / HeadBranch are both empty; parseNextLink drops cross-host links instead of returning bare absolute URLs that get() would double-prefix. - service: findTokenSecret returns (bool, string, error) and all callers propagate the secrets.List error so a backend outage isn't mistaken for "token absent"; ConfigureHost persists to hostStore before mutating in-memory host + client + authMethod under one lock. - repoclone: SSH clone URL falls back to ssh:// form when the host has a port (scp-style git@host:path can't carry one). - gitlab/client_helpers: namespace fallback uses LastIndex("/") so subgroup paths (acme/team/squad/repo) are preserved. - pr skill / plan doc: drop hardcoded --target-branch main, derive host from git remote instead of $CI_SERVER_URL, build curl payload with jq -n; fix /pipelines/:id/jobs → :pipeline_id typo. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(gitlab): preserve host base path in CheckHost; broaden validation; test - connectivity: extract validateHost so the parse / scheme / hostname / userinfo / opaque-URL checks each have a single home. Preserve the configured base path (TrimRight slash) so a host like https://gitlab.acme.corp/gitlab probes /gitlab/api/v4/version instead of dropping the prefix. - connectivity_test: cover validateHost (default, https, http, trailing slash, subpath, missing scheme, ftp, empty host, userinfo) and CheckHost end-to-end (version endpoint, base-path preservation, scheme rejection, unreachable host). - pr skill: drop the broken `glab repo view --json defaultBranch` branch — glab doesn't accept --json, so the lookup silently fell back to "main" every time. Fetch default_branch via the GitLab REST API directly using the PAT we already have. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(gitlab): override filter defaults, refresh auth uncached, mock pipelines - appendFilter: Del before re-Add so user-supplied filter keys actually override caller defaults (e.g. state=closed swaps the seeded state=opened instead of appending a second value GitLab silently ignored). - IsAuthenticated: probe /user directly instead of routing through the username cache; a token revoked upstream now surfaces as not-connected immediately. Cache is opportunistically refreshed on success. - MockClient.GetMRFeedback: include pipeline state in HasIssues, matching the real PATClient behavior so test flows can't miss a broken MR. - pr skill: document `glab mr note create --reply <id>` for replies (bare `glab mr note` opens a new thread); fix host-extraction block to handle ssh://host:2222/team/repo.git without leaking the port into PROJECT. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(gitlab): guard mock pipelines on empty MR head; preserve HTTPS port in pr skill - MockClient.GetMRFeedback now mirrors PATClient: skip the pipelines fetch when HeadSHA and HeadBranch are both empty. The mock'\''s ListPipelines ignores its branch argument and returns every pipeline seeded under the project, so without this guard a brand-new MR would inherit a sibling MR'\''s failing pipeline and flip HasIssues to true. Tests cover both the empty-head and head-present cases. - pr skill: derive HOST scheme-aware so https://host:8443 keeps the port (HTTPS API endpoint), ssh://host:2222 strips it (different transport), and scp-style git@host stays portless. Avoids silently re-routing self-managed API calls to the default 443. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(gitlab): export SeedPipelines; mock GetMRStatus parity; drain bodies; test cache hit - MockClient: add exported SeedPipelines(project, iid, []) alongside the other Seed* methods; mirror PATClient.GetMRStatus by populating PipelineState / jobs counts via summarizePipelines, guarded on a non-empty head ref. Brings mock parity with the real client so any future test seeding pipelines sees the same MRStatus shape. - PATClient HTTP plumbing: drain resp.Body via io.Copy(io.Discard, ...) when result == nil in both getWithTotal and doWrite, so HTTP/1.1 can reuse the connection instead of opening a new TCP socket per call. - TestPATClient_GetAuthenticatedUser: assert calls == 1 after the second GetAuthenticatedUser hit so the cache contract is actually verified (a non-caching implementation would have passed the prior version). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(gitlab): surface connection errors, align MR pipeline guards, fix mock seed key - service.GetStatus now captures the IsAuthenticated error into a new Status.ConnectionError field (empty on healthy / 401-403, populated on network / 5xx / parse failures). Frontend GitLabStatus + settings page render a distinct "Unreachable" badge + alert so users don't delete a still-valid token during a transient GitLab outage. - PATClient.GetMRFeedback now guards on HeadSHA || HeadBranch, matching GetMRStatus and MockClient.GetMRFeedback (which had been updated in an earlier round). The three call sites were inconsistent — a mock test with HeadBranch-but-no-SHA would pass while the real client silently dropped pipelines. - MockClient.pipelines is now keyed by project alone (was map[mockMRKey][]Pipeline). SeedPipelines takes (project, []) so successive seeds for the same project deterministically overwrite, instead of leaving multiple entries that ListPipelines would resolve in Go's unspecified map-iteration order. - Tests: TestService_GetStatus_{PopulatesConnectionErrorOn5xx, ClearsConnectionErrorOn401} cover the new error surface; TestMockClient_SeedPipelines_OverwritesByProject locks the key change. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(gitlab): tighten validateHost; init Status scopes; close token-host race - validateHost: drop the parsed.Opaque != "" branch — Go only sets Opaque for opaque URIs, which have an empty Host the prior check already rejects. Narrow the userinfo error to mention the actual user:password@host shape so the message matches what users see. - service.GetStatus: initialize RequiredScopes: []string{} on the nil-client defensive branch so the JSON payload keeps the always-an-array contract declared on the TypeScript side. The branch is effectively unreachable (every Provide path returns at least a NoopClient) but the empty-slice fallback costs nothing. - service.ConfigureToken: build the installed client inside the write lock using the up-to-date s.host instead of the pre-probe snapshot. A concurrent ConfigureHost between RUnlock and Lock used to leave s.client pointing at the prior host while s.host advertised the new one — every subsequent API call would silently target the wrong instance until the next reconfigure. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(gitlab): drop MR-commit stats fields; rename AuthorName; log post-lock host - MRCommitInfo: drop Additions / Deletions / FilesChanged. GitLab's /merge_requests/:iid/commits endpoint doesn't return a stats object, so those fields were always 0 — better to omit them than feed callers silently-wrong numbers. Rename AuthorUsername to AuthorName since the API returns a display name, not a login handle. Doc-comment records the per-commit endpoint to use if a future revision wants real stats. - ListMRCommits: drop the Stats anonymous struct from the JSON decode target now that the destination fields are gone. - service.ConfigureToken: capture installedHost inside the write lock and log that value. The previous log used the pre-validation host snapshot, so a concurrent ConfigureHost between snapshot and lock would leave the log entry referring to a stale value while the client itself was correctly built against the new host. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(gitlab): encode subgroup paths; sentinel-route errors; mock approval parity - pat_client.SearchGroupProjects now encodes the group path through a new groupRef helper that %2F-substitutes slashes (mirrors projectRef). Subgroup paths like "acme/team" used to land at /groups/acme/team/projects, which GitLab routed to the parent group only and returned 404 for. Subgroups now work end-to-end. - service.ErrInvalidToken sentinel + controller errors.Is routing: token validation failures now wrap a package-level sentinel and the HTTP layer switches on it via errors.Is, replacing the fragile strings.Contains prefix check that would silently fall through to 500 if the message ever changed. Coverage: TestService_ConfigureToken_WrapsErrInvalidToken. - MockClient gains seedable approvals: SeedApprovals(project, iid, list, required) backs a dedicated approvals + requiredApprovals map. ListMRApprovals, GetMRFeedback, and GetMRStatus all consume them so ApprovalState / ApprovalCount / RequiredApprovals match what the real PATClient.GetMRStatus computes. Coverage: TestMockClient_GetMRStatus_UsesSeededApprovals. - ClearToken: same host-snapshot race ConfigureToken was fixed for last round — NewClient now runs under the write lock against s.host rather than a pre-acquired snapshot. - CheckHost: drain resp.Body before close so http.DefaultClient's keep-alive pool can reuse the connection for the next probe. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(gitlab): full-path projectRef round-trip; unlock during glab probe - splitFullReference now returns (namespace, fullPath) where fullPath is the namespace-qualified project path ("group/sub/project") instead of the last segment alone. Callers can pass MR.ProjectPath straight to projectRef for round-trip API calls (GetMR, GetMRFeedback, etc.) — matches GitLab's own path_with_namespace convention. Existing test cases updated. - ClearToken: build the fallback client OUTSIDE the write lock so NewClient's glab subprocess (bounded by glabAuthTimeout = 10s) doesn't freeze every concurrent GetStatus / GetMRFeedback / Client() RLock reader for the duration. Brief WLock now only wraps the field swap. Tradeoff with the concurrent-ConfigureHost race is documented in-code: narrow stale-host window vs. 10s of blocked readers, and the next reconfigure resolves it. - New regression test TestPATClient_SearchGroupProjects_EncodesSubgroupSlash asserts the request URL is /groups/acme%2Fteam/projects so a future refactor that swapped groupRef back to a bare url.PathEscape would fail visibly instead of silently 404ing subgroup lookups. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(gitlab): equality-guard ClearToken's client swap against ConfigureHost race ClearToken builds the fallback client outside the write lock to avoid blocking RLock readers for up to 10s while glab auth-probes. The swap-only critical section now compares s.host against the pre-probe snapshot before assigning — if a concurrent ConfigureHost moved the host underneath us, we leave its (newer, correctly-targeted) client alone instead of overwriting with our stale-host build. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(web): add GitLab to the settings integrations sidebar The /settings/integrations/gitlab page existed and the index card listed GitLab alongside the other integrations, but the settings sidebar nav (IntegrationsNavGroup) only listed GitHub / Jira / Linear / Slack. The page was unreachable through the standard sidebar. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * feat(gitlab): task-MR topbar surface + DB-backed task↔MR store Phase 1 of the GitLab UI build-out: brings the MR side of the task topbar to parity with the existing GitHub PR button. Backend - gitlab_task_mrs table + Store wiring (UpsertTaskMR, ListTaskMRsByTask, ListTaskMRsByWorkspaceID, DeleteTaskMR), uniqued on (task_id, repository_id, project_path, mr_iid) for multi-repo. - service.SyncTaskMR folds a live GetMRStatus probe into an upsert; ListTaskMRsByTask / ListTaskMRsByWorkspace expose the rows. - Three HTTP endpoints: GET /workspaces/:id/task-mrs, GET /tasks/:taskID/mrs, POST /tasks/:taskID/mrs/sync. - initGitLabService now takes a *db.Pool and constructs gitlab.Store. Failures non-fatal: integration keeps working without the table. Frontend - TaskMR type + listWorkspaceTaskMRs / listTaskMRs / syncTaskMR API. - lib/state/slices/gitlab slice (taskMRs.byTaskId) wired through default-state, store.ts AppState, and slices/index exports. - hooks/domains/gitlab/use-task-mr.ts: useWorkspaceMRs (fetch-on- workspace-switch) and useTaskMRs (per-task selector). - components/gitlab/mr-topbar-button.tsx — single/multi MR variants, status icons mirroring pr-task-icon priority order. - task-top-bar.tsx renders PRTopbarButton and MRTopbarButton side-by- side; each returns null when empty, so the union handles GitHub-only, GitLab-only, and multi-repo tasks without an explicit switch. - kanban-board.tsx hydrates useWorkspaceMRs alongside useWorkspacePRs. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * feat(gitlab): add /gitlab page for browsing user MRs and issues Adds the GitLab counterpart to /github so users can browse their own merge requests and issues from inside kandev, parallel to the existing GitHub "My GitHub" page. Backend - /api/v1/gitlab/user/mrs and /user/issues — paginated wrappers around the existing SearchMRsPaged / ListIssuesPaged client methods. paginationFromQuery clamps page/per_page the same way as the client. Frontend - /gitlab SSR page + client with MR/Issue tabs, scope filters (assigned / created / review-requested), and a free-text search box that falls back to raw GitLab query-string for power users. - searchUserMRs / searchUserIssues API helpers + MR / Issue / *SearchPage types in lib/types/gitlab. - useGitLabAvailable hook (probes /status + refreshes on window focus) feeds the integrations menu so the GitLab link only shows when a token is configured or auth is green. Tests - task-top-bar.test mocks the new MRTopbarButton so renders no longer pick up useAppStore without a StateProvider. - integrations-menu.test wires the new useGitLabAvailable mock and gitlabReady prop into mockAvailability / getAvailableIntegrationLinks fixtures. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(gitlab): stable empty array in useTaskMRs to avoid infinite re-render useTaskMRs returned `state.taskMRs.byTaskId[taskId] ?? []` — that fresh literal made the zustand selector produce a new reference on every render when the task had no MRs, triggering an infinite re-render loop in MRTopbarButton that crashed the task page with a Next.js client-side exception. The page never mounted session-chat, so Docker E2E tests that drive `/t/:id` (slow-bootstrap progress, external-stop resume, environment reset) all timed out waiting for the chat panel. Mirror the GitHub side's `EMPTY_PRS` pattern: hoist a module-level `EMPTY_MRS = []` and return it for the empty case. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(gitlab): address PR review — cache header, in-flight cancel, tests - Top-level `cache: "no-store"` in 5 sites (use-task-mr.ts, gitlab-api.ts, gitlab-page-client.tsx). The earlier `init: { cache: "no-store" }` placement was silently overwritten by fetchJson with undefined, so probes hit the browser cache instead. - useWorkspaceMRs now invalidates in-flight responses and calls resetTaskMRs when the workspace becomes null, so the previous workspace's MRs don't linger after sign-out / workspace switch. - Drop unpopulated UnresolvedThreads/DiscussionCount from TaskMR (model, schema, TS type). SyncTaskMR's source MRStatus never populated them and no surface reads them; the dropped columns are skipped via an explicit projection in store.go so existing dev DBs keep binding. - Extract MRList/IssueList inline fetches in /gitlab into useGitLabUserMRs / useGitLabUserIssues — matches CLAUDE.md "never fetch in components". - Tests for store (UpsertTaskMR, composite key, workspace-JOIN isolation, ordering, Delete), service (SyncTaskMR mock round-trip + field mapping + store-unset error, ListTaskMRsByWorkspace JOIN isolation, ListTaskMRsByTask), pat_client (ListIssuesPaged X-Total), gitlab-api (5 new fns), gitlab-slice (setTaskMR composite key), and the use-task-mr / use-user-search hooks. - pr SKILL.md: skip note for steps 5–6 on GitLab remotes. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(gitlab): only wrap 401/403 probe errors as ErrInvalidToken Network failures, 5xx, and DNS errors during `ConfigureToken` previously surfaced to the user as HTTP 400 "invalid token: …" — during a GitLab outage a user with a valid token might delete it assuming it was rejected. Now only `*APIError` with 401/403 is mapped to `ErrInvalidToken`; other errors propagate unwrapped so the controller routes them to "GitLab unreachable" instead. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> --------- Co-authored-by: Kandev Agent <agent@kandev.dev> Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
418 lines
13 KiB
Go
418 lines
13 KiB
Go
package gitlab
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
// MockClient is an in-memory GitLab client used by E2E tests.
|
|
// Activated when KANDEV_MOCK_GITLAB=true. It serves a small fixed set of
|
|
// MRs/issues/discussions plus accepts dynamic seeding via mock_controller.
|
|
//
|
|
// The mock intentionally implements the full Client interface but covers
|
|
// only the fields E2E flows exercise — the goal is to drive UI tests, not
|
|
// to emulate GitLab faithfully.
|
|
type MockClient struct {
|
|
host string
|
|
|
|
mu sync.Mutex
|
|
username string
|
|
mrs map[mockMRKey]*MR
|
|
discussions map[mockMRKey][]MRDiscussion
|
|
// pipelines is keyed by project — ListPipelines below returns the
|
|
// project's seeded set regardless of branch or iid, matching the
|
|
// real PATClient.ListPipelines flow (one MR head ref → all
|
|
// pipelines for that project). Keying by mockMRKey here would
|
|
// make iteration order matter when multiple MRs share a project.
|
|
pipelines map[string][]Pipeline
|
|
// approvals tracks who has approved each MR. requiredApprovals tracks
|
|
// the project-level required-count GitLab returns alongside the
|
|
// approved_by list. Both are seeded separately because the GitLab
|
|
// /approvals endpoint conflates them on one payload — the mock keeps
|
|
// them split so tests can express e.g. "2 approvals required, 1 given".
|
|
approvals map[mockMRKey][]MRApproval
|
|
requiredApprovals map[mockMRKey]int
|
|
issues map[mockIssueKey]*Issue
|
|
branches map[string][]RepoBranch
|
|
nextMRIID int
|
|
}
|
|
|
|
type mockMRKey struct {
|
|
Project string
|
|
IID int
|
|
}
|
|
|
|
type mockIssueKey struct {
|
|
Project string
|
|
IID int
|
|
}
|
|
|
|
// NewMockClient builds a fresh mock with a small canned dataset.
|
|
func NewMockClient(host string) *MockClient {
|
|
if host == "" {
|
|
host = DefaultHost
|
|
}
|
|
c := &MockClient{
|
|
host: host,
|
|
username: "kandev-tester",
|
|
mrs: make(map[mockMRKey]*MR),
|
|
discussions: make(map[mockMRKey][]MRDiscussion),
|
|
pipelines: make(map[string][]Pipeline),
|
|
approvals: make(map[mockMRKey][]MRApproval),
|
|
requiredApprovals: make(map[mockMRKey]int),
|
|
issues: make(map[mockIssueKey]*Issue),
|
|
branches: make(map[string][]RepoBranch),
|
|
nextMRIID: 100,
|
|
}
|
|
return c
|
|
}
|
|
|
|
// SetUser overrides the authenticated user reported by the mock.
|
|
func (c *MockClient) SetUser(username string) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
c.username = username
|
|
}
|
|
|
|
// SeedMR registers an MR for (projectPath, iid). If iid == 0 the mock
|
|
// assigns one and returns it. The MR is stored verbatim.
|
|
func (c *MockClient) SeedMR(projectPath string, mr *MR) int {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
iid := mr.IID
|
|
if iid == 0 {
|
|
iid = c.nextMRIID
|
|
c.nextMRIID++
|
|
mr.IID = iid
|
|
}
|
|
mr.ProjectPath = projectPath
|
|
c.mrs[mockMRKey{Project: projectPath, IID: iid}] = mr
|
|
return iid
|
|
}
|
|
|
|
// SeedDiscussions sets the discussions returned for an MR.
|
|
func (c *MockClient) SeedDiscussions(projectPath string, iid int, discussions []MRDiscussion) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
c.discussions[mockMRKey{Project: projectPath, IID: iid}] = discussions
|
|
}
|
|
|
|
// SeedIssue registers an issue.
|
|
func (c *MockClient) SeedIssue(projectPath string, issue *Issue) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
issue.ProjectPath = projectPath
|
|
c.issues[mockIssueKey{Project: projectPath, IID: issue.IID}] = issue
|
|
}
|
|
|
|
// SeedBranches sets the branches returned for a project.
|
|
func (c *MockClient) SeedBranches(projectPath string, branches []RepoBranch) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
c.branches[projectPath] = branches
|
|
}
|
|
|
|
// SeedPipelines registers the pipelines returned for projectPath.
|
|
// The mock's ListPipelines returns every pipeline seeded under the project
|
|
// regardless of branch, mirroring how the real PATClient surfaces a single
|
|
// project-level pipeline list. Keyed by project (not MR iid) so two MRs in
|
|
// the same project share one canonical list — calling SeedPipelines twice
|
|
// overwrites rather than racing on map iteration order.
|
|
func (c *MockClient) SeedPipelines(projectPath string, pipelines []Pipeline) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
c.pipelines[projectPath] = pipelines
|
|
}
|
|
|
|
// SeedApprovals registers the approval state for (projectPath, iid):
|
|
// the list of who has approved + the required-count for "approved" to
|
|
// flip on. Tests can express "1 of 2 approvals" by passing one approver
|
|
// and required=2.
|
|
func (c *MockClient) SeedApprovals(projectPath string, iid int, approvals []MRApproval, required int) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
key := mockMRKey{Project: projectPath, IID: iid}
|
|
c.approvals[key] = approvals
|
|
c.requiredApprovals[key] = required
|
|
}
|
|
|
|
func (c *MockClient) Host() string { return c.host }
|
|
|
|
func (c *MockClient) IsAuthenticated(context.Context) (bool, error) {
|
|
return true, nil
|
|
}
|
|
|
|
func (c *MockClient) GetAuthenticatedUser(context.Context) (string, error) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
return c.username, nil
|
|
}
|
|
|
|
func (c *MockClient) GetMR(_ context.Context, projectPath string, iid int) (*MR, error) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
mr, ok := c.mrs[mockMRKey{Project: projectPath, IID: iid}]
|
|
if !ok {
|
|
return nil, fmt.Errorf("mock: MR %s!%d not found", projectPath, iid)
|
|
}
|
|
return mr, nil
|
|
}
|
|
|
|
func (c *MockClient) FindMRByBranch(_ context.Context, projectPath, branch string) (*MR, error) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
for _, mr := range c.mrs {
|
|
if mr.ProjectPath == projectPath && mr.HeadBranch == branch && mr.State == mrStateOpen {
|
|
return mr, nil
|
|
}
|
|
}
|
|
return nil, nil
|
|
}
|
|
|
|
func (c *MockClient) ListAuthoredMRs(_ context.Context, projectPath string) ([]*MR, error) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
user := c.username
|
|
out := []*MR{}
|
|
for _, mr := range c.mrs {
|
|
if mr.ProjectPath == projectPath && mr.AuthorUsername == user {
|
|
out = append(out, mr)
|
|
}
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
func (c *MockClient) ListReviewRequestedMRs(context.Context, string, string) ([]*MR, error) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
out := []*MR{}
|
|
for _, mr := range c.mrs {
|
|
for _, r := range mr.Reviewers {
|
|
if r.Username == c.username {
|
|
out = append(out, mr)
|
|
break
|
|
}
|
|
}
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
func (c *MockClient) ListUserGroups(context.Context) ([]Group, error) {
|
|
return []Group{{ID: 1, Path: "kandev", Name: "Kandev"}}, nil
|
|
}
|
|
|
|
func (c *MockClient) SearchGroupProjects(context.Context, string, string, int) ([]Project, error) {
|
|
return []Project{}, nil
|
|
}
|
|
|
|
func (c *MockClient) ListMRApprovals(_ context.Context, projectPath string, iid int) ([]MRApproval, error) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
if a, ok := c.approvals[mockMRKey{Project: projectPath, IID: iid}]; ok {
|
|
return a, nil
|
|
}
|
|
return []MRApproval{}, nil
|
|
}
|
|
|
|
func (c *MockClient) ListMRDiscussions(_ context.Context, projectPath string, iid int, _ *time.Time) ([]MRDiscussion, error) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
return c.discussions[mockMRKey{Project: projectPath, IID: iid}], nil
|
|
}
|
|
|
|
func (c *MockClient) CreateMRDiscussionNote(_ context.Context, projectPath string, iid int, discussionID, body string) (*MRNote, error) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
key := mockMRKey{Project: projectPath, IID: iid}
|
|
now := time.Now().UTC()
|
|
note := MRNote{
|
|
ID: now.UnixNano(),
|
|
Author: c.username,
|
|
Body: body,
|
|
CreatedAt: now,
|
|
UpdatedAt: now,
|
|
}
|
|
for i, d := range c.discussions[key] {
|
|
if d.ID == discussionID {
|
|
c.discussions[key][i].Notes = append(c.discussions[key][i].Notes, note)
|
|
c.discussions[key][i].UpdatedAt = now
|
|
return ¬e, nil
|
|
}
|
|
}
|
|
return nil, fmt.Errorf("mock: discussion %s not found", discussionID)
|
|
}
|
|
|
|
func (c *MockClient) ResolveMRDiscussion(_ context.Context, projectPath string, iid int, discussionID string) error {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
key := mockMRKey{Project: projectPath, IID: iid}
|
|
for i, d := range c.discussions[key] {
|
|
if d.ID == discussionID {
|
|
c.discussions[key][i].Resolved = true
|
|
return nil
|
|
}
|
|
}
|
|
return fmt.Errorf("mock: discussion %s not found", discussionID)
|
|
}
|
|
|
|
func (c *MockClient) ListPipelines(_ context.Context, projectPath, _ string) ([]Pipeline, error) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
if p, ok := c.pipelines[projectPath]; ok {
|
|
return p, nil
|
|
}
|
|
return []Pipeline{}, nil
|
|
}
|
|
|
|
func (c *MockClient) GetMRFeedback(ctx context.Context, projectPath string, iid int) (*MRFeedback, error) {
|
|
mr, err := c.GetMR(ctx, projectPath, iid)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
d, _ := c.ListMRDiscussions(ctx, projectPath, iid, nil)
|
|
approvals, _ := c.ListMRApprovals(ctx, projectPath, iid)
|
|
// Mirror PATClient.GetMRFeedback: only consider pipelines when the MR
|
|
// actually has a head ref. MockClient.ListPipelines ignores its branch
|
|
// argument and returns every pipeline seeded under the project, so
|
|
// without this guard a fresh MR with no head would still inherit a
|
|
// failing pipeline from a sibling MR in the same project.
|
|
var pipelines []Pipeline
|
|
if mr.HeadSHA != "" || mr.HeadBranch != "" {
|
|
pipelines, _ = c.ListPipelines(ctx, projectPath, mr.HeadBranch)
|
|
}
|
|
return &MRFeedback{
|
|
MR: mr,
|
|
Approvals: approvals,
|
|
Discussions: d,
|
|
Pipelines: pipelines,
|
|
HasIssues: hasOpenDiscussions(d) || pipelineFailing(pipelines),
|
|
}, nil
|
|
}
|
|
|
|
func (c *MockClient) GetMRStatus(ctx context.Context, projectPath string, iid int) (*MRStatus, error) {
|
|
mr, err := c.GetMR(ctx, projectPath, iid)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var pipelines []Pipeline
|
|
if mr.HeadSHA != "" || mr.HeadBranch != "" {
|
|
pipelines, _ = c.ListPipelines(ctx, projectPath, mr.HeadBranch)
|
|
}
|
|
approvals, _ := c.ListMRApprovals(ctx, projectPath, iid)
|
|
c.mu.Lock()
|
|
required := c.requiredApprovals[mockMRKey{Project: projectPath, IID: iid}]
|
|
c.mu.Unlock()
|
|
pipelineState, jobsTotal, jobsPassing := summarizePipelines(pipelines)
|
|
approvalState := summarizeApprovals(len(approvals), required)
|
|
return &MRStatus{
|
|
MR: mr,
|
|
ApprovalState: approvalState,
|
|
PipelineState: pipelineState,
|
|
MergeStatus: mr.MergeStatus,
|
|
ApprovalCount: len(approvals),
|
|
RequiredApprovals: required,
|
|
PipelineJobsTotal: jobsTotal,
|
|
PipelineJobsPassing: jobsPassing,
|
|
}, nil
|
|
}
|
|
|
|
func (c *MockClient) ListMRFiles(context.Context, string, int) ([]MRFile, error) {
|
|
return []MRFile{}, nil
|
|
}
|
|
|
|
func (c *MockClient) ListMRCommits(context.Context, string, int) ([]MRCommitInfo, error) {
|
|
return []MRCommitInfo{}, nil
|
|
}
|
|
|
|
func (c *MockClient) SubmitMRApproval(context.Context, string, int) error { return nil }
|
|
func (c *MockClient) SubmitMRUnapproval(context.Context, string, int) error { return nil }
|
|
|
|
func (c *MockClient) CreateMR(_ context.Context, projectPath, sourceBranch, targetBranch, title, description string, draft bool) (*MR, error) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
iid := c.nextMRIID
|
|
c.nextMRIID++
|
|
mr := &MR{
|
|
IID: iid,
|
|
Title: title,
|
|
Body: description,
|
|
HeadBranch: sourceBranch,
|
|
BaseBranch: targetBranch,
|
|
State: mrStateOpen,
|
|
Draft: draft,
|
|
AuthorUsername: c.username,
|
|
ProjectPath: projectPath,
|
|
WebURL: fmt.Sprintf("%s/%s/-/merge_requests/%d", c.host, projectPath, iid),
|
|
URL: fmt.Sprintf("%s/%s/-/merge_requests/%d", c.host, projectPath, iid),
|
|
CreatedAt: time.Now().UTC(),
|
|
UpdatedAt: time.Now().UTC(),
|
|
}
|
|
c.mrs[mockMRKey{Project: projectPath, IID: iid}] = mr
|
|
return mr, nil
|
|
}
|
|
|
|
func (c *MockClient) ListProjectBranches(_ context.Context, projectPath string) ([]RepoBranch, error) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
return c.branches[projectPath], nil
|
|
}
|
|
|
|
func (c *MockClient) ListIssues(context.Context, string, string) ([]*Issue, error) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
out := []*Issue{}
|
|
for _, i := range c.issues {
|
|
out = append(out, i)
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
func (c *MockClient) ListIssuesPaged(ctx context.Context, filter, customQuery string, page, perPage int) (*IssueSearchPage, error) {
|
|
issues, _ := c.ListIssues(ctx, filter, customQuery)
|
|
return &IssueSearchPage{Issues: issues, TotalCount: len(issues), Page: page, PerPage: perPage}, nil
|
|
}
|
|
|
|
func (c *MockClient) SearchMRs(context.Context, string, string) ([]*MR, error) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
out := []*MR{}
|
|
for _, mr := range c.mrs {
|
|
out = append(out, mr)
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
func (c *MockClient) SearchMRsPaged(ctx context.Context, filter, customQuery string, page, perPage int) (*MRSearchPage, error) {
|
|
mrs, _ := c.SearchMRs(ctx, filter, customQuery)
|
|
return &MRSearchPage{MRs: mrs, TotalCount: len(mrs), Page: page, PerPage: perPage}, nil
|
|
}
|
|
|
|
func (c *MockClient) GetIssueState(_ context.Context, projectPath string, iid int) (string, error) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
if i, ok := c.issues[mockIssueKey{Project: projectPath, IID: iid}]; ok {
|
|
return i.State, nil
|
|
}
|
|
return "", fmt.Errorf("mock: issue %s#%d not found", projectPath, iid)
|
|
}
|
|
|
|
// Stats returns a summary of the seeded data, useful for E2E assertions.
|
|
func (c *MockClient) Stats() string {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
return fmt.Sprintf(
|
|
"mrs=%d discussions=%d issues=%d",
|
|
len(c.mrs), totalDiscussions(c.discussions), len(c.issues),
|
|
)
|
|
}
|
|
|
|
func totalDiscussions(m map[mockMRKey][]MRDiscussion) int {
|
|
total := 0
|
|
for _, d := range m {
|
|
total += len(d)
|
|
}
|
|
return total
|
|
}
|