Skip to content

Reclassify policy-driven safe-output declines as skipped, not hard failures #58767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pelikhan merged 4 commits into from
Sep 5, 2026
Merged

Reclassify policy-driven safe-output declines as skipped, not hard failures #58767

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
893f375
Initial plan
Copilot Sep 5, 2026
04b2903
Reclassify policy-driven safe-output declines as skipped, not hard fa…
Copilot Sep 5, 2026
50d1edd
Use shared constant for POLICY_FILE_PROTECTION_DENIED reasonCode
Copilot Sep 5, 2026
f460f00
Reuse centralized error_codes.cjs registry for policy reason code
Copilot Sep 5, 2026
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
2 changes: 1 addition & 1 deletion actions/setup/js/approve_workflow_run.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ async function main(config = {}) {
if (protection.action !== "allow") {
const error = `Workflow run ${runId} cannot be approved because pull request #${pullRequestNumber} modifies protected files (${protection.files.join(", ")})`;
core.warning(error);
return { success: false, error };
return { success: false, skipped: true, reasonCode: "POLICY_FILE_PROTECTION_DENIED", error };

@pelikhan pelikhan Sep 5, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot did you mean to use a constant here for the code?

Copilot AI Sep 5, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, added POLICY_FILE_PROTECTION_DENIED_REASON_CODE as a shared constant in manifest_file_helpers.cjs and imported it in both handlers instead of repeating the string literal (50d1edd).

}
}

Expand Down
2 changes: 2 additions & 0 deletions actions/setup/js/approve_workflow_run.test.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,8 @@ describe("approve_workflow_run", () => {
const result = await handler({ run_id: 123 }, {});

expect(result.success).toBe(false);
expect(result.skipped).toBe(true);
expect(result.reasonCode).toBe("POLICY_FILE_PROTECTION_DENIED");
expect(result.error).toContain("modifies protected files");
expect(mockApproveWorkflowRun).not.toHaveBeenCalled();
});
Expand Down
8 changes: 4 additions & 4 deletions actions/setup/js/push_to_pull_request_branch.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,8 +524,8 @@ async function main(config = {}) {
protection.source === "allowlist"
? `Cannot push to pull request branch: patch modifies files outside the allowed-files list (${filesStr}). Add the files to the allowed-files configuration field or remove them from the patch.`
: `Cannot push to pull request branch: patch modifies protected files (${filesStr}). Add them to the allowed-files configuration field or set protected-files: fallback-to-issue to create a review issue instead.`;
core.error(msg);
return { success: false, error: msg };
core.warning(msg);
return { success: false, skipped: true, reasonCode: "POLICY_FILE_PROTECTION_DENIED", error: msg };
}
if (protection.action === "fallback") {
protectedFilesForFallback = protection.files;
Expand Down Expand Up @@ -1118,8 +1118,8 @@ async function main(config = {}) {
bundleProtection.source === "post-apply"
? `Cannot push to pull request branch: bundle modifies files outside the allowed-files list (${filesStr}). Add the files to the allowed-files configuration field or remove them from the bundle.`
: `Cannot push to pull request branch: bundle modifies protected files (${filesStr}). Add them to the allowed-files configuration field or set protected-files: fallback-to-issue to create a review issue instead.`;
core.error(msg);
return { success: false, error: msg };
core.warning(msg);
return { success: false, skipped: true, reasonCode: "POLICY_FILE_PROTECTION_DENIED", error: msg };
}
if (bundleProtection.action === "fallback") {
core.warning(`Protected file protection triggered (fallback-to-issue): ${bundleProtection.files.join(", ")}. Will create review issue instead of pushing.`);
Expand Down
10 changes: 10 additions & 0 deletions actions/setup/js/push_to_pull_request_branch.test.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3161,6 +3161,8 @@ ${diffs}
const result = await handler({ branch: "should-reject-files-outside-the-allowed-files-allowlist" }, {});

expect(result.success).toBe(false);
expect(result.skipped).toBe(true);
expect(result.reasonCode).toBe("POLICY_FILE_PROTECTION_DENIED");
expect(result.error).toContain("outside the allowed-files list");
expect(result.error).toContain("src/index.js");
});
Expand Down Expand Up @@ -3195,6 +3197,8 @@ ${diffs}
const result = await handler({ branch: "should-still-block-a-protected-file-when-it-is-in-the-allowl" }, {});

expect(result.success).toBe(false);
expect(result.skipped).toBe(true);
expect(result.reasonCode).toBe("POLICY_FILE_PROTECTION_DENIED");
expect(result.error).toContain("protected files");
expect(result.error).toContain("package.json");
});
Expand Down Expand Up @@ -3362,6 +3366,8 @@ ${diffs}
const result = await handler({ branch: "should-block-a-protected-file-when-no-allowed-files-list-is-" }, {});

expect(result.success).toBe(false);
expect(result.skipped).toBe(true);
expect(result.reasonCode).toBe("POLICY_FILE_PROTECTION_DENIED");
expect(result.error).toContain("protected files");
expect(result.error).toContain("package.json");
});
Expand All @@ -3374,6 +3380,8 @@ ${diffs}
const result = await handler({ branch: "should-reject-a-mixed-patch-where-at-least-one-file-is-outsi" }, {});

expect(result.success).toBe(false);
expect(result.skipped).toBe(true);
expect(result.reasonCode).toBe("POLICY_FILE_PROTECTION_DENIED");
expect(result.error).toContain("outside the allowed-files list");
expect(result.error).toContain("src/index.js");
expect(result.error).not.toContain(".changeset/my-fix.md");
Expand Down Expand Up @@ -3438,6 +3446,8 @@ ${diffs}
const result = await handler({ branch: "should-still-block-non-ignored-files-that-violate-the-allowe" }, {});

expect(result.success).toBe(false);
expect(result.skipped).toBe(true);
expect(result.reasonCode).toBe("POLICY_FILE_PROTECTION_DENIED");
expect(result.error).toContain("outside the allowed-files list");
expect(result.error).toContain("other/file.txt");
expect(result.error).not.toContain("src/index.js");
Expand Down
Loading