feat: typed error management

aleios-cloud · Jan 21, 2022 · 67054e7 · 67054e7
1 parent 522799f
commit 67054e7
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git a/src/assertions/toExistAsS3Bucket/index.ts b/src/assertions/toExistAsS3Bucket/index.ts
@@ -1,5 +1,6 @@
 import { AWSClient } from "../../helpers/general";
 import { testResult } from "../../utils/testResult";
+import { is404Error } from "../utils";
 
 export default {
   async toExistAsS3Bucket(bucketName: any) {
@@ -15,7 +16,7 @@ export default {
 
       return testResult(message, true);
     } catch (error) {
-      if (error.statusCode === 404) {
+      if (is404Error(error)) {
         message = `expected S3 bucket to exist with name ${bucketName} - not found`;
 
         return testResult(message, false);

diff --git a/src/assertions/toHaveContentEqualTo/index.ts b/src/assertions/toHaveContentEqualTo/index.ts
@@ -1,5 +1,6 @@
 import { AWSClient } from "../../helpers/general";
 import { testResult } from "../../utils/testResult";
+import { isNoSuchBucketError, isNoSuchKeyError } from "../utils";
 
 export default {
   async toHaveContentEqualTo({ bucketName, objectName }: any, content: any) {
@@ -21,12 +22,12 @@ export default {
 
       return testResult(message, false);
     } catch (error) {
-      if (error.code === "NoSuchKey") {
+      if (isNoSuchKeyError(error)) {
         message = `expected ${bucketName} to have object with name ${objectName} - not found`;
 
         return testResult(message, false);
       }
-      if (error.code === "NoSuchBucket") {
+      if (isNoSuchBucketError(error)) {
         message = `expected ${bucketName} to exist - not found`;
 
         return testResult(message, false);

diff --git a/src/assertions/toHaveContentTypeEqualTo/index.ts b/src/assertions/toHaveContentTypeEqualTo/index.ts
@@ -1,5 +1,6 @@
 import { AWSClient } from "../../helpers/general";
 import { testResult } from "../../utils/testResult";
+import { isNoSuchBucketError, isNoSuchKeyError } from "../utils";
 
 export default {
   async toHaveContentTypeEqualTo(
@@ -24,12 +25,12 @@ export default {
 
       return testResult(message, false);
     } catch (error) {
-      if (error.code === "NoSuchKey") {
+      if (isNoSuchKeyError(error)) {
         message = `expected ${bucketName} to have object with name ${objectName} - not found`;
 
         return testResult(message, false);
       }
-      if (error.code === "NoSuchBucket") {
+      if (isNoSuchBucketError(error)) {
         message = `expected ${bucketName} to exist - not found`;
 
         return testResult(message, false);

diff --git a/src/assertions/toHaveObjectWithNameEqualTo/index.ts b/src/assertions/toHaveObjectWithNameEqualTo/index.ts
@@ -1,5 +1,6 @@
 import { AWSClient } from "../../helpers/general";
 import { testResult } from "../../utils/testResult";
+import { isNoSuchKeyError } from "../utils";
 
 export default {
   async toHaveS3ObjectWithNameEqualTo(bucketName: any, objectName: any) {
@@ -16,7 +17,7 @@ export default {
 
       return testResult(message, true);
     } catch (error) {
-      if (error.code === "NoSuchKey") {
+      if (isNoSuchKeyError(error)) {
         message = `expected ${bucketName} to have object with name ${objectName} - not found`;
 
         return testResult(message, false);

diff --git a/src/assertions/utils/errorTypes.ts b/src/assertions/utils/errorTypes.ts
@@ -0,0 +1,11 @@
+type Error404 = { statusCode: 404 };
+export const is404Error = (error: any): error is Error404 =>
+  error.statusCode === 404;
+
+type ErrorNoSuchKey = { code: "NoSuchKey" };
+export const isNoSuchKeyError = (error: any): error is ErrorNoSuchKey =>
+  error.code === "NoSuchKey";
+
+type ErrorNoSuchBucket = { code: "NoSuchBucket" };
+export const isNoSuchBucketError = (error: any): error is ErrorNoSuchBucket =>
+  error.code === "NoSuchBucket";
diff --git a/src/assertions/utils/index.ts b/src/assertions/utils/index.ts
@@ -0,0 +1 @@
+export * from "./errorTypes";