From be43556d661f82c23f72def705bbae66232f891e Mon Sep 17 00:00:00 2001 From: Huiwen Date: Fri, 27 Sep 2024 15:56:40 +0000 Subject: [PATCH] Fix clone url --- .../server/src/azure-devops/azure-api.ts | 12 ++++----- .../azure-devops/azure-context-parser.spec.ts | 26 +++++++++---------- .../src/azure-devops/azure-converter.ts | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/components/server/src/azure-devops/azure-api.ts b/components/server/src/azure-devops/azure-api.ts index ae6b7c6b96c440..469d1f3d6bfefb 100644 --- a/components/server/src/azure-devops/azure-api.ts +++ b/components/server/src/azure-devops/azure-api.ts @@ -124,7 +124,7 @@ export class AzureDevOpsApi { return content; } catch (err) { if (err instanceof AzureReadableStreamError) { - if (err.type === "not_found") { + if (err.statusCode === 404) { return undefined; } throw err; @@ -262,7 +262,7 @@ export class AzureDevOpsApi { } export class AzureReadableStreamError extends Error { - constructor(message: string, public type: "not_found" | "unknown" = "unknown") { + constructor(message: string, public statusCode?: number) { super(message); } @@ -272,10 +272,10 @@ export class AzureReadableStreamError extends Error { static tryCreate(stream: NodeJS.ReadableStream): AzureReadableStreamError | undefined { if (AzureReadableStreamError.isIncomingMessage(stream)) { - return new AzureReadableStreamError( - `HTTP ${stream.statusCode} ${stream.statusMessage}`, - stream.statusCode === 404 ? "not_found" : "unknown", - ); + if (stream.statusCode === 200) { + return; + } + return new AzureReadableStreamError(`HTTP ${stream.statusCode} ${stream.statusMessage}`, stream.statusCode); } } } diff --git a/components/server/src/azure-devops/azure-context-parser.spec.ts b/components/server/src/azure-devops/azure-context-parser.spec.ts index a48716b12cbdcb..4913ece1b5a892 100644 --- a/components/server/src/azure-devops/azure-context-parser.spec.ts +++ b/components/server/src/azure-devops/azure-context-parser.spec.ts @@ -40,7 +40,7 @@ class TestAzureDevOpsContextParser { host: "dev.azure.com", owner: "services-azure/empty-project", name: "empty-project", - cloneUrl: "https://services-azure@dev.azure.com/services-azure/empty-project/_git/empty-project", + cloneUrl: "https://dev.azure.com/services-azure/empty-project/_git/empty-project", description: "main", webUrl: "https://dev.azure.com/services-azure/empty-project/_git/empty-project", defaultBranch: "main", @@ -59,7 +59,7 @@ class TestAzureDevOpsContextParser { host: "dev.azure.com", owner: "services-azure/empty-project", name: "empty-project", - cloneUrl: "https://services-azure@dev.azure.com/services-azure/empty-project/_git/empty-project", + cloneUrl: "https://dev.azure.com/services-azure/empty-project/_git/empty-project", description: "main", webUrl: "https://dev.azure.com/services-azure/empty-project/_git/empty-project", defaultBranch: "main", @@ -82,7 +82,7 @@ class TestAzureDevOpsContextParser { host: "dev.azure.com", owner: "services-azure/test-project", name: "repo2", - cloneUrl: "https://services-azure@dev.azure.com/services-azure/test-project/_git/repo2", + cloneUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2", description: "main", webUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2", defaultBranch: "main", @@ -106,7 +106,7 @@ class TestAzureDevOpsContextParser { host: "dev.azure.com", owner: "services-azure/test-project", name: "repo2", - cloneUrl: "https://services-azure@dev.azure.com/services-azure/test-project/_git/repo2", + cloneUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2", description: "main", webUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2", defaultBranch: "main", @@ -119,7 +119,7 @@ class TestAzureDevOpsContextParser { host: "dev.azure.com", owner: "services-azure/test-project", name: "repo2", - cloneUrl: "https://services-azure@dev.azure.com/services-azure/test-project/_git/repo2", + cloneUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2", description: "main", webUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2", defaultBranch: "main", @@ -144,7 +144,7 @@ class TestAzureDevOpsContextParser { host: "dev.azure.com", owner: "services-azure/test-project", name: "repo2", - cloneUrl: "https://services-azure@dev.azure.com/services-azure/test-project/_git/repo2", + cloneUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2", description: "main", webUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2", defaultBranch: "main", @@ -167,7 +167,7 @@ class TestAzureDevOpsContextParser { host: "dev.azure.com", owner: "services-azure/test-project", name: "repo2", - cloneUrl: "https://services-azure@dev.azure.com/services-azure/test-project/_git/repo2", + cloneUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2", description: "main", webUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2", defaultBranch: "main", @@ -190,7 +190,7 @@ class TestAzureDevOpsContextParser { host: "dev.azure.com", owner: "services-azure/test-project", name: "repo2-fork", - cloneUrl: "https://services-azure@dev.azure.com/services-azure/test-project/_git/repo2-fork", + cloneUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2-fork", description: "main", webUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2-fork", defaultBranch: "main", @@ -215,7 +215,7 @@ class TestAzureDevOpsContextParser { host: "dev.azure.com", owner: "services-azure/test-project", name: "repo2-fork", - cloneUrl: "https://services-azure@dev.azure.com/services-azure/test-project/_git/repo2-fork", + cloneUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2-fork", description: "main", webUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2-fork", defaultBranch: "main", @@ -238,7 +238,7 @@ class TestAzureDevOpsContextParser { host: "dev.azure.com", owner: "services-azure/test-project", name: "repo2-fork", - cloneUrl: "https://services-azure@dev.azure.com/services-azure/test-project/_git/repo2-fork", + cloneUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2-fork", description: "main", webUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2-fork", defaultBranch: "main", @@ -267,7 +267,7 @@ class TestAzureDevOpsContextParser { host: "dev.azure.com", owner: "services-azure/test-project", name: "repo2-fork", - cloneUrl: "https://services-azure@dev.azure.com/services-azure/test-project/_git/repo2-fork", + cloneUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2-fork", description: "main", webUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2-fork", defaultBranch: "main", @@ -291,7 +291,7 @@ class TestAzureDevOpsContextParser { host: "dev.azure.com", owner: "services-azure/test-project", name: "repo2-fork", - cloneUrl: "https://services-azure@dev.azure.com/services-azure/test-project/_git/repo2-fork", + cloneUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2-fork", description: "main", webUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2-fork", defaultBranch: "main", @@ -315,7 +315,7 @@ class TestAzureDevOpsContextParser { host: "dev.azure.com", owner: "services-azure/test-project", name: "repo2-fork", - cloneUrl: "https://services-azure@dev.azure.com/services-azure/test-project/_git/repo2-fork", + cloneUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2-fork", description: "main", webUrl: "https://dev.azure.com/services-azure/test-project/_git/repo2-fork", defaultBranch: "main", diff --git a/components/server/src/azure-devops/azure-converter.ts b/components/server/src/azure-devops/azure-converter.ts index 30b2187afb6b5b..5fca027ffc43bd 100644 --- a/components/server/src/azure-devops/azure-converter.ts +++ b/components/server/src/azure-devops/azure-converter.ts @@ -25,7 +25,7 @@ export function toRepository(host: string, d: GitRepository, azOrgId?: string): host, owner, name, - cloneUrl: d.remoteUrl!, + cloneUrl: d.webUrl!, description: branchName, webUrl: d.webUrl, defaultBranch: branchName,