[HOTFIX] Fix bug with error transport (#1785)

* Fix bug with error transport. * Fix values.yaml
kyma-incubator · Mar 23, 2021 · fad86b9 · fad86b9
1 parent f251517
commit fad86b9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/chart/compass/values.yaml b/chart/compass/values.yaml
@@ -28,7 +28,7 @@ global:
       version: "PR-1750"
     operations_controller:
       dir:
-      version: "PR-1781"
+      version: "PR-1785"
     tenant_fetcher:
       dir:
       version: "PR-1750"

diff --git a/components/operations-controller/internal/webhook/client.go b/components/operations-controller/internal/webhook/client.go
@@ -116,17 +116,17 @@ func (c *client) Do(ctx context.Context, request *Request) (*web_hook.Response,
 		return nil, recerr.NewFatalReconcileErrorFromExisting(errors.Wrap(err, "unable to parse response into webhook output template"))
 	}
 
+	if err = checkForGoneStatus(resp, response.GoneStatusCode); err != nil {
+		return response, err
+	}
+
 	isLocationEmpty := response.Location != nil && *response.Location == ""
 	isAsyncWebhook := webhook.Mode != nil && *webhook.Mode == graphql.WebhookModeAsync
 
 	if isLocationEmpty && isAsyncWebhook {
 		return nil, errors.New("missing location url after executing async webhook")
 	}
 
-	if err = checkForGoneStatus(resp, response.GoneStatusCode); err != nil {
-		return response, err
-	}
-
 	return response, checkForErr(resp, response.SuccessStatusCode, response.Error)
 }
 

diff --git a/components/operations-controller/main.go b/components/operations-controller/main.go
@@ -126,7 +126,7 @@ func fatalOnError(err error) {
 }
 
 func prepareHttpClient(cfg *httputil.Config) (*http.Client, error) {
-	httpTransport := httputil.NewCorrelationIDTransport(httputil.NewErrorHandlerTransport(httputil.NewHTTPTransport(cfg)))
+	httpTransport := httputil.NewCorrelationIDTransport(httputil.NewHTTPTransport(cfg))
 
 	unsecuredClient := &http.Client{
 		Transport: httpTransport,