Merge pull request #127 from guardian/aa/more-directed-error-handling

feat: Handle Riff-Raff upload error, and PR commenting error separately
guardian · Apr 26, 2024 · b2107fa · b2107fa
2 parents 8bedd7c + 323f02a
commit b2107fa
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -59071,6 +59071,13 @@ var main = async (options) => {
       keyPrefix + "/build.json"
     );
     core4.info("Upload complete.");
+  } catch (err) {
+    core4.error(
+      "Error uploading to Riff-Raff. Does the repository have an IAM Role? See https://github.com/guardian/riffraff-platform"
+    );
+    throw err;
+  }
+  try {
     const pullRequestNumber = await getPullRequestNumber(pullRequestComment);
     if (pullRequestNumber) {
       core4.info(`Commenting on PR ${pullRequestNumber}`);
@@ -59081,9 +59088,7 @@ var main = async (options) => {
       );
     }
   } catch (err) {
-    core4.error(
-      "Error uploading to Riff-Raff. Does the repository have an IAM Role? See https://github.com/guardian/riffraff-platform"
-    );
+    core4.error("Error commenting on PR. Do you have the correct permissions?");
     throw err;
   }
 };

diff --git a/src/index.ts b/src/index.ts
@@ -133,7 +133,16 @@ export const main = async (options: Options): Promise<void> => {
 		);
 
 		core.info('Upload complete.');
+	} catch (err) {
+		core.error(
+			'Error uploading to Riff-Raff. Does the repository have an IAM Role? See https://github.com/guardian/riffraff-platform',
+		);
 
+		// throw to fail the action
+		throw err;
+	}
+
+	try {
 		const pullRequestNumber = await getPullRequestNumber(pullRequestComment);
 		if (pullRequestNumber) {
 			core.info(`Commenting on PR ${pullRequestNumber}`);
@@ -144,15 +153,9 @@ export const main = async (options: Options): Promise<void> => {
 			);
 		}
 	} catch (err) {
-		core.error(
-			'Error uploading to Riff-Raff. Does the repository have an IAM Role? See https://github.com/guardian/riffraff-platform',
-		);
+		core.error('Error commenting on PR. Do you have the correct permissions?');
 
-		/*
-    We've caught every exception, not just AWS credential errors.
-    Re-throw it so that GHA can handle it.
-    TODO: Catch a more specific error type.
-     */
+		// throw to fail the action
 		throw err;
 	}
 };