refactor(settings): use request retry logic of core instead of custom one (#1894)

The settings client had its own retry implementation, leading to duplicated code and more maintenance if a change is needed on both ends. Now it's using the retry logic of core and not using a custom one anymore.

Author: Kirdock

pkg/client/dtclient/retry.go

@@ -81,21 +81,6 @@ func SendWithRetry(ctx context.Context, sendWithBody SendRequestWithBody, endpoi
 	return nil, fmt.Errorf("HTTP send request %s failed after %d retries: %w", endpoint, setting.MaxRetries, err)
 }
 
-// SendWithRetryWithInitialTry will try to call sendWithBody and if it didn't succeed call [SendWithRetry]
-func SendWithRetryWithInitialTry(ctx context.Context, sendWithBody SendRequestWithBody, endpoint string, requestOptions corerest.RequestOptions, body []byte, setting RetrySetting) (*coreapi.Response, error) {
-	resp, err := coreapi.AsResponseOrError(sendWithBody(ctx, endpoint, bytes.NewReader(body), requestOptions))
-	if err == nil {
-		return resp, nil
-	}
-
-	apiError := coreapi.APIError{}
-	if !errors.As(err, &apiError) || !corerest.ShouldRetry(apiError.StatusCode) {
-		return nil, err
-	}
-
-	return SendWithRetry(ctx, sendWithBody, endpoint, requestOptions, body, setting)
-}
-
 func GetWithRetry(ctx context.Context, c corerest.Client, endpoint string, requestOptions corerest.RequestOptions, settings RetrySetting) (resp *coreapi.Response, err error) {
 	resp, err = coreapi.AsResponseOrError(c.GET(ctx, endpoint, requestOptions))
 	if err == nil {

pkg/client/dtclient/retry_test.go

@@ -115,18 +115,6 @@ func Test_sendWithRetryReturnsIfNotSuccess(t *testing.T) {
 	assert.Equal(t, 400, apiError.StatusCode)
 }
 
-func Test_SendWithRetryWithInitialTry_RetryIgnoredIfForbidden(t *testing.T) {
-	i := 0
-	mockCall := SendRequestWithBody(func(ctx context.Context, url string, data io.Reader, options corerest.RequestOptions) (*http.Response, error) {
-		i++
-		return nil, coreapi.APIError{StatusCode: http.StatusForbidden}
-	})
-
-	_, err := SendWithRetryWithInitialTry(t.Context(), mockCall, "some/path", corerest.RequestOptions{}, []byte("body"), RetrySetting{MaxRetries: 10})
-	require.Error(t, err)
-	assert.Equal(t, 1, i)
-}
-
 func Test_GetWithRetry_RetryIgnoredIfForbidden(t *testing.T) {
 	i := 0
 	mux := http.NewServeMux()

pkg/client/dtclient/settings_client.go

@@ -38,6 +38,7 @@ import (
 	"github.com/dynatrace/dynatrace-configuration-as-code/v2/internal/idutils"
 	"github.com/dynatrace/dynatrace-configuration-as-code/v2/internal/log"
 	"github.com/dynatrace/dynatrace-configuration-as-code/v2/internal/log/field"
+	"github.com/dynatrace/dynatrace-configuration-as-code/v2/internal/pointer"
 	"github.com/dynatrace/dynatrace-configuration-as-code/v2/internal/version"
 	dtVersion "github.com/dynatrace/dynatrace-configuration-as-code/v2/pkg/client/version"
 	"github.com/dynatrace/dynatrace-configuration-as-code/v2/pkg/config"
@@ -580,7 +581,18 @@ func (d *SettingsClient) Upsert(ctx context.Context, obj SettingsObject, upsertO
 		retrySetting = *upsertOptions.OverrideRetry
 	}
 
-	resp, err := SendWithRetryWithInitialTry(ctx, d.client.POST, d.settingsObjectAPIPath, corerest.RequestOptions{CustomShouldRetryFunc: corerest.RetryIfTooManyRequests}, payload, retrySetting)
+	httpResp, err := d.client.POST(ctx, d.settingsObjectAPIPath, bytes.NewReader(payload), corerest.RequestOptions{
+		CustomShouldRetryFunc: func(response *http.Response) bool {
+			return corerest.ShouldRetry(response.StatusCode)
+		},
+		MaxRetries:      pointer.Pointer(retrySetting.MaxRetries),
+		DelayAfterRetry: pointer.Pointer(retrySetting.WaitTime),
+	})
+	if err != nil {
+		d.settingsCache.Delete(obj.SchemaId)
+		return DynatraceEntity{}, fmt.Errorf("failed to create or update settings object with externalId %s: %w", externalID, err)
+	}
+	resp, err := coreapi.NewResponseFromHTTPResponse(httpResp)
 	if err != nil {
 		d.settingsCache.Delete(obj.SchemaId)
 		return DynatraceEntity{}, fmt.Errorf("failed to create or update settings object with externalId %s: %w", externalID, err)