Skip to content

Commit ca092a1

Browse files
committed
Use GHEC-DR URL in Actions workflow run URL
1 parent 529bbe3 commit ca092a1

File tree

4 files changed

+32
-5
lines changed

4 files changed

+32
-5
lines changed

extensions/ql-vscode/src/query-history/query-history-info.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
getActionsWorkflowRunUrl as getVariantAnalysisActionsWorkflowRunUrl,
88
} from "../variant-analysis/shared/variant-analysis";
99
import type { QueryLanguage } from "../common/query-language";
10+
import { getGitHubInstanceUrl } from "../config";
1011

1112
export type QueryHistoryInfo = LocalQueryInfo | VariantAnalysisHistoryItem;
1213

@@ -79,5 +80,8 @@ export function buildRepoLabel(item: VariantAnalysisHistoryItem): string {
7980
export function getActionsWorkflowRunUrl(
8081
item: VariantAnalysisHistoryItem,
8182
): string {
82-
return getVariantAnalysisActionsWorkflowRunUrl(item.variantAnalysis);
83+
return getVariantAnalysisActionsWorkflowRunUrl(
84+
item.variantAnalysis,
85+
getGitHubInstanceUrl(),
86+
);
8387
}

extensions/ql-vscode/src/variant-analysis/shared/variant-analysis.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,10 +295,14 @@ export function getSkippedRepoCount(
295295

296296
export function getActionsWorkflowRunUrl(
297297
variantAnalysis: VariantAnalysis,
298+
githubUrl: URL,
298299
): string {
299300
const {
300301
actionsWorkflowRunId,
301302
controllerRepo: { fullName },
302303
} = variantAnalysis;
303-
return `https://github.com/${fullName}/actions/runs/${actionsWorkflowRunId}`;
304+
return new URL(
305+
`/${fullName}/actions/runs/${actionsWorkflowRunId}`,
306+
githubUrl,
307+
).toString();
304308
}

extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -956,7 +956,10 @@ export class VariantAnalysisManager
956956
throw new Error(`No variant analysis with id: ${variantAnalysisId}`);
957957
}
958958

959-
const actionsWorkflowRunUrl = getActionsWorkflowRunUrl(variantAnalysis);
959+
const actionsWorkflowRunUrl = getActionsWorkflowRunUrl(
960+
variantAnalysis,
961+
this.config.githubUrl,
962+
);
960963

961964
await this.app.commands.execute(
962965
"vscode.open",

extensions/ql-vscode/test/unit-tests/variant-analysis.test.ts

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,29 @@ describe("isVariantAnalysisComplete", () => {
151151
});
152152

153153
describe("getActionsWorkflowRunUrl", () => {
154-
it("should get the run url", () => {
154+
it("should get the run url on github.com", () => {
155155
const variantAnalysis = createMockVariantAnalysis({});
156156

157-
const actionsWorkflowRunUrl = getActionsWorkflowRunUrl(variantAnalysis);
157+
const actionsWorkflowRunUrl = getActionsWorkflowRunUrl(
158+
variantAnalysis,
159+
new URL("https://github.com"),
160+
);
158161

159162
expect(actionsWorkflowRunUrl).toBe(
160163
`https://github.com/${variantAnalysis.controllerRepo.fullName}/actions/runs/${variantAnalysis.actionsWorkflowRunId}`,
161164
);
162165
});
166+
167+
it("should get the run url on GHEC-DR", () => {
168+
const variantAnalysis = createMockVariantAnalysis({});
169+
170+
const actionsWorkflowRunUrl = getActionsWorkflowRunUrl(
171+
variantAnalysis,
172+
new URL("https://tenant.ghe.com"),
173+
);
174+
175+
expect(actionsWorkflowRunUrl).toBe(
176+
`https://tenant.ghe.com/${variantAnalysis.controllerRepo.fullName}/actions/runs/${variantAnalysis.actionsWorkflowRunId}`,
177+
);
178+
});
163179
});

0 commit comments

Comments
 (0)