Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ describe("evaluatePredicates integration ports", () => {

expect(evaluatePredicates(spec, factMap({ pr_title: "bad" }), tracker)).toEqual(["fail"]);
expect(tracker.summary()).toEqual({ passed: 0, failed: 1, skipped: 0 });
expect(writes).toContain("##vso[build.addbuildtag]gate:title\n");
expect(writes).toContain("##vso[build.addbuildtag]gate.title\n");
});
});
10 changes: 9 additions & 1 deletion scripts/ado-script/src/gate/bypass.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,18 @@ describe("runBypass", () => {
const joined = writes.join("");
expect(joined).toContain("Not a Pull Request build");
expect(joined).toContain("setvariable variable=SHOULD_RUN;isOutput=true]true");
expect(joined).toContain("##vso[build.addbuildtag]pr-gate:passed");
expect(joined).toContain("##vso[build.addbuildtag]pr-gate.passed");
expect(joined).toContain("##vso[task.complete result=Succeeded;]");
});

it("emits a build tag that contains no ':' (ADO rejects ':' in the tag REST path)", async () => {
process.env.ADO_BUILD_REASON = "Manual";
await runBypass(baseSpec);
const tagLine = writes.find((w) => w.startsWith("##vso[build.addbuildtag]"));
expect(tagLine).toBeDefined();
expect((tagLine as string).slice("##vso[build.addbuildtag]".length)).not.toContain(":");
});

it("returns false when build reason matches (no bypass)", async () => {
process.env.ADO_BUILD_REASON = "PullRequest";
const result = await runBypass(baseSpec);
Expand Down
2 changes: 1 addition & 1 deletion scripts/ado-script/src/gate/bypass.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export async function runBypass(spec: GateSpec): Promise<boolean> {
// into the line. Mirrors the Python log line for parity.
logInfo(`Not a ${spec.context.bypass_label} build -- gate passes automatically`);
setOutput("SHOULD_RUN", "true");
addBuildTag(`${spec.context.tag_prefix}:passed`);
addBuildTag(`${spec.context.tag_prefix}.passed`);
complete("Succeeded");
return true;
}
Expand Down
4 changes: 2 additions & 2 deletions scripts/ado-script/src/gate/predicates.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ describe("evaluatePredicates", () => {

expect(results).toEqual(["pass", "fail"]);
expect(tracker.summary()).toEqual({ passed: 1, failed: 1, skipped: 0 });
expect(writes).toContain("##vso[build.addbuildtag]gate:reason\n");
expect(writes).toContain("##vso[build.addbuildtag]gate.reason\n");
});

it("uses tracker verdicts for unavailable facts before evaluating predicates", () => {
Expand All @@ -443,7 +443,7 @@ describe("evaluatePredicates", () => {

expect(results).toEqual(["fail"]);
expect(tracker.summary()).toEqual({ passed: 0, failed: 1, skipped: 0 });
expect(writes).toContain("##vso[build.addbuildtag]gate:missing-title\n");
expect(writes).toContain("##vso[build.addbuildtag]gate.missing-title\n");
});
});

Expand Down
2 changes: 1 addition & 1 deletion scripts/ado-script/src/gate/predicates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export function evaluatePredicates(
}

if (result === "fail") {
addBuildTag(`${spec.context.tag_prefix}:${check.tag_suffix}`);
addBuildTag(`${spec.context.tag_prefix}.${check.tag_suffix}`);
}
tracker.recordCheckResult(result);
results.push(result);
Expand Down
12 changes: 11 additions & 1 deletion scripts/ado-script/src/gate/selfcancel.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,20 @@ describe("selfCancelIfRequested", () => {
process.env.ADO_BUILD_ID = "42";
cancelBuildMock.mockResolvedValue(undefined);
await selfCancelIfRequested(baseSpec);
expect(writes.join("")).toContain("##vso[build.addbuildtag]pr-gate:skipped");
expect(writes.join("")).toContain("##vso[build.addbuildtag]pr-gate.skipped");
expect(cancelBuildMock).toHaveBeenCalledWith("p", 42);
});

it("emits a build tag that contains no ':' (ADO rejects ':' in the tag REST path)", async () => {
process.env.ADO_PROJECT = "p";
process.env.ADO_BUILD_ID = "42";
cancelBuildMock.mockResolvedValue(undefined);
await selfCancelIfRequested(baseSpec);
const tagLine = writes.find((w) => w.startsWith("##vso[build.addbuildtag]"));
expect(tagLine).toBeDefined();
expect((tagLine as string).slice("##vso[build.addbuildtag]".length)).not.toContain(":");
});

it("logs warning and does NOT call cancelBuild when ADO_PROJECT missing", async () => {
delete process.env.ADO_PROJECT;
process.env.ADO_BUILD_ID = "42";
Expand Down
2 changes: 1 addition & 1 deletion scripts/ado-script/src/gate/selfcancel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { cancelBuild } from "../shared/ado-client.js";
import { logWarning, addBuildTag } from "../shared/vso-logger.js";

export async function selfCancelIfRequested(spec: GateSpec): Promise<void> {
addBuildTag(`${spec.context.tag_prefix}:skipped`);
addBuildTag(`${spec.context.tag_prefix}.skipped`);

const project = process.env.ADO_PROJECT ?? "";
const buildIdRaw = process.env.ADO_BUILD_ID ?? "";
Expand Down
16 changes: 16 additions & 0 deletions src/compile/filter_ir.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1747,6 +1747,22 @@ mod tests {
assert_eq!(spec.checks[1].name, "labels");
}

#[test]
fn test_tag_prefix_has_no_colon() {
// Build tags are PUT into the ADO REST request path
// (…/builds/<id>/tags/<tag>); a ':' trips ASP.NET's
// dangerous-request-path validator and fails the whole build.
// The gate composes tags as `${tag_prefix}.${suffix}`, so a colon
// in tag_prefix itself would reintroduce the rejected character.
for ctx in [GateContext::PullRequest, GateContext::PipelineCompletion] {
assert!(
!ctx.tag_prefix().contains(':'),
"tag_prefix {:?} must not contain ':'",
ctx.tag_prefix(),
);
}
}

#[test]
fn test_gate_spec_serializes_to_valid_json() {
let checks = vec![FilterCheck {
Expand Down
Loading