Skip to content

Commit 72c6bba

Browse files
committed
fix(source-control): apply host mappings to repository identities
1 parent 41b1795 commit 72c6bba

3 files changed

Lines changed: 193 additions & 83 deletions

File tree

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

Lines changed: 125 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ import { detectSourceControlProviderFromRemoteUrl } from "@t3tools/shared/source
44
import * as Deferred from "effect/Deferred";
55
import * as Effect from "effect/Effect";
66
import * as Layer from "effect/Layer";
7+
import * as FileSystem from "effect/FileSystem";
8+
import * as ForgejoCli from "@t3tools/source-control-forgejo/server/ForgejoCli";
9+
import * as ForgejoSourceControlProvider from "@t3tools/source-control-forgejo/server/ForgejoSourceControlProvider";
10+
import * as TestSourceControlHost from "@t3tools/source-control-testing/TestSourceControlHost";
711
import * as Logger from "effect/Logger";
812
import * as PubSub from "effect/PubSub";
913
import * as Ref from "effect/Ref";
@@ -486,85 +490,127 @@ it.effect(
486490
}),
487491
);
488492

489-
it.effect("host mapping changes clear both identity caches and preserve unrelated enrichment", () =>
490-
Effect.gen(function* () {
491-
const settings = yield* makeSettingsChanges;
492-
let reads = 0;
493-
let faviconReads = 0;
494-
const initial = {
495-
...DEFAULT_SERVER_SETTINGS,
496-
sourceControlHostOverrides: {
497-
"code.example.test": { kind: "forgejo" as const, baseUrl: "https://code.example.test/Old" },
498-
},
499-
};
500-
yield* settings.publish(initial);
501-
yield* Effect.scoped(
502-
Effect.gen(function* () {
503-
const resolver = yield* RepositoryIdentityResolver.make({
504-
refine: (identity) =>
505-
settings.service.getSettings.pipe(
506-
Effect.map((value) => ({
507-
...identity,
508-
webUrl: `${detectSourceControlProviderFromRemoteUrl(identity.locator.remoteUrl, value.sourceControlHostOverrides)!.baseUrl}/team/repo`,
509-
})),
493+
it.effect.each(["gitlab", "github", "bitbucket", "forgejo", "azure-devops", "gitcafe"] as const)(
494+
"host mapping changes to %s clear both identity caches and preserve unrelated enrichment",
495+
(kind) =>
496+
Effect.gen(function* () {
497+
const settings = yield* makeSettingsChanges;
498+
let reads = 0;
499+
let faviconReads = 0;
500+
const initial = {
501+
...DEFAULT_SERVER_SETTINGS,
502+
sourceControlHostOverrides: {
503+
"code.example.test": {
504+
kind: "forgejo" as const,
505+
baseUrl: "https://code.example.test/Old",
506+
},
507+
},
508+
};
509+
yield* settings.publish(initial);
510+
yield* Effect.scoped(
511+
Effect.gen(function* () {
512+
const forgejo = yield* ForgejoSourceControlProvider.make.pipe(
513+
Effect.provide(
514+
Layer.mergeAll(
515+
Layer.succeed(FileSystem.FileSystem, FileSystem.makeNoop({})),
516+
TestSourceControlHost.layer(),
517+
Layer.mock(ForgejoCli.ForgejoCli)({}),
518+
),
510519
),
511-
}).pipe(
512-
Effect.provideService(ServerSettings.ServerSettingsService, settings.service),
513-
Effect.provideService(ProcessRunner.ProcessRunner, {
514-
run: (input) =>
515-
Effect.sync(() => {
516-
reads++;
517-
return {
518-
stdout: input.args.includes("rev-parse")
519-
? "/repo\n"
520-
: "origin\[email protected]:team/repo.git (fetch)\n",
521-
stderr: "",
522-
code: ChildProcessSpawner.ExitCode(0),
523-
timedOut: false,
524-
stdoutTruncated: false,
525-
stderrTruncated: false,
526-
stdoutInvalidUtf8: false,
527-
stderrInvalidUtf8: false,
528-
};
529-
}),
530-
}),
531-
);
532-
const service = yield* ProjectEnrichment.make().pipe(
533-
Effect.provideService(ServerSettings.ServerSettingsService, settings.service),
534-
Effect.provideService(RepositoryIdentityResolver.RepositoryIdentityResolver, resolver),
535-
Effect.provideService(ProjectFaviconResolver.ProjectFaviconResolver, {
536-
resolvePath: () =>
537-
Effect.sync(() => {
538-
faviconReads++;
539-
return "/repo/favicon.svg";
520+
);
521+
const resolver = yield* RepositoryIdentityResolver.make({
522+
refine: (identity) =>
523+
forgejo.refineRepositoryIdentity!({
524+
identity,
525+
resolveContext: () =>
526+
settings.service.getSettings.pipe(
527+
Effect.map((value) => {
528+
const provider = detectSourceControlProviderFromRemoteUrl(
529+
identity.locator.remoteUrl,
530+
value.sourceControlHostOverrides,
531+
);
532+
return provider === null
533+
? null
534+
: {
535+
provider,
536+
remoteName: identity.locator.remoteName,
537+
remoteUrl: identity.locator.remoteUrl,
538+
};
539+
}),
540+
),
540541
}),
541-
}),
542-
);
543-
const changes = yield* service.subscribeChanges;
544-
yield* service.request("/repo");
545-
const first = (yield* PubSub.take(changes)).enrichment.repositoryIdentity;
546-
yield* Effect.yieldNow;
547-
assert.strictEqual(first?.webUrl, "https://code.example.test/Old/team/repo");
548-
const warmReads = reads;
549-
yield* settings.publish({ ...initial, worktreesDirectory: "/unrelated" });
550-
assert.strictEqual((yield* service.peek("/repo")).repositoryIdentity, first);
551-
assert.strictEqual(yield* resolver.resolve("/repo"), first);
552-
assert.strictEqual(reads, warmReads);
553-
yield* settings.publish({
554-
...initial,
555-
sourceControlHostOverrides: {
556-
"code.example.test": { kind: "forgejo", baseUrl: "https://code.example.test/New" },
557-
},
558-
});
559-
assert.isNull((yield* service.peek("/repo")).repositoryIdentity);
560-
yield* service.request("/repo");
561-
const next = (yield* PubSub.take(changes)).enrichment.repositoryIdentity;
562-
assert.strictEqual(next?.webUrl, "https://code.example.test/New/team/repo");
563-
assert.strictEqual(reads, warmReads + 1);
564-
assert.strictEqual(faviconReads, 1);
565-
assert.strictEqual(settings.subscribers(), 2);
566-
}),
567-
);
568-
assert.strictEqual(settings.subscribers(), 0);
569-
}),
542+
}).pipe(
543+
Effect.provideService(ServerSettings.ServerSettingsService, settings.service),
544+
Effect.provideService(ProcessRunner.ProcessRunner, {
545+
run: (input) =>
546+
Effect.sync(() => {
547+
reads++;
548+
return {
549+
stdout: input.args.includes("rev-parse")
550+
? "/repo\n"
551+
: "origin\[email protected]:team/repo.git (fetch)\n",
552+
stderr: "",
553+
code: ChildProcessSpawner.ExitCode(0),
554+
timedOut: false,
555+
stdoutTruncated: false,
556+
stderrTruncated: false,
557+
stdoutInvalidUtf8: false,
558+
stderrInvalidUtf8: false,
559+
};
560+
}),
561+
}),
562+
);
563+
const service = yield* ProjectEnrichment.make().pipe(
564+
Effect.provideService(ServerSettings.ServerSettingsService, settings.service),
565+
Effect.provideService(RepositoryIdentityResolver.RepositoryIdentityResolver, resolver),
566+
Effect.provideService(ProjectFaviconResolver.ProjectFaviconResolver, {
567+
resolvePath: () =>
568+
Effect.sync(() => {
569+
faviconReads++;
570+
return "/repo/favicon.svg";
571+
}),
572+
}),
573+
);
574+
const changes = yield* service.subscribeChanges;
575+
yield* service.request("/repo");
576+
const first = (yield* PubSub.take(changes)).enrichment.repositoryIdentity;
577+
yield* Effect.yieldNow;
578+
assert.strictEqual(first?.provider, "forgejo");
579+
assert.strictEqual(first?.webUrl, "https://code.example.test/Old/team/repo");
580+
const warmReads = reads;
581+
yield* settings.publish({ ...initial, worktreesDirectory: "/unrelated" });
582+
assert.strictEqual((yield* service.peek("/repo")).repositoryIdentity, first);
583+
assert.strictEqual(yield* resolver.resolve("/repo"), first);
584+
assert.strictEqual(reads, warmReads);
585+
yield* settings.publish({
586+
...initial,
587+
sourceControlHostOverrides: {
588+
"code.example.test": { kind, baseUrl: "https://code.example.test/New" },
589+
},
590+
});
591+
assert.isNull((yield* service.peek("/repo")).repositoryIdentity);
592+
yield* service.request("/repo");
593+
const next = (yield* PubSub.take(changes)).enrichment.repositoryIdentity;
594+
yield* Effect.yieldNow;
595+
assert.strictEqual(next?.provider, kind);
596+
assert.strictEqual(
597+
next?.webUrl,
598+
kind === "forgejo" ? "https://code.example.test/New/team/repo" : undefined,
599+
);
600+
assert.strictEqual(yield* resolver.resolve("/repo"), next);
601+
assert.strictEqual(reads, warmReads + 1);
602+
yield* settings.publish({ ...initial, sourceControlHostOverrides: {} });
603+
assert.isNull((yield* service.peek("/repo")).repositoryIdentity);
604+
yield* service.request("/repo");
605+
const unmapped = (yield* PubSub.take(changes)).enrichment.repositoryIdentity;
606+
assert.isDefined(unmapped);
607+
assert.strictEqual(unmapped?.provider, "unknown");
608+
assert.strictEqual(unmapped?.webUrl, undefined);
609+
assert.strictEqual(reads, warmReads + 2);
610+
assert.strictEqual(faviconReads, 1);
611+
assert.strictEqual(settings.subscribers(), 2);
612+
}),
613+
);
614+
assert.strictEqual(settings.subscribers(), 0);
615+
}),
570616
);

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,48 @@ it.layer(NodeServices.layer)("RepositoryIdentityResolverLive", (it) => {
176176
}).pipe(Effect.provide(Layer.merge(TestClock.layer(), layerResolver)));
177177
});
178178

179+
it.effect.each([
180+
["code.example.test", "gitlab"],
181+
["code.example.test", "github"],
182+
["code.example.test", "bitbucket"],
183+
["code.example.test", "forgejo"],
184+
["code.example.test", "azure-devops"],
185+
["code.example.test", "gitcafe"],
186+
["gitlab.example.test", "github"],
187+
["github.example.test", "forgejo"],
188+
["code.example.test", undefined],
189+
["gitlab.example.test", undefined],
190+
] as const)("detects the provider with host mapping %j", ([host, kind]) =>
191+
Effect.gen(function* () {
192+
const fileSystem = yield* FileSystem.FileSystem;
193+
const cwd = yield* fileSystem.makeTempDirectoryScoped({
194+
prefix: "t3-repository-identity-host-mapping-test-",
195+
});
196+
const remoteUrl = `git@${host}:team/repo.git`;
197+
yield* git(cwd, ["init"]);
198+
yield* git(cwd, ["remote", "add", "origin", remoteUrl]);
199+
200+
const resolver = yield* RepositoryIdentityResolver.RepositoryIdentityResolver;
201+
const identity = yield* resolver.resolve(cwd);
202+
expect(identity?.provider).toBe(
203+
kind ?? (host === "gitlab.example.test" ? "gitlab" : "unknown"),
204+
);
205+
expect(identity?.canonicalKey).toBe(`${host}/team/repo`);
206+
expect(identity?.locator.remoteUrl).toBe(remoteUrl);
207+
expect(identity?.displayName).toBe("team/repo");
208+
}).pipe(
209+
Effect.provide(
210+
RepositoryIdentityResolver.layer.pipe(
211+
Layer.provide(
212+
ServerSettings.layerTest({
213+
sourceControlHostOverrides: kind === undefined ? {} : { [host]: { kind } },
214+
}),
215+
),
216+
),
217+
),
218+
),
219+
);
220+
179221
it.effect("normalizes equivalent GitHub remotes into a stable repository identity", () =>
180222
Effect.gen(function* () {
181223
const fileSystem = yield* FileSystem.FileSystem;

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

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
import type { RepositoryIdentity, SourceControlProviderError } from "@t3tools/contracts";
1+
import type {
2+
RepositoryIdentity,
3+
SourceControlHostOverrides,
4+
SourceControlProviderError,
5+
} from "@t3tools/contracts";
26
import {
37
detectSourceControlProviderFromGitRemoteUrl,
48
normalizeGitRemoteUrl,
@@ -11,6 +15,7 @@ import * as Exit from "effect/Exit";
1115
import * as Layer from "effect/Layer";
1216

1317
import * as ProcessRunner from "../processRunner.ts";
18+
import * as ServerSettings from "../serverSettings.ts";
1419
import { subscribeHostOverrideChanges } from "../sourceControl/hostOverrideChanges.ts";
1520
import { explicitBareRepositoryEnv } from "../vcs/VcsProcess.ts";
1621
import * as HostProcess from "@t3tools/shared/HostProcess";
@@ -92,9 +97,13 @@ function buildRepositoryIdentity(input: {
9297
readonly remoteUrl: string;
9398
readonly originUrl: string | undefined;
9499
readonly rootPath: string;
100+
readonly hostOverrides: SourceControlHostOverrides;
95101
}): RepositoryIdentity {
96102
const canonicalKey = normalizeGitRemoteUrl(input.remoteUrl);
97-
const sourceControlProvider = detectSourceControlProviderFromGitRemoteUrl(input.remoteUrl);
103+
const sourceControlProvider = detectSourceControlProviderFromGitRemoteUrl(
104+
input.remoteUrl,
105+
input.hostOverrides,
106+
);
98107
const repositoryPath = repositoryPathOf(canonicalKey);
99108
const repositoryPathSegments = repositoryPath.split("/").filter((segment) => segment.length > 0);
100109
const [owner] = repositoryPathSegments;
@@ -144,7 +153,11 @@ const resolveRepositoryIdentityFromCacheKey = Effect.fn(
144153
"RepositoryIdentityResolver.resolveFromCacheKey",
145154
)(function* (
146155
cacheKey: string,
147-
): Effect.fn.Return<RepositoryIdentity | null, never, ProcessRunner.ProcessRunner> {
156+
): Effect.fn.Return<
157+
RepositoryIdentity | null,
158+
never,
159+
ProcessRunner.ProcessRunner | ServerSettings.ServerSettingsService
160+
> {
148161
const processRunner = yield* ProcessRunner.ProcessRunner;
149162
const remoteResult = yield* processRunner
150163
.run({
@@ -158,17 +171,25 @@ const resolveRepositoryIdentityFromCacheKey = Effect.fn(
158171
return null;
159172
}
160173

174+
const settings = yield* ServerSettings.ServerSettingsService;
175+
const hostOverrides = (yield* settings.getSettings.pipe(Effect.orDie)).sourceControlHostOverrides;
161176
const remotes = parseRemoteFetchUrls(remoteResult.value.stdout);
162177
const remote = pickPrimaryRemote(remotes);
163178
return remote
164-
? buildRepositoryIdentity({ ...remote, originUrl: remotes.get("origin"), rootPath: cacheKey })
179+
? buildRepositoryIdentity({
180+
...remote,
181+
originUrl: remotes.get("origin"),
182+
rootPath: cacheKey,
183+
hostOverrides,
184+
})
165185
: null;
166186
});
167187

168188
export const make = Effect.fn("RepositoryIdentityResolver.make")(function* (
169189
options: RepositoryIdentityResolverOptions = {},
170190
) {
171191
const processRunner = yield* ProcessRunner.ProcessRunner;
192+
const settings = yield* ServerSettings.ServerSettingsService;
172193
const cacheCapacity = options.cacheCapacity ?? DEFAULT_REPOSITORY_IDENTITY_CACHE_CAPACITY;
173194
const refine = options.refine ?? Effect.succeed;
174195
const timeToLive = (exit: Exit.Exit<unknown>) =>
@@ -191,6 +212,7 @@ export const make = Effect.fn("RepositoryIdentityResolver.make")(function* (
191212
const repositoryIdentityCache = yield* Cache.makeWith<string, RepositoryIdentity | null>(
192213
(cacheKey) =>
193214
resolveRepositoryIdentityFromCacheKey(cacheKey).pipe(
215+
Effect.provideService(ServerSettings.ServerSettingsService, settings),
194216
Effect.provideService(ProcessRunner.ProcessRunner, processRunner),
195217
Effect.filterOrElse(
196218
(identity): identity is null => identity === null,

0 commit comments

Comments
 (0)