Skip to content

Commit bea9408

Browse files
committed
fix(source-control): fall back when host mapping settings fail
1 parent 72c6bba commit bea9408

13 files changed

Lines changed: 252 additions & 76 deletions

‎apps/server/src/git/GitManager.test.ts‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ import * as ProjectStore from "../orchestration-v2/ProjectStore.ts";
7272
import * as SqlitePersistence from "../persistence/Sqlite.ts";
7373
import * as ProjectSetupScriptRunner from "../project/ProjectSetupScriptRunner.ts";
7474
import * as ProviderRegistry from "../provider/ProviderRegistry.ts";
75+
import { withHostOverrideSettingsFailure } from "../testUtils/hostOverrideSettingsFailure.ts";
7576
import * as ServerSettings from "../serverSettings.ts";
7677
import { makeSettingsChanges } from "../testUtils/settingsChanges.ts";
7778
import * as GitManager from "./GitManager.ts";
@@ -865,6 +866,49 @@ const layerGitManagerTest = GitVcsDriver.layer.pipe(
865866
);
866867

867868
it.layer(layerGitManagerTest)("GitManager", (it) => {
869+
it.effect("uses hostname heuristics and warns when settings fail", () =>
870+
withHostOverrideSettingsFailure((settingsService, warnings) =>
871+
Effect.gen(function* () {
872+
const repoDir = yield* makeTempDir("t3-git-settings-failure-");
873+
yield* initRepo(repoDir);
874+
yield* runGit(repoDir, [
875+
"remote",
876+
"add",
877+
"origin",
878+
"https://github.example.test/team/repo.git",
879+
]);
880+
const { manager } = yield* makeManager({ settingsService });
881+
warnings.length = 0;
882+
const status = yield* manager.localStatus({ cwd: repoDir });
883+
expect(status.sourceControlProvider?.kind).toBe("github");
884+
}),
885+
),
886+
);
887+
888+
it.effect("warns and preserves nested remote PR lookup when settings fail", () =>
889+
withHostOverrideSettingsFailure((settingsService, warnings) =>
890+
Effect.gen(function* () {
891+
const repoDir = yield* makeTempDir("t3-git-remote-settings-failure-");
892+
yield* initRepo(repoDir);
893+
const remoteDir = yield* createBareRemote();
894+
yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);
895+
yield* runGit(repoDir, ["checkout", "-b", "feature/settings"]);
896+
yield* runGit(repoDir, ["push", "-u", "origin", "feature/settings"]);
897+
yield* configureVisibleRemoteUrlWithLocalRewrite(
898+
repoDir,
899+
"origin",
900+
"https://github.example.test/team/nested/repo.git",
901+
remoteDir,
902+
);
903+
const { manager, ghCalls } = yield* makeManager({ settingsService });
904+
warnings.length = 0;
905+
const status = yield* manager.remoteStatus({ cwd: repoDir }, { refreshUpstream: false });
906+
expect(status).not.toBeNull();
907+
expect(ghCalls.some((call) => call.startsWith("pr list "))).toBe(true);
908+
}),
909+
),
910+
);
911+
868912
it.effect("reports a configured host before applying hostname heuristics", () =>
869913
Effect.gen(function* () {
870914
const repoDir = yield* makeTempDir("t3code-git-host-mapping-");

‎apps/server/src/git/GitManager.ts‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ import * as ProjectSetupScriptRunner from "../project/ProjectSetupScriptRunner.t
8080
import * as ProviderRegistry from "../provider/ProviderRegistry.ts";
8181
import { extractBranchNameFromRemoteRef } from "./remoteRefs.ts";
8282
import { detachStackFrame } from "./detachStackFrame.ts";
83+
import { readHostOverrides } from "@t3tools/source-control-core/server/SourceControlHost";
8384
import * as ServerSettings from "../serverSettings.ts";
8485
import { subscribeHostOverrideChanges } from "../sourceControl/hostOverrideChanges.ts";
8586
import type { GitManagerServiceError } from "@t3tools/contracts";
@@ -707,20 +708,6 @@ export const make = Effect.gen(function* () {
707708

708709
const sourceControlProvider = (cwd: string) => sourceControlProviders.resolve({ cwd });
709710
const serverSettingsService = yield* ServerSettings.ServerSettingsService;
710-
const readHostOverrides = (cwd: string) =>
711-
serverSettingsService.getSettings.pipe(
712-
Effect.map((settings) => settings.sourceControlHostOverrides),
713-
Effect.mapError(
714-
(cause) =>
715-
new SourceControlProviderError({
716-
provider: SourceControlProviderKind.make("unknown"),
717-
operation: "detectProvider",
718-
cwd,
719-
detail: "The source control host mappings could not be read.",
720-
cause,
721-
}),
722-
),
723-
);
724711
const threads = yield* ProjectionStore.ProjectionStoreV2;
725712
const projects = yield* ProjectStore.ProjectStoreV2;
726713
const projectSettingsFor = Effect.fnUntraced(function* (input: {
@@ -1407,7 +1394,7 @@ export const make = Effect.gen(function* () {
14071394
(yield* readConfigValueNullable(cwd, `remote.${preferredRemoteName}.url`)) ??
14081395
(yield* readConfigValueNullable(cwd, "remote.origin.url"));
14091396

1410-
const overrides = yield* readHostOverrides(cwd);
1397+
const overrides = yield* readHostOverrides(serverSettingsService.getSettings);
14111398
const provider = remoteUrl
14121399
? detectSourceControlProviderFromGitRemoteUrl(remoteUrl, overrides)
14131400
: null;
@@ -1440,7 +1427,7 @@ export const make = Effect.gen(function* () {
14401427
/^https?:\/\//iu.test(remoteUrl) &&
14411428
(repositoryNameWithOwner?.split("/").length ?? 0) > 2
14421429
) {
1443-
const overrides = yield* readHostOverrides(cwd);
1430+
const overrides = yield* readHostOverrides(serverSettingsService.getSettings);
14441431
const kind = detectSourceControlProviderFromGitRemoteUrl(remoteUrl, overrides)?.kind;
14451432
const provider =
14461433
kind === undefined

‎apps/server/src/project/RepositoryIdentityResolver.test.ts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
1313
import { TestClock } from "effect/testing";
1414

1515
import * as ProcessRunner from "../processRunner.ts";
16+
import { withHostOverrideSettingsFailure } from "../testUtils/hostOverrideSettingsFailure.ts";
1617
import * as ServerSettings from "../serverSettings.ts";
1718
import * as RepositoryIdentityResolver from "./RepositoryIdentityResolver.ts";
1819

@@ -41,6 +42,25 @@ const layerRepositoryIdentityResolverTest = (options: {
4142
).pipe(Layer.provide(ProcessRunner.layer), Layer.provide(ServerSettings.layerTest()));
4243

4344
it.layer(NodeServices.layer)("RepositoryIdentityResolverLive", (it) => {
45+
it.effect("uses hostname heuristics and warns when settings fail", () =>
46+
withHostOverrideSettingsFailure((settings, warnings) =>
47+
Effect.gen(function* () {
48+
const fs = yield* FileSystem.FileSystem;
49+
const cwd = yield* fs.makeTempDirectoryScoped({ prefix: "t3-identity-settings-failure-" });
50+
yield* git(cwd, ["init"]);
51+
yield* git(cwd, ["remote", "add", "origin", "[email protected]:team/repo.git"]);
52+
const resolver = yield* RepositoryIdentityResolver.make().pipe(
53+
Effect.provideService(ServerSettings.ServerSettingsService, settings),
54+
Effect.provide(ProcessRunner.layer),
55+
);
56+
expect(warnings.length).toBe(1); // Subscription snapshot also falls back.
57+
const identity = yield* resolver.resolve(cwd);
58+
expect(identity?.provider).toBe("gitlab");
59+
expect(warnings.length).toBe(2);
60+
}),
61+
),
62+
);
63+
4464
it.effect("refreshes the Git root only when requested", () => {
4565
const calls: Array<ReadonlyArray<string>> = [];
4666
let rootPath = "/repo";

‎apps/server/src/project/RepositoryIdentityResolver.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import * as Exit from "effect/Exit";
1515
import * as Layer from "effect/Layer";
1616

1717
import * as ProcessRunner from "../processRunner.ts";
18+
import { readHostOverrides } from "@t3tools/source-control-core/server/SourceControlHost";
1819
import * as ServerSettings from "../serverSettings.ts";
1920
import { subscribeHostOverrideChanges } from "../sourceControl/hostOverrideChanges.ts";
2021
import { explicitBareRepositoryEnv } from "../vcs/VcsProcess.ts";
@@ -172,7 +173,7 @@ const resolveRepositoryIdentityFromCacheKey = Effect.fn(
172173
}
173174

174175
const settings = yield* ServerSettings.ServerSettingsService;
175-
const hostOverrides = (yield* settings.getSettings.pipe(Effect.orDie)).sourceControlHostOverrides;
176+
const hostOverrides = yield* readHostOverrides(settings.getSettings);
176177
const remotes = parseRemoteFetchUrls(remoteResult.value.stdout);
177178
const remote = pickPrimaryRemote(remotes);
178179
return remote

‎apps/server/src/pullRequest/PullRequestService.test.ts‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import type {
2727
import { DEFAULT_SERVER_SETTINGS } from "@t3tools/contracts/settings";
2828
import { parseChangeRequestUrl } from "@t3tools/shared/changeRequestUrl";
2929
import type { ServerSettings } from "@t3tools/contracts";
30+
import { withHostOverrideSettingsFailure } from "../testUtils/hostOverrideSettingsFailure.ts";
3031
import * as ServerSettingsService from "../serverSettings.ts";
3132
import { makeSettingsChanges } from "../testUtils/settingsChanges.ts";
3233
import { PullRequestOperationError } from "@t3tools/contracts";
@@ -800,6 +801,67 @@ it.effect("uses the configured provider's repository selector for a mapped Azure
800801
}),
801802
);
802803

804+
it.effect(
805+
"uses hostname heuristics and warns for workspace and linked PRs when settings fail",
806+
() =>
807+
withHostOverrideSettingsFailure((settingsService, warnings) =>
808+
Effect.gen(function* () {
809+
const service = yield* makeService({
810+
settingsService,
811+
projects: [
812+
project({ id: "p1", title: "web", workspaceRoot: "/repo", repository: "team/repo" }),
813+
],
814+
providers: [
815+
fakeProvider(SourceControlProviderKind.make("github"), {
816+
getChangeRequest: ({ number }) =>
817+
Effect.succeed({ ...hostedChangeRequest("PR body"), number }),
818+
}),
819+
],
820+
});
821+
warnings.length = 0;
822+
const listed = yield* service.list({ state: "open", involvement: "all" });
823+
assert.isAbove(listed.providers.length, 0);
824+
assert.isAbove(warnings.length, 0);
825+
warnings.length = 0;
826+
const summary = yield* service.summary(
827+
{
828+
projectId: "p1" as ProjectId,
829+
host: "github.com",
830+
repository: "other/repo",
831+
number: 42,
832+
},
833+
{ recoverTransientFailure: false },
834+
);
835+
assert.strictEqual(summary.repository, "other/repo");
836+
assert.isAbove(warnings.length, 0);
837+
838+
// No checkout on the requested host exercises the direct-link fallback read.
839+
const linked = yield* makeService({
840+
settingsService,
841+
projects: [project({ id: "inbox", title: "Inbox", workspaceRoot: "/inbox" })],
842+
providers: [
843+
fakeProvider(SourceControlProviderKind.make("github"), {
844+
getChangeRequest: ({ number }) =>
845+
Effect.succeed({ ...hostedChangeRequest("PR body"), number }),
846+
}),
847+
],
848+
});
849+
warnings.length = 0;
850+
const linkedSummary = yield* linked.summary(
851+
{
852+
projectId: "inbox" as ProjectId,
853+
host: "github.com",
854+
repository: "team/repo",
855+
number: 42,
856+
},
857+
{ recoverTransientFailure: false },
858+
);
859+
assert.strictEqual(linkedSummary.repository, "team/repo");
860+
assert.isAtLeast(warnings.length, 2);
861+
}),
862+
),
863+
);
864+
803865
function makeService(input: {
804866
readonly settings?: ServerSettings;
805867
readonly settingsService?: ServerSettingsService.ServerSettingsService["Service"];

‎apps/server/src/pullRequest/PullRequestService.ts‎

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ import {
8484
} from "@t3tools/shared/sourceControl";
8585

8686
import * as ProjectService from "../project/ProjectService.ts";
87+
import { readHostOverrides } from "@t3tools/source-control-core/server/SourceControlHost";
8788
import * as ServerSettings from "../serverSettings.ts";
8889
import { subscribeHostOverrideChanges } from "../sourceControl/hostOverrideChanges.ts";
8990
import * as PullRequestFilesViewed from "../persistence/PullRequestFilesViewed.ts";
@@ -719,16 +720,8 @@ export const make = Effect.gen(function* () {
719720
),
720721
),
721722
Effect.flatMap((projects) =>
722-
serverSettings.getSettings.pipe(
723-
Effect.mapError(
724-
(cause) =>
725-
new PullRequestOperationError({
726-
operation: "resolveProvider",
727-
detail: "The source control host mappings could not be read.",
728-
cause,
729-
}),
730-
),
731-
Effect.flatMap(({ sourceControlHostOverrides }) =>
723+
readHostOverrides(serverSettings.getSettings).pipe(
724+
Effect.flatMap((sourceControlHostOverrides) =>
732725
refineUnknownProjectKinds(projects, filter, sourceControlHostOverrides).pipe(
733726
Effect.map((refinedProviders) => ({
734727
refinedProviders,
@@ -878,33 +871,15 @@ export const make = Effect.gen(function* () {
878871
onHost.find((candidate) => candidate.repositoryKey === null);
879872
if (route === undefined) {
880873
return Effect.gen(function* () {
881-
const settings = yield* serverSettings.getSettings.pipe(
882-
Effect.mapError(
883-
(cause) =>
884-
new PullRequestOperationError({
885-
operation: "resolveProvider",
886-
detail: "The source control host mappings could not be read.",
887-
cause,
888-
}),
889-
),
890-
);
874+
const overrides = yield* readHostOverrides(serverSettings.getSettings);
891875
const remoteUrl = `https://${host}/${repository}.git`;
892876
const provider =
893877
["github.com", "bitbucket.org", "codeberg.org"].includes(host) ||
894-
sourceControlHostOverrideForRemoteUrl(
895-
remoteUrl,
896-
settings.sourceControlHostOverrides,
897-
) !== undefined
898-
? detectSourceControlProviderFromRemoteUrl(
899-
remoteUrl,
900-
settings.sourceControlHostOverrides,
901-
)
878+
sourceControlHostOverrideForRemoteUrl(remoteUrl, overrides) !== undefined
879+
? detectSourceControlProviderFromRemoteUrl(remoteUrl, overrides)
902880
: null;
903881
const baseUrl =
904-
sourceControlHostOverrideForRemoteUrl(
905-
remoteUrl,
906-
settings.sourceControlHostOverrides,
907-
)?.baseUrl === undefined
882+
sourceControlHostOverrideForRemoteUrl(remoteUrl, overrides)?.baseUrl === undefined
908883
? undefined
909884
: provider?.baseUrl;
910885
const normalizedRepository = repositoryWithoutMount(repository, baseUrl);

‎apps/server/src/sourceControl/BitbucketApi.test.ts‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { HttpClient, HttpClientError, HttpClientRequest, HttpClientResponse } fr
1414

1515
import { GitCommandError } from "@t3tools/contracts";
1616
import * as BitbucketApi from "@t3tools/source-control-bitbucket/server/BitbucketApi";
17+
import { withHostOverrideSettingsFailure } from "../testUtils/hostOverrideSettingsFailure.ts";
1718
import * as ServerSettings from "../serverSettings.ts";
1819
import * as GitVcsDriver from "../vcs/GitVcsDriver.ts";
1920
import * as VcsDriverRegistry from "../vcs/VcsDriverRegistry.ts";
@@ -62,6 +63,7 @@ const repositoryJson = {
6263
};
6364

6465
function makeLayer(input: {
66+
readonly settingsService?: ServerSettings.ServerSettingsService["Service"];
6567
readonly response: (request: HttpClientRequest.HttpClientRequest) => Response;
6668
readonly requestFailure?: (
6769
request: HttpClientRequest.HttpClientRequest,
@@ -171,13 +173,38 @@ function makeLayer(input: {
171173
}),
172174
),
173175
),
174-
Layer.provideMerge(ServerSettings.layerTest()),
176+
Layer.provideMerge(
177+
input.settingsService
178+
? Layer.succeed(ServerSettings.ServerSettingsService, input.settingsService)
179+
: ServerSettings.layerTest(),
180+
),
175181
Layer.provideMerge(NodeServices.layer),
176182
);
177183

178184
return { execute, git: gitMock, resolve, listRemotes: driver.listRemotes, layer };
179185
}
180186

187+
it.effect(
188+
"uses hostname heuristics and warns for fallback remote discovery when settings fail",
189+
() =>
190+
withHostOverrideSettingsFailure((settingsService) => {
191+
const { layer, execute } = makeLayer({
192+
settingsService,
193+
response: (request) =>
194+
Response.json(request.url.endsWith("/branching-model") ? {} : repositoryJson),
195+
});
196+
return Effect.gen(function* () {
197+
const bitbucket = yield* BitbucketApi.BitbucketApi;
198+
assert.strictEqual(yield* bitbucket.getDefaultBranch({ cwd: "/repo" }), "main");
199+
assert.isTrue(
200+
execute.mock.calls.every(([request]) =>
201+
request.url.startsWith("https://api.test.local/2.0/repositories/pingdotgg/t3code"),
202+
),
203+
);
204+
}).pipe(Effect.provide(layer));
205+
}),
206+
);
207+
181208
it.effect("parses pull request responses from the Bitbucket REST API", () => {
182209
const { execute, layer } = makeLayer({
183210
response: () =>

‎apps/server/src/sourceControl/SourceControlProviderRegistry.test.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import {
2121
VcsRepositoryDetectionError,
2222
} from "@t3tools/contracts";
2323

24+
import { withHostOverrideSettingsFailure } from "../testUtils/hostOverrideSettingsFailure.ts";
2425
import * as ServerSettings from "../serverSettings.ts";
2526
import * as ServerConfig from "../config.ts";
2627
import type * as VcsDriver from "../vcs/VcsDriver.ts";
@@ -171,6 +172,19 @@ function makeRegistry(input: {
171172
);
172173
}
173174

175+
it.effect("uses hostname heuristics and warns when settings fail", () =>
176+
withHostOverrideSettingsFailure((settings) =>
177+
Effect.gen(function* () {
178+
const registry = yield* makeRegistry({
179+
remotes: [{ name: "origin", url: "[email protected]:team/repo.git" }],
180+
settings,
181+
});
182+
const provider = yield* registry.resolve({ cwd: "/repo" });
183+
assert.strictEqual(provider.kind, "github");
184+
}),
185+
),
186+
);
187+
174188
it.effect("routes GitHub remotes to the GitHub provider", () =>
175189
Effect.gen(function* () {
176190
const registry = yield* makeRegistry({

‎apps/server/src/sourceControl/SourceControlProviderRegistry.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import {
3030
import * as SourceControlHost from "@t3tools/source-control-core/server/SourceControlHost";
3131

3232
import * as ServerConfig from "../config.ts";
33+
import { readHostOverrides } from "@t3tools/source-control-core/server/SourceControlHost";
3334
import * as ServerSettings from "../serverSettings.ts";
3435
import * as VcsDriverRegistry from "../vcs/VcsDriverRegistry.ts";
3536

@@ -260,7 +261,7 @@ export const makeWithProviders = Effect.fn("makeSourceControlProviderRegistryWit
260261
},
261262
);
262263
const settingsChanges = yield* serverSettings.subscribeChanges;
263-
let hostOverrides = (yield* serverSettings.getSettings).sourceControlHostOverrides;
264+
let hostOverrides = yield* readHostOverrides(serverSettings.getSettings);
264265

265266
const refineContext = (
266267
cwd: string,

0 commit comments

Comments
 (0)