From 34c304a07e3c2ac926ca801fba6f7f6bd6221223 Mon Sep 17 00:00:00 2001
From: danischm <danischm@cisco.com>
Date: Sat, 25 Jan 2025 10:22:30 +0100
Subject: [PATCH] Retry on 404 responses

---
 CHANGELOG.md |  4 ++++
 client.go    | 59 +++++++++++++++++++++++++++-------------------------
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 090fc36..cf4853c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.1 (unreleased)
+
+- Retry on 404 responses for POST and PUT requests
+
 ## 0.1.0
 
 - Initial release
diff --git a/client.go b/client.go
index bc35574..9bd66a9 100644
--- a/client.go
+++ b/client.go
@@ -279,36 +279,39 @@ func (client *Client) Do(req Req) (Res, error) {
 		if httpRes.StatusCode >= 200 && httpRes.StatusCode <= 299 {
 			log.Printf("[DEBUG] Exit from Do method")
 			break
+		}
+
+		if ok := client.Backoff(attempts); !ok {
+			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)
+		} else if httpRes.StatusCode == 429 {
+			retryAfter := httpRes.Header.Get("Retry-After")
+			retryAfterDuration := time.Duration(0)
+			if retryAfter == "0" {
+				retryAfterDuration = time.Second
+			} else if retryAfter != "" {
+				retryAfterDuration, _ = time.ParseDuration(retryAfter + "s")
+			} else {
+				retryAfterDuration = 15 * time.Second
+			}
+			log.Printf("[WARNING] HTTP Request rate limited, waiting %v seconds, Retries: %v", retryAfterDuration.Seconds(), attempts)
+			time.Sleep(retryAfterDuration)
+			continue
+		} else if httpRes.StatusCode >= 500 && httpRes.StatusCode <= 599 {
+			log.Printf("[ERROR] HTTP Request failed: StatusCode %v, Retries: %v", httpRes.StatusCode, attempts)
+			continue
+		} else if httpRes.StatusCode == 404 && (httpRes.Request.Method == "POST" || httpRes.Request.Method == "PUT") {
+			log.Printf("[ERROR] HTTP Request failed: StatusCode %v, Retries: %v", httpRes.StatusCode, attempts)
+			continue
 		} else {
-			if ok := client.Backoff(attempts); !ok {
-				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)
-			} else if httpRes.StatusCode == 429 {
-				retryAfter := httpRes.Header.Get("Retry-After")
-				retryAfterDuration := time.Duration(0)
-				if retryAfter == "0" {
-					retryAfterDuration = time.Second
-				} else if retryAfter != "" {
-					retryAfterDuration, _ = time.ParseDuration(retryAfter + "s")
-				} else {
-					retryAfterDuration = 15 * time.Second
-				}
-				log.Printf("[WARNING] HTTP Request rate limited, waiting %v seconds, Retries: %v", retryAfterDuration.Seconds(), attempts)
-				time.Sleep(retryAfterDuration)
-				continue
-			} else if httpRes.StatusCode >= 500 && httpRes.StatusCode <= 599 {
-				log.Printf("[ERROR] HTTP Request failed: StatusCode %v, Retries: %v", httpRes.StatusCode, attempts)
-				continue
+			log.Printf("[ERROR] HTTP Request failed: StatusCode %v", httpRes.StatusCode)
+			log.Printf("[DEBUG] Exit from Do method")
+			if res.Get("errors").Exists() && len(res.Get("errors").Array()) > 0 {
+				log.Printf("[ERROR] JSON error: %s", res.Get("errors").String())
+				return res, fmt.Errorf("HTTP Request failed: StatusCode %v, JSON error: %s", httpRes.StatusCode, res.Get("errors").String())
 			} else {
-				log.Printf("[ERROR] HTTP Request failed: StatusCode %v", httpRes.StatusCode)
-				log.Printf("[DEBUG] Exit from Do method")
-				if res.Get("errors").Exists() && len(res.Get("errors").Array()) > 0 {
-					log.Printf("[ERROR] JSON error: %s", res.Get("errors").String())
-					return res, fmt.Errorf("HTTP Request failed: StatusCode %v, JSON error: %s", httpRes.StatusCode, res.Get("errors").String())
-				} else {
-					return res, fmt.Errorf("HTTP Request failed: StatusCode %v", httpRes.StatusCode)
-				}
+				return res, fmt.Errorf("HTTP Request failed: StatusCode %v", httpRes.StatusCode)
 			}
 		}
 	}