Associates a Cloud GitHub Enterprise provider with remote by its domain

(#3901, #3922)
gitkraken · Jan 13, 2025 · d96fa7f · d96fa7f
1 parent 9ea6153
commit d96fa7f
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 9 deletions.
diff --git a/src/env/node/git/sub-providers/remotes.ts b/src/env/node/git/sub-providers/remotes.ts
@@ -38,8 +38,11 @@ export class RemotesGitSubProvider extends RemotesGitProviderBase implements Git
 		let remotesPromise = this.cache.remotes?.get(repoPath);
 		if (remotesPromise == null) {
 			async function load(this: RemotesGitSubProvider): Promise<GitRemote[]> {
+				const ci = await this.container.cloudIntegrations;
+				const connections = await ci?.getConnections();
 				const providers = loadRemoteProviders(
 					configuration.get('remotes', this.container.git.getRepository(repoPath!)?.folder?.uri ?? null),
+					connections,
 				);
 
 				try {
@@ -48,7 +51,7 @@ export class RemotesGitSubProvider extends RemotesGitProviderBase implements Git
 						this.container,
 						data,
 						repoPath!,
-						getRemoteProviderMatcher(this.container, providers),
+						await getRemoteProviderMatcher(this.container, providers),
 					);
 					return remotes;
 				} catch (ex) {

diff --git a/src/git/parsers/remoteParser.ts b/src/git/parsers/remoteParser.ts
@@ -6,11 +6,13 @@ import type { getRemoteProviderMatcher } from '../remotes/remoteProviders';
 
 const remoteRegex = /^(.*)\t(.*)\s\((.*)\)$/gm;
 
+type PromiseType<T> = T extends Promise<infer U> ? U : T;
+
 export function parseGitRemotes(
 	container: Container,
 	data: string,
 	repoPath: string,
-	remoteProviderMatcher: ReturnType<typeof getRemoteProviderMatcher>,
+	remoteProviderMatcher: PromiseType<ReturnType<typeof getRemoteProviderMatcher>>,
 ): GitRemote[] {
 	using sw = maybeStopWatch(`Git.parseRemotes(${repoPath})`, { log: false, logLevel: 'debug' });
 	if (!data) return [];

diff --git a/src/git/remotes/remoteProviders.ts b/src/git/remotes/remoteProviders.ts
@@ -1,5 +1,8 @@
 import type { RemotesConfig } from '../../config';
+import { SelfHostedIntegrationId } from '../../constants.integrations';
 import type { Container } from '../../container';
+import type { CloudIntegrationConnection } from '../../plus/integrations/authentication/models';
+import { toIntegrationId } from '../../plus/integrations/authentication/models';
 import { Logger } from '../../system/logger';
 import { configuration } from '../../system/vscode/configuration';
 import { AzureDevOpsRemote } from './azure-devops';
@@ -73,7 +76,10 @@ const builtInProviders: RemoteProviders = [
 	},
 ];
 
-export function loadRemoteProviders(cfg: RemotesConfig[] | null | undefined): RemoteProviders {
+export function loadRemoteProviders(
+	cfg: RemotesConfig[] | null | undefined,
+	connectedIntegrations: CloudIntegrationConnection[] | undefined,
+): RemoteProviders {
 	const providers: RemoteProviders = [];
 
 	if (cfg?.length) {
@@ -97,6 +103,29 @@ export function loadRemoteProviders(cfg: RemotesConfig[] | null | undefined): Re
 		}
 	}
 
+	if (connectedIntegrations?.length) {
+		for (const ci of connectedIntegrations) {
+			if (toIntegrationId[ci.provider] === SelfHostedIntegrationId.CloudGitHubEnterprise) {
+				const matcher = new URL(ci.domain).host.toLocaleLowerCase();
+				const providerCreator = (_container: Container, domain: string, path: string) =>
+					new GitHubRemote(domain, path);
+				const provider = {
+					custom: false,
+					matcher: matcher,
+					creator: providerCreator,
+				};
+
+				const indexOfCustomDuplication: number = providers.findIndex(p => p.matcher === matcher);
+
+				if (indexOfCustomDuplication !== -1) {
+					providers[indexOfCustomDuplication] = provider;
+				} else {
+					providers.push(provider);
+				}
+			}
+		}
+	}
+
 	providers.push(...builtInProviders);
 
 	return providers;
@@ -136,12 +165,14 @@ function getCustomProviderCreator(cfg: RemotesConfig) {
 	}
 }
 
-export function getRemoteProviderMatcher(
+export async function getRemoteProviderMatcher(
 	container: Container,
 	providers?: RemoteProviders,
-): (url: string, domain: string, path: string) => RemoteProvider | undefined {
+): Promise<(url: string, domain: string, path: string) => RemoteProvider | undefined> {
 	if (providers == null) {
-		providers = loadRemoteProviders(configuration.get('remotes', null));
+		const ci = await container.cloudIntegrations;
+		const c = await ci?.getConnections();
+		providers = loadRemoteProviders(configuration.get('remotes', null), c);
 	}
 
 	return (url: string, domain: string, path: string) =>

diff --git a/src/plus/drafts/draftsService.ts b/src/plus/drafts/draftsService.ts
@@ -729,7 +729,7 @@ export class DraftService implements Disposable {
 		} else if (data.provider?.repoName != null) {
 			name = data.provider.repoName;
 		} else if (data.remote?.url != null && data.remote?.domain != null && data.remote?.path != null) {
-			const matcher = getRemoteProviderMatcher(this.container);
+			const matcher = await getRemoteProviderMatcher(this.container);
 			const provider = matcher(data.remote.url, data.remote.domain, data.remote.path);
 			name = provider?.repoName ?? data.remote.path;
 		} else {

diff --git a/src/plus/integrations/providers/github/sub-providers/remotes.ts b/src/plus/integrations/providers/github/sub-providers/remotes.ts
@@ -14,7 +14,7 @@ export class RemotesGitSubProvider extends RemotesGitProviderBase {
 	): Promise<GitRemote[]> {
 		if (repoPath == null) return [];
 
-		const providers = loadRemoteProviders(configuration.get('remotes', null));
+		const providers = loadRemoteProviders(configuration.get('remotes', null), undefined);
 
 		const uri = Uri.parse(repoPath, true);
 		const [, owner, repo] = uri.path.split('/', 3);
@@ -31,7 +31,7 @@ export class RemotesGitSubProvider extends RemotesGitProviderBase {
 				'https',
 				domain,
 				path,
-				getRemoteProviderMatcher(this.container, providers)(url, domain, path),
+				(await getRemoteProviderMatcher(this.container, providers))(url, domain, path),
 				[
 					{ type: 'fetch', url: url },
 					{ type: 'push', url: url },