Improve code, add support for fileEncoding

peter-evans · Jun 1, 2022 · 63c92e5 · 63c92e5
1 parent 9d950b6
commit 63c92e5
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 16 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -8573,7 +8573,7 @@ var __webpack_exports__ = {};
 // This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
 (() => {
 const { inspect } = __nccwpck_require__(3837);
-const { readFileSync } = __nccwpck_require__(7147);
+const { readFileSync, existsSync } = __nccwpck_require__(7147);
 const core = __nccwpck_require__(2186);
 const github = __nccwpck_require__(5438);
 
@@ -8647,6 +8647,7 @@ async function run() {
       commentId: core.getInput("comment-id"),
       body: core.getInput("body"),
       file: core.getInput("file"),
+      fileEncoding: core.getInput("file-encoding") || 'utf8',
       editMode: core.getInput("edit-mode"),
       reactions: core.getInput("reactions")
         ? core.getInput("reactions")
@@ -8667,21 +8668,30 @@ async function run() {
       return;
     }
 
-    const octokit = github.getOctokit(inputs.token);
+    if (inputs.file && inputs.body) {
+      core.setFailed("Only one of 'file' or 'body' can be set.");
+      return;
+    }
 
-    let bodyToUse = inputs.body;
     if (inputs.file) {
-      bodyToUse = readFileSync(inputs.file, "utf8"); 
+      if (!existsSync(inputs.file)) {
+        core.setFailed(`File '${inputs.file}' does not exist.`);
+        return;
+      }
     }
 
+    const octokit = github.getOctokit(inputs.token);
+
     if (inputs.commentId) {
       // Edit a comment
       if (!inputs.body && !inputs.reactions && !inputs.file) {
         core.setFailed("Missing either comment 'body', 'file', or 'reactions'.");
         return;
       }
 
-      if (bodyToUse) {
+      const body = getBodyOrFile(inputs);
+
+      if (body) {
         var commentBody = "";
         if (editMode == "append") {
           // Get the comment body
@@ -8693,7 +8703,7 @@ async function run() {
           commentBody = comment.body + "\n";
         }
 
-        commentBody = commentBody + bodyToUse;
+        commentBody = commentBody + body;
         core.debug(`Comment body: ${commentBody}`);
         await octokit.rest.issues.updateComment({
           owner: repo[0],
@@ -8711,15 +8721,18 @@ async function run() {
       }
     } else if (inputs.issueNumber) {
       // Create a comment
-      if (!inputs.body && !inputs.file) {
+      const body = getBodyOrFile(inputs);
+
+      if (!body) {
         core.setFailed("Missing comment 'body' or 'file'.");
         return;
       }
+
       const { data: comment } = await octokit.rest.issues.createComment({
         owner: repo[0],
         repo: repo[1],
         issue_number: inputs.issueNumber,
-        body: bodyToUse,
+        body,
       });
       core.info(
         `Created comment id '${comment.id}' on issue '${inputs.issueNumber}'.`
@@ -8743,6 +8756,14 @@ async function run() {
   }
 }
 
+function getBodyOrFile (inputs) {
+  if (inputs.body) {
+    return inputs.body;
+  } else if (inputs.file) {
+    return readFileSync(inputs.file, inputs.fileEncoding);
+  }
+}
+
 run();
 
 })();

diff --git a/index.js b/index.js
@@ -1,5 +1,5 @@
 const { inspect } = require("util");
-const { readFileSync } = require("fs");
+const { readFileSync, existsSync } = require("fs");
 const core = require("@actions/core");
 const github = require("@actions/github");
 
@@ -73,6 +73,7 @@ async function run() {
       commentId: core.getInput("comment-id"),
       body: core.getInput("body"),
       file: core.getInput("file"),
+      fileEncoding: core.getInput("file-encoding") || 'utf8',
       editMode: core.getInput("edit-mode"),
       reactions: core.getInput("reactions")
         ? core.getInput("reactions")
@@ -93,21 +94,30 @@ async function run() {
       return;
     }
 
-    const octokit = github.getOctokit(inputs.token);
+    if (inputs.file && inputs.body) {
+      core.setFailed("Only one of 'file' or 'body' can be set.");
+      return;
+    }
 
-    let bodyToUse = inputs.body;
     if (inputs.file) {
-      bodyToUse = readFileSync(inputs.file, "utf8"); 
+      if (!existsSync(inputs.file)) {
+        core.setFailed(`File '${inputs.file}' does not exist.`);
+        return;
+      }
     }
 
+    const octokit = github.getOctokit(inputs.token);
+
     if (inputs.commentId) {
       // Edit a comment
       if (!inputs.body && !inputs.reactions && !inputs.file) {
         core.setFailed("Missing either comment 'body', 'file', or 'reactions'.");
         return;
       }
 
-      if (bodyToUse) {
+      const body = getBodyOrFile(inputs);
+
+      if (body) {
         var commentBody = "";
         if (editMode == "append") {
           // Get the comment body
@@ -119,7 +129,7 @@ async function run() {
           commentBody = comment.body + "\n";
         }
 
-        commentBody = commentBody + bodyToUse;
+        commentBody = commentBody + body;
         core.debug(`Comment body: ${commentBody}`);
         await octokit.rest.issues.updateComment({
           owner: repo[0],
@@ -137,15 +147,18 @@ async function run() {
       }
     } else if (inputs.issueNumber) {
       // Create a comment
-      if (!inputs.body && !inputs.file) {
+      const body = getBodyOrFile(inputs);
+
+      if (!body) {
         core.setFailed("Missing comment 'body' or 'file'.");
         return;
       }
+
       const { data: comment } = await octokit.rest.issues.createComment({
         owner: repo[0],
         repo: repo[1],
         issue_number: inputs.issueNumber,
-        body: bodyToUse,
+        body,
       });
       core.info(
         `Created comment id '${comment.id}' on issue '${inputs.issueNumber}'.`
@@ -169,4 +182,12 @@ async function run() {
   }
 }
 
+function getBodyOrFile (inputs) {
+  if (inputs.body) {
+    return inputs.body;
+  } else if (inputs.file) {
+    return readFileSync(inputs.file, inputs.fileEncoding);
+  }
+}
+
 run();