Skip to content

Fix: close_issue and add_labels handlers ignore target-repo config #15031

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
Feb 11, 2026
Merged

Fix: close_issue and add_labels handlers ignore target-repo config #15031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b2bcafa
Initial plan
Copilot Feb 11, 2026
eabe387
Add target-repo support to close_issue and add_labels handlers
Copilot Feb 11, 2026
598023a
Merge branch 'main' into copilot/fix-cross-repo-handlers
pelikhan Feb 11, 2026
b3afe2a
Merge branch 'main' into copilot/fix-cross-repo-handlers
pelikhan Feb 11, 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
25 changes: 22 additions & 3 deletions actions/setup/js/add_labels.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const HANDLER_TYPE = "add_labels";

const { validateLabels } = require("./safe_output_validator.cjs");
const { getErrorMessage } = require("./error_helpers.cjs");
const { resolveTargetRepoConfig, resolveAndValidateRepo } = require("./repo_helpers.cjs");

/**
* Main handler factory for add_labels
Expand All @@ -20,11 +21,16 @@ async function main(config = {}) {
// Extract configuration
const allowedLabels = config.allowed || [];
const maxCount = config.max || 10;
const { defaultTargetRepo, allowedRepos } = resolveTargetRepoConfig(config);

core.info(`Add labels configuration: max=${maxCount}`);
if (allowedLabels.length > 0) {
core.info(`Allowed labels: ${allowedLabels.join(", ")}`);
}
core.info(`Default target repo: ${defaultTargetRepo}`);
if (allowedRepos.size > 0) {
core.info(`Allowed repos: ${Array.from(allowedRepos).join(", ")}`);
}

// Track how many items we've processed for max limit
let processedCount = 0;
Expand All @@ -47,6 +53,18 @@ async function main(config = {}) {

processedCount++;

// Resolve and validate target repository
const repoResult = resolveAndValidateRepo(message, defaultTargetRepo, allowedRepos, "label");
if (!repoResult.success) {
core.warning(`Skipping add_labels: ${repoResult.error}`);
return {
success: false,
error: repoResult.error,
};
}
const { repo: itemRepo, repoParts } = repoResult;
core.info(`Target repository: ${itemRepo}`);

// Determine target issue/PR number
const itemNumber = message.item_number !== undefined ? parseInt(String(message.item_number), 10) : (context.payload?.issue?.number ?? context.payload?.pull_request?.number);

Expand Down Expand Up @@ -102,16 +120,17 @@ async function main(config = {}) {
};
}

core.info(`Adding ${uniqueLabels.length} labels to ${contextType} #${itemNumber}: ${JSON.stringify(uniqueLabels)}`);
core.info(`Adding ${uniqueLabels.length} labels to ${contextType} #${itemNumber} in ${itemRepo}: ${JSON.stringify(uniqueLabels)}`);

try {
await github.rest.issues.addLabels({
...context.repo,
owner: repoParts.owner,
repo: repoParts.repo,
issue_number: itemNumber,
labels: uniqueLabels,
});

core.info(`Successfully added ${uniqueLabels.length} labels to ${contextType} #${itemNumber}`);
core.info(`Successfully added ${uniqueLabels.length} labels to ${contextType} #${itemNumber} in ${itemRepo}`);
return {
success: true,
number: itemNumber,
Expand Down
99 changes: 99 additions & 0 deletions actions/setup/js/add_labels.test.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,5 +379,104 @@ describe("add_labels", () => {
expect(addLabelsCalls[0].owner).toBe("test-owner");
expect(addLabelsCalls[0].repo).toBe("test-repo");
});

it("should support target-repo from config", async () => {
const handler = await main({
max: 10,
"target-repo": "external-org/external-repo",
});
const addLabelsCalls = [];

mockGithub.rest.issues.addLabels = async params => {
addLabelsCalls.push(params);
return {};
};

const result = await handler(
{
item_number: 100,
labels: ["bug"],
},
{}
);

expect(result.success).toBe(true);
expect(addLabelsCalls[0].owner).toBe("external-org");
expect(addLabelsCalls[0].repo).toBe("external-repo");
});

it("should support repo field in message for cross-repository operations", async () => {
const handler = await main({
max: 10,
"target-repo": "default-org/default-repo",
allowed_repos: ["cross-org/cross-repo"],
});
const addLabelsCalls = [];

mockGithub.rest.issues.addLabels = async params => {
addLabelsCalls.push(params);
return {};
};

const result = await handler(
{
item_number: 456,
labels: ["enhancement"],
repo: "cross-org/cross-repo",
},
{}
);

expect(result.success).toBe(true);
expect(addLabelsCalls[0].owner).toBe("cross-org");
expect(addLabelsCalls[0].repo).toBe("cross-repo");
});

it("should reject repo not in allowed-repos list", async () => {
const handler = await main({
max: 10,
"target-repo": "default-org/default-repo",
allowed_repos: ["allowed-org/allowed-repo"],
});

const result = await handler(
{
item_number: 100,
labels: ["bug"],
repo: "unauthorized-org/unauthorized-repo",
},
{}
);

expect(result.success).toBe(false);
expect(result.error).toContain("not in the allowed-repos list");
});

it("should qualify bare repo name with default repo org", async () => {
const handler = await main({
max: 10,
"target-repo": "github/default-repo",
allowed_repos: ["github/gh-aw"],
});
const addLabelsCalls = [];

mockGithub.rest.issues.addLabels = async params => {
addLabelsCalls.push(params);
return {};
};

const result = await handler(
{
item_number: 100,
labels: ["bug"],
repo: "gh-aw", // Bare name without org
},
{}
);

expect(result.success).toBe(true);
expect(addLabelsCalls[0].owner).toBe("github");
expect(addLabelsCalls[0].repo).toBe("gh-aw");
});
});
});
26 changes: 22 additions & 4 deletions actions/setup/js/close_issue.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/

const { getErrorMessage } = require("./error_helpers.cjs");
const { resolveTargetRepoConfig, resolveAndValidateRepo } = require("./repo_helpers.cjs");

/**
* Get issue details using REST API
Expand Down Expand Up @@ -79,6 +80,7 @@ async function main(config = {}) {
const requiredTitlePrefix = config.required_title_prefix || "";
const maxCount = config.max || 10;
const comment = config.comment || "";
const { defaultTargetRepo, allowedRepos } = resolveTargetRepoConfig(config);

core.info(`Close issue configuration: max=${maxCount}`);
if (requiredLabels.length > 0) {
Expand All @@ -87,6 +89,10 @@ async function main(config = {}) {
if (requiredTitlePrefix) {
core.info(`Required title prefix: ${requiredTitlePrefix}`);
}
core.info(`Default target repo: ${defaultTargetRepo}`);
if (allowedRepos.size > 0) {
core.info(`Allowed repos: ${Array.from(allowedRepos).join(", ")}`);
}

// Track how many items we've processed for max limit
let processedCount = 0;
Expand All @@ -111,6 +117,18 @@ async function main(config = {}) {

const item = message;

// Resolve and validate target repository
const repoResult = resolveAndValidateRepo(item, defaultTargetRepo, allowedRepos, "issue");
if (!repoResult.success) {
core.warning(`Skipping close_issue: ${repoResult.error}`);
return {
success: false,
error: repoResult.error,
};
}
const { repo: itemRepo, repoParts } = repoResult;
core.info(`Target repository: ${itemRepo}`);

// Determine issue number
let issueNumber;
if (item.issue_number !== undefined) {
Expand All @@ -137,7 +155,7 @@ async function main(config = {}) {

try {
// Fetch issue details
const issue = await getIssueDetails(github, context.repo.owner, context.repo.repo, issueNumber);
const issue = await getIssueDetails(github, repoParts.owner, repoParts.repo, issueNumber);

// Check if already closed
if (issue.state === "closed") {
Expand Down Expand Up @@ -173,13 +191,13 @@ async function main(config = {}) {

// Add comment if configured
if (comment) {
await addIssueComment(github, context.repo.owner, context.repo.repo, issueNumber, comment);
await addIssueComment(github, repoParts.owner, repoParts.repo, issueNumber, comment);
core.info(`Added comment to issue #${issueNumber}`);
}

// Close the issue
const closedIssue = await closeIssue(github, context.repo.owner, context.repo.repo, issueNumber);
core.info(`Closed issue #${issueNumber}: ${closedIssue.html_url}`);
const closedIssue = await closeIssue(github, repoParts.owner, repoParts.repo, issueNumber);
core.info(`Closed issue #${issueNumber} in ${itemRepo}: ${closedIssue.html_url}`);

return {
success: true,
Expand Down
Loading
Loading