Skip to content

Commit

Permalink
Fix clone url
Browse files Browse the repository at this point in the history
  • Loading branch information
@mustard-mh
mustard-mh committed Sep 27, 2024
1 parent ac749a4 commit be43556
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
12 changes: 6 additions & 6 deletions components/server/src/azure-devops/azure-api.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand All @@ -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);
}
}
}
26 changes: 13 additions & 13 deletions components/server/src/azure-devops/azure-context-parser.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion components/server/src/azure-devops/azure-converter.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit be43556

Please sign in to comment.