Skip to content

Refactor: Extract duplicate expired entity cleanup orchestration #14292

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 2 commits into from
Feb 7, 2026
Merged

Refactor: Extract duplicate expired entity cleanup orchestration #14292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07dc8c0
Initial plan
Copilot Feb 7, 2026
62f98de
Refactor: Extract duplicate expired entity cleanup flow into shared h…
Copilot Feb 7, 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
73 changes: 5 additions & 68 deletions actions/setup/js/close_expired_discussions.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
// @ts-check
// <reference types="@actions/github-script" />

const { searchEntitiesWithExpiration } = require("./expired_entity_search_helpers.cjs");
const { buildExpirationSummary, categorizeByExpiration, DEFAULT_GRAPHQL_DELAY_MS, DEFAULT_MAX_UPDATES_PER_RUN, processExpiredEntities } = require("./expired_entity_cleanup_helpers.cjs");
const { executeExpiredEntityCleanup } = require("./expired_entity_main_flow.cjs");

/**
* Add comment to a GitHub Discussion using GraphQL
Expand Down Expand Up @@ -91,58 +90,14 @@ async function main() {
const owner = context.repo.owner;
const repo = context.repo.repo;

core.info(`Searching for expired discussions in ${owner}/${repo}`);

// Search for discussions with expiration markers (enable dedupe for discussions)
const { items: discussionsWithExpiration, stats: searchStats } = await searchEntitiesWithExpiration(github, owner, repo, {
await executeExpiredEntityCleanup(github, owner, repo, {
entityType: "discussions",
graphqlField: "discussions",
resultKey: "discussions",
enableDedupe: true, // Discussions may have duplicates across pages
});

if (discussionsWithExpiration.length === 0) {
core.info("No discussions with expiration markers found");

// Write summary even when no discussions found
let summaryContent = `## Expired Discussions Cleanup\n\n`;
summaryContent += `**Scanned**: ${searchStats.totalScanned} discussions across ${searchStats.pageCount} page(s)\n\n`;
summaryContent += `**Result**: No discussions with expiration markers found\n`;
await core.summary.addRaw(summaryContent).write();

return;
}

core.info(`Found ${discussionsWithExpiration.length} discussion(s) with expiration markers`);

const {
expired: expiredDiscussions,
notExpired: notExpiredDiscussions,
now,
} = categorizeByExpiration(discussionsWithExpiration, {
entityLabel: "Discussion",
});

if (expiredDiscussions.length === 0) {
core.info("No expired discussions found");

// Write summary when no expired discussions
let summaryContent = `## Expired Discussions Cleanup\n\n`;
summaryContent += `**Scanned**: ${searchStats.totalScanned} discussions across ${searchStats.pageCount} page(s)\n\n`;
summaryContent += `**With expiration markers**: ${discussionsWithExpiration.length} discussion(s)\n\n`;
summaryContent += `**Expired**: 0 discussions\n\n`;
summaryContent += `**Not yet expired**: ${notExpiredDiscussions.length} discussion(s)\n`;
await core.summary.addRaw(summaryContent).write();

return;
}

core.info(`Found ${expiredDiscussions.length} expired discussion(s)`);

const { closed, skipped, failed } = await processExpiredEntities(expiredDiscussions, {
entityLabel: "Discussion",
maxPerRun: DEFAULT_MAX_UPDATES_PER_RUN,
delayMs: DEFAULT_GRAPHQL_DELAY_MS,
summaryHeading: "Expired Discussions Cleanup",
enableDedupe: true, // Discussions may have duplicates across pages
includeSkippedHeading: true,
processEntity: async discussion => {
core.info(` Checking for existing expiration comment and closed state on discussion #${discussion.number}`);
const { hasComment, isClosed } = await hasExpirationComment(github, discussion.id);
Expand Down Expand Up @@ -196,24 +151,6 @@ async function main() {
};
},
});

const summaryContent = buildExpirationSummary({
heading: "Expired Discussions Cleanup",
entityLabel: "Discussion",
searchStats,
withExpirationCount: discussionsWithExpiration.length,
expired: expiredDiscussions,
notExpired: notExpiredDiscussions,
closed,
skipped,
failed,
maxPerRun: DEFAULT_MAX_UPDATES_PER_RUN,
includeSkippedHeading: true,
now,
});

await core.summary.addRaw(summaryContent).write();
core.info(`Successfully closed ${closed.length} expired discussion(s)`);
}

module.exports = { main };
68 changes: 3 additions & 65 deletions actions/setup/js/close_expired_issues.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
// @ts-check
// <reference types="@actions/github-script" />

const { searchEntitiesWithExpiration } = require("./expired_entity_search_helpers.cjs");
const { buildExpirationSummary, categorizeByExpiration, DEFAULT_GRAPHQL_DELAY_MS, DEFAULT_MAX_UPDATES_PER_RUN, processExpiredEntities } = require("./expired_entity_cleanup_helpers.cjs");
const { executeExpiredEntityCleanup } = require("./expired_entity_main_flow.cjs");

/**
* Add comment to a GitHub Issue using REST API
Expand Down Expand Up @@ -48,57 +47,12 @@ async function main() {
const owner = context.repo.owner;
const repo = context.repo.repo;

core.info(`Searching for expired issues in ${owner}/${repo}`);

// Search for issues with expiration markers
const { items: issuesWithExpiration, stats: searchStats } = await searchEntitiesWithExpiration(github, owner, repo, {
await executeExpiredEntityCleanup(github, owner, repo, {
entityType: "issues",
graphqlField: "issues",
resultKey: "issues",
});

if (issuesWithExpiration.length === 0) {
core.info("No issues with expiration markers found");

// Write summary even when no issues found
let summaryContent = `## Expired Issues Cleanup\n\n`;
summaryContent += `**Scanned**: ${searchStats.totalScanned} issues across ${searchStats.pageCount} page(s)\n\n`;
summaryContent += `**Result**: No issues with expiration markers found\n`;
await core.summary.addRaw(summaryContent).write();

return;
}

core.info(`Found ${issuesWithExpiration.length} issue(s) with expiration markers`);

const {
expired: expiredIssues,
notExpired: notExpiredIssues,
now,
} = categorizeByExpiration(issuesWithExpiration, {
entityLabel: "Issue",
});

if (expiredIssues.length === 0) {
core.info("No expired issues found");

// Write summary when no expired issues
let summaryContent = `## Expired Issues Cleanup\n\n`;
summaryContent += `**Scanned**: ${searchStats.totalScanned} issues across ${searchStats.pageCount} page(s)\n\n`;
summaryContent += `**With expiration markers**: ${issuesWithExpiration.length} issue(s)\n\n`;
summaryContent += `**Expired**: 0 issues\n\n`;
summaryContent += `**Not yet expired**: ${notExpiredIssues.length} issue(s)\n`;
await core.summary.addRaw(summaryContent).write();

return;
}

core.info(`Found ${expiredIssues.length} expired issue(s)`);

const { closed, failed } = await processExpiredEntities(expiredIssues, {
entityLabel: "Issue",
maxPerRun: DEFAULT_MAX_UPDATES_PER_RUN,
delayMs: DEFAULT_GRAPHQL_DELAY_MS,
summaryHeading: "Expired Issues Cleanup",
processEntity: async issue => {
const closingMessage = `This issue was automatically closed because it expired on ${issue.expirationDate.toISOString()}.`;

Expand All @@ -118,22 +72,6 @@ async function main() {
};
},
});

const summaryContent = buildExpirationSummary({
heading: "Expired Issues Cleanup",
entityLabel: "Issue",
searchStats,
withExpirationCount: issuesWithExpiration.length,
expired: expiredIssues,
notExpired: notExpiredIssues,
closed,
failed,
maxPerRun: DEFAULT_MAX_UPDATES_PER_RUN,
now,
});

await core.summary.addRaw(summaryContent).write();
core.info(`Successfully closed ${closed.length} expired issue(s)`);
}

module.exports = { main };
Loading
Loading