update logging

__tests__/main.test.ts

@@ -40,10 +40,8 @@ const DefaultProcessorOptions: IssueProcessorOptions = Object.freeze({
   daysBeforeStale: 1,
   daysBeforeClose: 30,
   staleIssueLabel: 'Stale',
-  closeIssueLabel: '',
   exemptIssueLabels: '',
   stalePrLabel: 'Stale',
-  closePrLabel: '',
   exemptPrLabels: '',
   onlyLabels: '',
   operationsPerRun: 100,

action.yml

@@ -22,16 +22,12 @@ inputs:
   stale-issue-label:
     description: 'The label to apply when an issue is stale.'
     default: 'Stale'
-  close-issue-label:
-    description: 'The label to apply when an issue is closed.'
   exempt-issue-labels:
     description: 'The labels to apply when an issue is exempt from being marked stale. Separate multiple labels with commas (eg. "label1,label2")'
     default: ''
   stale-pr-label:
     description: 'The label to apply when a pull request is stale.'
     default: 'Stale'
-  close-pr-label:
-    description: 'The label to apply when a pull request is closed.'
   exempt-pr-labels:
     description: 'The labels to apply when a pull request is exempt from being marked stale. Separate multiple labels with commas (eg. "label1,label2")'
     default: ''
@@ -56,6 +52,9 @@ inputs:
   skip-stale-issue-message:
     description: 'Skip adding stale message when marking an issue as stale.'
     default: false
+  process-drafts:
+    description: 'Should the draft PRs be marked stale? If set to true, draft PRs will be included in processing.'
+    default: false
 runs:
   using: 'node12'
   main: 'dist/index.js'

dist/index.js

@@ -1455,10 +1455,8 @@ function getAndValidateArgs() {
         daysBeforeStale: parseInt(core.getInput('days-before-stale', { required: true })),
         daysBeforeClose: parseInt(core.getInput('days-before-close', { required: true })),
         staleIssueLabel: core.getInput('stale-issue-label', { required: true }),
-        closeIssueLabel: core.getInput('close-issue-label'),
         exemptIssueLabels: core.getInput('exempt-issue-labels'),
         stalePrLabel: core.getInput('stale-pr-label', { required: true }),
-        closePrLabel: core.getInput('close-pr-label'),
         exemptPrLabels: core.getInput('exempt-pr-labels'),
         onlyLabels: core.getInput('only-labels'),
         operationsPerRun: parseInt(core.getInput('operations-per-run', { required: true })),
@@ -1466,7 +1464,8 @@ function getAndValidateArgs() {
         debugOnly: core.getInput('debug-only') === 'true',
         ascending: core.getInput('ascending') === 'true',
         skipStalePrMessage: core.getInput('skip-stale-pr-message') === 'true',
-        skipStaleIssueMessage: core.getInput('skip-stale-issue-message') === 'true'
+        skipStaleIssueMessage: core.getInput('skip-stale-issue-message') === 'true',
+        processDrafts: core.getInput('process-drafts') === 'true'
     };
     for (const numberInput of [
         'days-before-stale',
@@ -2590,9 +2589,6 @@ class IssueProcessor {
                 const staleLabel = isPr
                     ? this.options.stalePrLabel
                     : this.options.staleIssueLabel;
-                const closeLabel = isPr
-                    ? this.options.closePrLabel
-                    : this.options.closeIssueLabel;
                 const exemptLabels = IssueProcessor.parseCommaSeparatedString(isPr ? this.options.exemptPrLabels : this.options.exemptIssueLabels);
                 const skipMessage = isPr
                     ? this.options.skipStalePrMessage
@@ -2611,6 +2607,10 @@ class IssueProcessor {
                     core.info(`Skipping ${issueType} because it is locked`);
                     continue; // don't process locked issues
                 }
+                if (issue.draft && !this.options.processDrafts) {
+                    core.info(`Skipping ${issueType} because it is a draft`);
+                    continue; // don't process drafts
+                }
                 if (exemptLabels.some((exemptLabel) => IssueProcessor.isLabeled(issue, exemptLabel))) {
                     core.info(`Skipping ${issueType} because it has an exempt label`);
                     continue; // don't process exempt issues
@@ -2628,7 +2628,7 @@ class IssueProcessor {
                 // process the issue if it was marked stale
                 if (isStale) {
                     core.info(`Found a stale ${issueType}`);
-                    yield this.processStaleIssue(issue, issueType, staleLabel, closeMessage, closeLabel);
+                    yield this.processStaleIssue(issue, issueType, staleLabel, closeMessage);
                 }
             }
             if (this.operationsLeft <= 0) {
@@ -2640,7 +2640,7 @@ class IssueProcessor {
         });
     }
     // handle all of the stale issue logic when we find a stale issue
-    processStaleIssue(issue, issueType, staleLabel, closeMessage, closeLabel) {
+    processStaleIssue(issue, issueType, staleLabel, closeMessage) {
         return __awaiter(this, void 0, void 0, function* () {
             const markedStaleOn = (yield this.getLabelCreationDate(issue, staleLabel)) || issue.updated_at;
             core.info(`Issue #${issue.number} marked stale on: ${markedStaleOn}`);
@@ -2659,7 +2659,7 @@ class IssueProcessor {
             }
             if (!issueHasComments && !issueHasUpdate) {
                 core.info(`Closing ${issueType} because it was last updated on ${issue.updated_at}`);
-                yield this.closeIssue(issue, closeMessage, closeLabel);
+                yield this.closeIssue(issue, closeMessage);
             }
             else {
                 core.info(`Stale ${issueType} is not old enough to close yet (hasComments? ${issueHasComments}, hasUpdate? ${issueHasUpdate}`);
@@ -2715,6 +2715,7 @@ class IssueProcessor {
                     direction: this.options.ascending ? 'asc' : 'desc',
                     page
                 });
+                core.info(`issue data: ${JSON.stringify(issueResult.data)}`);
                 return issueResult.data;
             }
             catch (error) {
@@ -2763,7 +2764,7 @@ class IssueProcessor {
         });
     }
     // Close an issue based on staleness
-    closeIssue(issue, closeMessage, closeLabel) {
+    closeIssue(issue, closeMessage) {
         return __awaiter(this, void 0, void 0, function* () {
             core.info(`Closing issue #${issue.number} - ${issue.title} for being stale`);
             this.closedIssues.push(issue);
@@ -2784,19 +2785,6 @@ class IssueProcessor {
                     core.error(`Error creating a comment: ${error.message}`);
                 }
             }
-            if (closeLabel) {
-                try {
-                    yield this.client.issues.addLabels({
-                        owner: github_1.context.repo.owner,
-                        repo: github_1.context.repo.repo,
-                        issue_number: issue.number,
-                        labels: [closeLabel]
-                    });
-                }
-                catch (error) {
-                    core.error(`Error adding a label: ${error.message}`);
-                }
-            }
             try {
                 yield this.client.issues.update({
                     owner: github_1.context.repo.owner,

package.json

@@ -25,7 +25,7 @@
   "author": "GitHub",
   "license": "MIT",
   "dependencies": {
-    "@actions/core": "^1.2.5",
+    "@actions/core": "^1.2.4",
     "@actions/github": "^4.0.0",
     "@octokit/rest": "^18.0.4",
     "semver": "^7.3.2"
@@ -33,16 +33,16 @@
   "devDependencies": {
     "@types/semver": "^7.3.1",
     "@types/jest": "^26.0.10",
-    "@types/node": "^14.10.0",
+    "@types/node": "^14.6.0",
     "@typescript-eslint/parser": "^3.10.1",
-    "@vercel/ncc": "^0.24.0",
+    "@vercel/ncc": "^0.23.0",
     "eslint": "^7.7.0",
     "eslint-plugin-github": "^4.0.1",
     "eslint-plugin-jest": "^23.20.0",
     "jest": "^24.9.0",
-    "jest-circus": "^26.4.2",
+    "jest-circus": "^26.1.0",
     "js-yaml": "^3.14.0",
-    "prettier": "^2.1.1",
+    "prettier": "^2.0.5",
     "ts-jest": "^24.2.0",
     "typescript": "^4.0.2"
   }

src/IssueProcessor.ts

@@ -10,6 +10,7 @@ export interface Issue {
   pull_request: any;
   state: string;
   locked: boolean;
+  draft: boolean;
 }
 
 export interface User {
@@ -40,10 +41,8 @@ export interface IssueProcessorOptions {
   daysBeforeStale: number;
   daysBeforeClose: number;
   staleIssueLabel: string;
-  closeIssueLabel: string;
   exemptIssueLabels: string;
   stalePrLabel: string;
-  closePrLabel: string;
   exemptPrLabels: string;
   onlyLabels: string;
   operationsPerRun: number;
@@ -52,6 +51,7 @@ export interface IssueProcessorOptions {
   ascending: boolean;
   skipStaleIssueMessage: boolean;
   skipStalePrMessage: boolean;
+  processDrafts: boolean;
 }
 
 /***
@@ -128,9 +128,6 @@ export class IssueProcessor {
       const staleLabel: string = isPr
         ? this.options.stalePrLabel
         : this.options.staleIssueLabel;
-      const closeLabel: string = isPr
-        ? this.options.closePrLabel
-        : this.options.closeIssueLabel;
       const exemptLabels = IssueProcessor.parseCommaSeparatedString(
         isPr ? this.options.exemptPrLabels : this.options.exemptIssueLabels
       );
@@ -155,6 +152,11 @@ export class IssueProcessor {
         continue; // don't process locked issues
       }
 
+      if (issue.draft && !this.options.processDrafts) {
+        core.info(`Skipping ${issueType} because it is a draft`);
+        continue; // don't process drafts
+      }
+
       if (
         exemptLabels.some((exemptLabel: string) =>
           IssueProcessor.isLabeled(issue, exemptLabel)
@@ -189,8 +191,7 @@ export class IssueProcessor {
           issue,
           issueType,
           staleLabel,
-          closeMessage,
+          closeMessage
-          closeLabel
         );
       }
     }
@@ -209,8 +210,7 @@ export class IssueProcessor {
     issue: Issue,
     issueType: string,
     staleLabel: string,
-    closeMessage?: string,
+    closeMessage?: string
-    closeLabel?: string
   ) {
     const markedStaleOn: string =
       (await this.getLabelCreationDate(issue, staleLabel)) || issue.updated_at;
@@ -247,7 +247,7 @@ export class IssueProcessor {
       core.info(
         `Closing ${issueType} because it was last updated on ${issue.updated_at}`
       );
-      await this.closeIssue(issue, closeMessage, closeLabel);
+      await this.closeIssue(issue, closeMessage);
     } else {
       core.info(
         `Stale ${issueType} is not old enough to close yet (hasComments? ${issueHasComments}, hasUpdate? ${issueHasUpdate}`
@@ -322,6 +322,8 @@ export class IssueProcessor {
           page
         }
       );
+
+      core.info(`issue data: ${JSON.stringify(issueResult.data)}`);
       return issueResult.data;
     } catch (error) {
       core.error(`Get issues for repo error: ${error.message}`);
@@ -377,11 +379,7 @@ export class IssueProcessor {
   }
 
   // Close an issue based on staleness
-  private async closeIssue(
+  private async closeIssue(issue: Issue, closeMessage?: string): Promise<void> {
-    issue: Issue,
-    closeMessage?: string,
-    closeLabel?: string
-  ): Promise<void> {
     core.info(
       `Closing issue #${issue.number} - ${issue.title} for being stale`
     );
@@ -407,19 +405,6 @@ export class IssueProcessor {
       }
     }
 
-    if (closeLabel) {
-      try {
-        await this.client.issues.addLabels({
-          owner: context.repo.owner,
-          repo: context.repo.repo,
-          issue_number: issue.number,
-          labels: [closeLabel]
-        });
-      } catch (error) {
-        core.error(`Error adding a label: ${error.message}`);
-      }
-    }
-
     try {
       await this.client.issues.update({
         owner: context.repo.owner,

src/main.ts

@@ -27,10 +27,8 @@ function getAndValidateArgs(): IssueProcessorOptions {
       core.getInput('days-before-close', {required: true})
     ),
     staleIssueLabel: core.getInput('stale-issue-label', {required: true}),
-    closeIssueLabel: core.getInput('close-issue-label'),
     exemptIssueLabels: core.getInput('exempt-issue-labels'),
     stalePrLabel: core.getInput('stale-pr-label', {required: true}),
-    closePrLabel: core.getInput('close-pr-label'),
     exemptPrLabels: core.getInput('exempt-pr-labels'),
     onlyLabels: core.getInput('only-labels'),
     operationsPerRun: parseInt(
@@ -42,7 +40,8 @@ function getAndValidateArgs(): IssueProcessorOptions {
     debugOnly: core.getInput('debug-only') === 'true',
     ascending: core.getInput('ascending') === 'true',
     skipStalePrMessage: core.getInput('skip-stale-pr-message') === 'true',
-    skipStaleIssueMessage: core.getInput('skip-stale-issue-message') === 'true'
+    skipStaleIssueMessage: core.getInput('skip-stale-issue-message') === 'true',
+    processDrafts: core.getInput('process-drafts') === 'true'
   };
 
   for (const numberInput of [