Fix error code handling (#16)

netascode · Feb 8, 2025 · b5e5a36 · b5e5a36
1 parent 65d1e80
commit b5e5a36
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 7 deletions.
diff --git a/client.go b/client.go
@@ -279,11 +279,11 @@ func (client *Client) Do(req Req) (Res, error) {
 					log.Printf("[ERROR] HTTP Request failed with 'please try again'. Retrying.")
 					continue
 				}
-			} else {
-				log.Printf("[ERROR] HTTP Request failed: StatusCode %v", httpRes.StatusCode)
-				log.Printf("[DEBUG] Exit from Do method")
-				return res, fmt.Errorf("HTTP Request failed: StatusCode %v", httpRes.StatusCode)
 			}
+			// In case any previous conditions don't `continue`, return error
+			log.Printf("[ERROR] HTTP Request failed: StatusCode %v", httpRes.StatusCode)
+			log.Printf("[DEBUG] Exit from Do method")
+			return res, fmt.Errorf("HTTP Request failed: StatusCode %v", httpRes.StatusCode)
 		}
 	}
 

diff --git a/client_test.go b/client_test.go
@@ -154,10 +154,31 @@ func TestClientGetRetry(t *testing.T) {
 	client.AuthToken = "ABC"
 	client.LastRefresh = time.Now()
 
+	// Request should fail
+	gock.New(testURL).Get("/url_400").Reply(400)
+	_, err = client.Get("/url_400")
+	assert.Error(t, err)
+
 	// First request should fail, subsequent should be successful
-	gock.New(testURL).Get("/url").Reply(400).BodyString(`{"error":{"category":"FRAMEWORK","messages":[{"description":"Search Service n.a. Please try again."}],"severity":"ERROR"}}`)
-	gock.New(testURL).Get("/url").Reply(200)
-	_, err = client.Get("/url")
+	gock.New(testURL).Get("/url_400_try_again").Reply(400).BodyString(`{"error":{"category":"FRAMEWORK","messages":[{"description":"Search Service n.a. Please try again."}],"severity":"ERROR"}}`)
+	gock.New(testURL).Get("/url_400_try_again").Reply(200)
+	_, err = client.Get("/url_400_try_again")
+	assert.NoError(t, err)
+
+	// All requests should fail, as re-try counter is exceeded
+	gock.New(testURL).Get("/url_400_try_again_exceed_limit").Reply(400).BodyString(`{"error":{"category":"FRAMEWORK","messages":[{"description":"Search Service n.a. Please try again."}],"severity":"ERROR"}}`)
+	gock.New(testURL).Get("/url_400_try_again_exceed_limit").Reply(400).BodyString(`{"error":{"category":"FRAMEWORK","messages":[{"description":"Search Service n.a. Please try again."}],"severity":"ERROR"}}`)
+	gock.New(testURL).Get("/url_400_try_again_exceed_limit").Reply(400).BodyString(`{"error":{"category":"FRAMEWORK","messages":[{"description":"Search Service n.a. Please try again."}],"severity":"ERROR"}}`)
+	gock.New(testURL).Get("/url_400_try_again_exceed_limit").Reply(400).BodyString(`{"error":{"category":"FRAMEWORK","messages":[{"description":"Search Service n.a. Please try again."}],"severity":"ERROR"}}`)
+	_, err = client.Get("/url_400_try_again_exceed_limit")
+	assert.Error(t, err)
+
+	// First three request should fail, final one should be successful
+	gock.New(testURL).Get("/url_510").Reply(510)
+	gock.New(testURL).Get("/url_510").Reply(510)
+	gock.New(testURL).Get("/url_510").Reply(510)
+	gock.New(testURL).Get("/url_510").Reply(200)
+	_, err = client.Get("/url_510")
 	assert.NoError(t, err)
 }