From fad86b9faf3f708ea7dbb801f56bd2903fc03b24 Mon Sep 17 00:00:00 2001 From: Krasimir Shontov Date: Tue, 23 Mar 2021 13:50:38 +0200 Subject: [PATCH] [HOTFIX] Fix bug with error transport (#1785) * Fix bug with error transport. * Fix values.yaml --- chart/compass/values.yaml | 2 +- .../operations-controller/internal/webhook/client.go | 8 ++++---- components/operations-controller/main.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/chart/compass/values.yaml b/chart/compass/values.yaml index 65e79ed044..48556275f3 100644 --- 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 index 86cea6f07a..5a5fd2c1ac 100644 --- a/components/operations-controller/internal/webhook/client.go +++ b/components/operations-controller/internal/webhook/client.go @@ -116,6 +116,10 @@ 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 @@ -123,10 +127,6 @@ func (c *client) Do(ctx context.Context, request *Request) (*web_hook.Response, 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 index 6563fb8f86..fcf177a6ee 100644 --- 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,