fix: fix error handling when retrying cluster update commands

Qovery · Feb 11, 2025 · b454bd9 · b454bd9
1 parent 47754b5
commit b454bd9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/pkg/admin_cluster_services.go b/pkg/admin_cluster_services.go
@@ -368,7 +368,7 @@ func (service AdminClusterBatchDeployServiceImpl) Deploy(clusters []ClusterDetai
 					}
 					return qoveryClient.ClustersAPI.GetClusterStatus(context.Background(), cluster.OrganizationId, cluster.ClusterId).Execute()
 				})
-				if response.StatusCode > 200 || err != nil {
+				if response == nil || response.StatusCode > 200 || err != nil {
 					return nil, err
 				}
 
@@ -416,7 +416,7 @@ func (service AdminClusterBatchDeployServiceImpl) Deploy(clusters []ClusterDetai
 				}
 				return qoveryClient.ClustersAPI.GetClusterStatus(context.Background(), cluster.OrganizationId, cluster.ClusterId).Execute()
 			})
-			if response.StatusCode > 200 || err != nil {
+			if response == nil || response.StatusCode > 200 || err != nil {
 				return nil, err
 			}
 

diff --git a/pkg/auth_service.go b/pkg/auth_service.go
@@ -261,15 +261,7 @@ type QoveryClientApiRequest[T any] func(needToRefetchClient bool) (*T, *http.Res
 // RetryQoveryClientApiRequestOnUnauthorized To be able to ask for re-auth when first attempt leads to unauthorized
 func RetryQoveryClientApiRequestOnUnauthorized[T any](request QoveryClientApiRequest[T]) (*T, *http.Response, error) {
 	qoveryStruct, response, err := request(false)
-	if err != nil {
-		return qoveryStruct, response, fmt.Errorf("RetryQoveryClientApiRequestOnUnauthorized: initial request error: %w", err)
-	}
-
-	if response == nil {
-		return qoveryStruct, nil, fmt.Errorf("received nil response from request")
-	}
-
-	if response.StatusCode == http.StatusUnauthorized {
+	if response != nil && response.StatusCode == http.StatusUnauthorized {
 		utils.Println("Needs to re-authenticate as the response is UNAUTHORIZED (401)")
 		DoRequestUserToAuthenticate(false)
 		qoveryStruct, response, err = request(true)