Add remote repository publish and discovery support (#2482)

Julius Marminge committed 6 months ago

Commit d7969261 parent f7748a033 files · +2502 −157Browse files

Showing the changes to apps/server/src/sourceControl/SourceControlDiscovery.ts (1 of 33 files). Show all

Unified · Split

apps/server/src/sourceControl/SourceControlDiscovery.ts+44−50

 interface DiscoveryProbe {
   readonly label: string;
-  readonly executable: string;
+  readonly executable?: string;
-  readonly versionArgs: ReadonlyArray<string>;
+  readonly versionArgs?: ReadonlyArray<string>;
   readonly implemented: boolean;
   readonly installHint: string;
 }
 type VcsProbe = DiscoveryProbe & {
   readonly kind: VcsDriverKind;
+  readonly executable: string;
+  readonly versionArgs: ReadonlyArray<string>;
 };
 type ProviderProbe = DiscoveryProbe & {
   readonly kind: SourceControlProviderKind;
-  readonly authArgs: ReadonlyArray<string>;
+  readonly authArgs?: ReadonlyArray<string>;
-  readonly parseAuth: (input: AuthProbeInput) => SourceControlProviderAuth;
+  readonly parseAuth?: (input: AuthProbeInput) => SourceControlProviderAuth;
 };
 interface AuthProbeInput {
 interface DiscoveryProbeResult<Kind extends string> {
   readonly kind: Kind;
   readonly label: string;
-  readonly executable: string;
+  readonly executable?: string;
   readonly implemented: boolean;
   readonly status: "available" | "missing";
   readonly version: Option.Option<string>;
   {
     kind: "bitbucket",
     label: "Bitbucket",
-    executable: "bb",
-    versionArgs: ["--version"],
-    authArgs: ["auth", "status"],
-    parseAuth: parseBitbucketAuth,
     implemented: false,
-    installHint: "Install a Bitbucket CLI (`bb`) and authenticate it for your Bitbucket workspace.",
+    installHint: "Bitbucket provider support is not available yet.",
   },
 ];
   });
 }
-function parseBitbucketAuth(input: AuthProbeInput): SourceControlProviderAuth {
-  const output = combinedAuthOutput(input);
-  const account = matchFirst(output, [
-    /Logged in to .* as\s+([^\s(]+)/iu,
-    /Logged in as\s+([^\s(]+)/iu,
-    /account:\s*([^\s(]+)/iu,
-    /user:\s*([^\s(]+)/iu,
-    /username:\s*([^\s(]+)/iu,
-  ]);
-  const host = parseCliHost(output) ?? "bitbucket.org";
-  if (input.exitCode !== 0) {
-    return providerAuth({
-      status: "unauthenticated",
-      host,
-      detail:
-        firstSafeAuthLine(output) ?? "Authenticate the Bitbucket CLI before enabling Bitbucket.",
-    });
-  }
-  if (account) {
-    return providerAuth({ status: "authenticated", account, host });
-  }
-  return providerAuth({
-    status: "unknown",
-    host,
-    detail: firstSafeAuthLine(output) ?? "Bitbucket CLI auth status could not be parsed.",
-  });
-}
 export interface SourceControlDiscoveryShape {
   readonly discover: Effect.Effect<SourceControlDiscoveryResult>;
 }
     const probe = <Kind extends VcsDriverKind | SourceControlProviderKind>(
       input: DiscoveryProbe & { readonly kind: Kind },
-    ): Effect.Effect<DiscoveryProbeResult<Kind>> =>
+    ): Effect.Effect<DiscoveryProbeResult<Kind>> => {
-      process
+      const executable = input.executable;
+      const versionArgs = input.versionArgs;
+      if (!executable || !versionArgs) {
+        return Effect.succeed({
+          kind: input.kind,
+          label: input.label,
+          implemented: input.implemented,
+          status: "missing" as const,
+          version: Option.none<string>(),
+          installHint: input.installHint,
+          detail: Option.some(input.installHint),
+        } satisfies DiscoveryProbeResult<Kind>);
+      }
+      return process
         .run({
           operation: "source-control.discovery.probe",
-          command: input.executable,
+          command: executable,
-          args: input.versionArgs,
+          args: versionArgs,
           cwd: config.cwd,
           timeoutMs: 5_000,
           maxOutputBytes: 8_000,
               ({
                 kind: input.kind,
                 label: input.label,
-                executable: input.executable,
+                executable,
                 implemented: input.implemented,
                 status: "available" as const,
                 version: Option.orElse(firstNonEmptyLine(result.stdout), () =>
             Effect.succeed({
               kind: input.kind,
               label: input.label,
-              executable: input.executable,
+              executable,
               implemented: input.implemented,
               status: "missing" as const,
               version: Option.none<string>(),
             } satisfies DiscoveryProbeResult<Kind>),
           ),
         );
+    };
     const probeProvider = (input: ProviderProbe) =>
       probe(input).pipe(
         Effect.flatMap((item) => {
+          const executable = input.executable;
+          const authArgs = input.authArgs;
+          const parseAuth = input.parseAuth;
+          if (!executable || !authArgs || !parseAuth) {
+            return Effect.succeed({
+              ...item,
+              auth: unknownAuth(input.installHint),
+            } satisfies SourceControlProviderDiscoveryItem);
+          }
           if (item.status !== "available") {
             return Effect.succeed({
               ...item,
           return process
             .run({
               operation: "source-control.discovery.auth",
-              command: input.executable,
+              command: executable,
-              args: input.authArgs,
+              args: authArgs,
               cwd: config.cwd,
               allowNonZeroExit: true,
               timeoutMs: 5_000,
                 (result) =>
                   ({
                     ...item,
-                    auth: input.parseAuth(result),
+                    auth: parseAuth(result),
                   }) satisfies SourceControlProviderDiscoveryItem,
               ),
               Effect.catch((cause) =>