feat: update default retry

docs/guides/retry-configuration.md

@@ -48,3 +48,12 @@ The schema of these retry attributes is as follows:
 - `response_is_nil` - If the response is nil, should the request be retried. The default value is `true`.
 - `status_forbidden` - If the status code is 403, should the request be retried. The default value is `false`.
 - `status_not_found` - If the status code is 404, should the request be retried. The default value is `false`.
+
+## Default resource-specific retry configuration
+
+If you do not configure any retry values, the provider will use the following:
+
+For the initial create/read/update/delete operation we will retry on HTTP 429 status codes for a maximum time of 2 minutes.
+
+For the read-after-create operation we will retry on HTTP 404, 403 status codes as well as a nill response.
+We will do this up to the operation timeout configured in the `timeouts {}` block.

internal/clients/data_plane_client.go

@@ -518,7 +518,7 @@ func isDataPlaneRetryable(ctx context.Context, retryclient DataPlaneClientRetrya
 
 // ConfigureClientWithCustomRetry configures the client with a custom retry configuration if supplied.
 // If the retry configuration is null or unknown, it will use the default retry configuration.
-// If the supplied context has a deadline, it will use the deadline as the max elapsed time.
+// If the supplied context has a deadline, it will use the deadline as the max elapsed time when a custom retry is provided.
 func (client *DataPlaneClient) ConfigureClientWithCustomRetry(ctx context.Context, retry retry.RetryValue) DataPlaneRequester {
 	// configure default retry configuration
 	maxElapsed := 2 * time.Minute
@@ -529,11 +529,7 @@ func (client *DataPlaneClient) ConfigureClientWithCustomRetry(ctx context.Contex
 	)
 	errRegExps := []regexp.Regexp{}
 	statusCodes := retry.GetDefaultRetryableStatusCodes()
-	dataCallbackFuncs := []func(d interface{}) bool{
-		func(d interface{}) bool {
-			return d == nil
-		},
-	}
+	dataCallbackFuncs := []func(d interface{}) bool{}
 
 	if !retry.IsNull() && !retry.IsUnknown() {
 		tflog.Debug(ctx, "using custom retry configuration")
@@ -548,8 +544,12 @@ func (client *DataPlaneClient) ConfigureClientWithCustomRetry(ctx context.Contex
 		if retry.StatusNotFound.ValueBool() {
 			statusCodes = append(statusCodes, http.StatusNotFound)
 		}
-		if !retry.ResponseIsNil.ValueBool() {
-			dataCallbackFuncs = nil
+		if retry.ResponseIsNil.ValueBool() {
+			dataCallbackFuncs = []func(d interface{}) bool{
+				func(d interface{}) bool {
+					return d == nil
+				},
+			}
 		}
 		backOff = backoff.NewExponentialBackOff(
 			backoff.WithInitialInterval(retry.GetIntervalSecondsAsDuration()),

internal/clients/resource_client.go

@@ -696,7 +696,7 @@ func isRetryable(ctx context.Context, retryclient ResourceClientRetryableErrors,
 
 // ConfigureClientWithCustomRetry configures the client with a custom retry configuration if supplied.
 // If the retry configuration is null or unknown, it will use the default retry configuration.
-// If the supplied context has a deadline, it will use the deadline as the max elapsed time.
+// If the supplied context has a deadline, it will use the deadline as the max elapsed time when a custom retry is provided.
 func (client *ResourceClient) ConfigureClientWithCustomRetry(ctx context.Context, retry retry.RetryValue) Requester {
 	// configure default retry configuration
 	maxElapsed := 2 * time.Minute
@@ -707,11 +707,7 @@ func (client *ResourceClient) ConfigureClientWithCustomRetry(ctx context.Context
 	)
 	errRegExps := []regexp.Regexp{}
 	statusCodes := retry.GetDefaultRetryableStatusCodes()
-	dataCallbackFuncs := []func(d interface{}) bool{
-		func(d interface{}) bool {
-			return d == nil
-		},
-	}
+	dataCallbackFuncs := []func(d interface{}) bool{}
 
 	if !retry.IsNull() && !retry.IsUnknown() {
 		tflog.Debug(ctx, "using custom retry configuration")
@@ -726,8 +722,12 @@ func (client *ResourceClient) ConfigureClientWithCustomRetry(ctx context.Context
 		if retry.StatusNotFound.ValueBool() {
 			statusCodes = append(statusCodes, http.StatusNotFound)
 		}
-		if !retry.ResponseIsNil.ValueBool() {
-			dataCallbackFuncs = nil
+		if retry.ResponseIsNil.ValueBool() {
+			dataCallbackFuncs = []func(d interface{}) bool{
+				func(d interface{}) bool {
+					return d == nil
+				},
+			}
 		}
 		backOff = backoff.NewExponentialBackOff(
 			backoff.WithInitialInterval(retry.GetIntervalSecondsAsDuration()),

internal/retry/retryable_errors.go

@@ -18,7 +18,7 @@ var (
 	_ basetypes.ObjectTypable  = RetryType{}
 	_ basetypes.ObjectValuable = RetryValue{}
 
-	defaultRetryableStatusCodes = []int{}
+	defaultRetryableStatusCodes = []int{429}
 )
 
 const (

templates/guides/retry-configuration.md

@@ -48,3 +48,12 @@ The schema of these retry attributes is as follows:
 - `response_is_nil` - If the response is nil, should the request be retried. The default value is `true`.
 - `status_forbidden` - If the status code is 403, should the request be retried. The default value is `false`.
 - `status_not_found` - If the status code is 404, should the request be retried. The default value is `false`.
+
+## Default resource-specific retry configuration
+
+If you do not configure any retry values, the provider will use the following:
+
+For the initial create/read/update/delete operation we will retry on HTTP 429 status codes for a maximum time of 2 minutes.
+
+For the read-after-create operation we will retry on HTTP 404, 403 status codes as well as a nill response.
+We will do this up to the operation timeout configured in the `timeouts {}` block.