Merge master into feature/dynamodb

aws-toolkit-automation · web-flow · commit f4c3f7d4990c · 2024-08-20T07:20:22.000-07:00
diff --git a/packages/core/src/shared/errors.ts b/packages/core/src/shared/errors.ts
@@ -788,7 +788,7 @@ export function isNetworkError(err?: unknown): err is Error & { code: string } {
     if (
         isVSCodeProxyError(err) ||
         isSocketTimeoutError(err) ||
-        isNonJsonHttpResponse(err) ||
+        isHttpSyntaxError(err) ||
         isEnoentError(err) ||
         isEaccesError(err) ||
         isEbadfError(err) ||
@@ -849,11 +849,13 @@ function isSocketTimeoutError(err: Error): boolean {
 /**
  * Expected JSON response from HTTP request, but got an error HTML error page instead.
  *
- * Example error message:
- * "Unexpected token '<', "<html><bod"... is not valid JSON Deserialization error: to see the raw response, inspect the hidden field {error}.$response on this object."
+ * IMPORTANT:
+ *
+ * This function is influenced by {@link getReasonFromSyntaxError()} since it modifies the error
+ * message with the real underlying reason, instead of the default "Unexpected token" message.
  */
-function isNonJsonHttpResponse(err: Error): boolean {
-    return isError(err, 'SyntaxError', 'Unexpected token')
+function isHttpSyntaxError(err: Error): boolean {
+    return isError(err, 'SyntaxError', 'SDK Client unexpected error response')
 }
 
 /**
@@ -890,6 +892,9 @@ function isError(err: Error, id: string, messageIncludes: string = '') {
  * While the contents of the response may contain sensitive information, there may be a reason
  * for failure embedded. This function attempts to extract that reason.
  *
+ * Example error message before extracting:
+ * "Unexpected token '<', "<html><bod"... is not valid JSON Deserialization error: to see the raw response, inspect the hidden field {error}.$response on this object."
+ *
  * If the reason cannot be found or the error is not a SyntaxError, return undefined.
  */
 export function getReasonFromSyntaxError(err: Error): string | undefined {
diff --git a/packages/core/src/test/shared/errors.test.ts b/packages/core/src/test/shared/errors.test.ts
@@ -492,7 +492,7 @@ describe('util', function () {
             false,
             'Incorrectly indicated as network error'
         )
-        let err = new Error("Unexpected token '<'")
+        let err = new Error('SDK Client unexpected error response: Blah Blah Blah')
         err.name = 'SyntaxError'
         assert.deepStrictEqual(isNetworkError(err), true, 'Did not indicate SyntaxError as network error')
 

Original file line number	Diff line number	Diff line change
`@@ -492,7 +492,7 @@ describe('util', function () {`
`492`	`492`	`false,`
`493`	`493`	`'Incorrectly indicated as network error'`
`494`	`494`	`)`
`495`		`- let err = new Error("Unexpected token '<'")`
	`495`	`+ let err = new Error('SDK Client unexpected error response: Blah Blah Blah')`
`496`	`496`	`err.name = 'SyntaxError'`
`497`	`497`	`assert.deepStrictEqual(isNetworkError(err), true, 'Did not indicate SyntaxError as network error')`
`498`	`498`