S-108582 Improve error handling and redirection

http/http_client.go

@@ -110,24 +110,12 @@ func (httpClient *HttpClient) sendRequest(ctx context.Context, method string, pa
 	})
 }
 
-// sendRequestWithCustomHeaders sends an HTTP request with a custom configuration and headers.
+// sendRequestWithCustomHeaders sends an HTTP request with a custom configuration and headers, returns HTTP response body.
 func (httpClient *HttpClient) sendRequestWithCustomHeaders(ctx context.Context, config *RequestConfig) ([]byte, error) {
-	client := httpClient.client
-	if client == nil {
-		return nil, fmt.Errorf("http client is uninitialized")
-	}
-	theUrl := httpClient.createUrl(config.Path, config.QueryParams...)
-	req, err := http.NewRequestWithContext(ctx, config.method, theUrl, bytes.NewBuffer(config.Body))
+	resp, err := httpClient.doSendHttpRequest(ctx, config)
 	if err != nil {
 		return nil, err
 	}
-	setHeaders(req, httpClient.headers)
-	setHeaders(req, config.Headers)
-
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, fmt.Errorf("%s error: %v", config.method, err)
-	}
 
 	defer func(Body io.ReadCloser) {
 		if deferredErr := Body.Close(); deferredErr != nil {
@@ -140,14 +128,39 @@ func (httpClient *HttpClient) sendRequestWithCustomHeaders(ctx context.Context,
 		return nil, fmt.Errorf("read body error: %v", err)
 	}
 
-	//TODO: handle 3xx statuses
-	if resp.StatusCode >= 299 {
+	if resp.StatusCode >= 300 && resp.StatusCode < 400 {
+		return nil, fmt.Errorf("%v redirect status: use sendHttpRequest instead to handle redirection", resp.StatusCode)
+	}
+
+	if resp.StatusCode >= 400 {
 		return data, fmt.Errorf("%v - %s", resp.StatusCode, string(data[:]))
 	}
 
 	return data, err
 }
 
+// doSendHttpRequest sends an HTTP request with a custom configuration and headers, returns whole HTTP response.
+func (httpClient *HttpClient) doSendHttpRequest(ctx context.Context, config *RequestConfig) (*http.Response, error) {
+	client := httpClient.client
+	if client == nil {
+		return nil, fmt.Errorf("http client is uninitialized")
+	}
+	theUrl := httpClient.createUrl(config.Path, config.QueryParams...)
+	req, err := http.NewRequestWithContext(ctx, config.method, theUrl, bytes.NewBuffer(config.Body))
+	if err != nil {
+		return nil, err
+	}
+	setHeaders(req, httpClient.headers)
+	setHeaders(req, config.Headers)
+
+	resp, err := client.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("%s error: %v", config.method, err)
+	}
+
+	return resp, nil
+}
+
 // setHeaders sets the headers of an HTTP request based on the provided map of headers.
 func setHeaders(request *http.Request, headers map[string][]string) {
 	if headers != nil {