# Throw non-ResponseError errors

Signed-off-by: Theo Truong <theotr@amazon.com>
opensearch-project · May 27, 2024 · c566451 · c566451
1 parent 5c6aace
commit c566451
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/tools/src/tester/ChapterEvaluator.ts b/tools/src/tester/ChapterEvaluator.ts
@@ -2,6 +2,7 @@ import { type Chapter, type ActualResponse } from './types/story.types'
 import { type ChapterEvaluation, type Evaluation, Result } from './types/eval.types'
 import { type ParsedOperation } from './types/spec.types'
 import { overall_result } from './helpers'
+import { ResponseError } from './ChapterReader'
 
 export default class ChapterEvaluator {
   chapter: Chapter
@@ -28,8 +29,8 @@ export default class ChapterEvaluator {
         result: overall_result(Object.values(params).concat([request_body, status, payload]))
       }
     } catch (error) {
-      console.error(error)
-      return { result: Result.ERROR, title: this.chapter.synopsis, message: error as string }
+      if (!(error instanceof ResponseError)) throw error
+      return { result: Result.ERROR, title: this.chapter.synopsis, message: error.message }
     }
   }
 

diff --git a/tools/src/tester/ChapterReader.ts b/tools/src/tester/ChapterReader.ts
@@ -1,6 +1,8 @@
 import axios from 'axios'
 import { type ChapterRequest, type ActualResponse, type Parameter } from './types/story.types'
 
+export class ResponseError extends Error {}
+
 // A lightweight client for testing the API
 export default class ChapterReader {
   url: string
@@ -22,7 +24,8 @@ export default class ChapterReader {
       response.content_type = r.headers['content-type'].split(';')[0]
       response.payload = r.data
     }).catch(e => {
-      if (!ignore_errors) throw new Error(e.response.data.error.reason as string)
+      if (e.response == null) throw e
+      if (!ignore_errors) throw new ResponseError(e.response.data.error.reason as string)
       response.status = e.response.status
       response.content_type = e.response.headers['content-type'].split(';')[0]
       response.payload = e.response.data?.error

diff --git a/tools/src/tester/StoryEvaluator.ts b/tools/src/tester/StoryEvaluator.ts
@@ -1,6 +1,7 @@
 import { type Chapter, type Story, type SupplementalChapter } from './types/story.types'
 import { type ChapterEvaluation, Result, type StoryEvaluation } from './types/eval.types'
 import ChapterEvaluator from './ChapterEvaluator'
+import { ResponseError } from './ChapterReader'
 
 export interface StoryFile {
   display_path: string
@@ -68,9 +69,10 @@ export default class StoryEvaluator {
         await globalThis.chapter_reader.read(chapter, chapter.ignore_errors)
         evaluations.push({ title, result: Result.PASSED })
       } catch (error) {
+        if (!(error instanceof ResponseError)) throw error
         this.result = Result.ERROR
         this.skipped = true
-        evaluations.push({ title, result: Result.ERROR, message: (error as Error).message })
+        evaluations.push({ title, result: Result.ERROR, message: (error).message })
       }
     }
     return evaluations