Skip to content

chore(objectstorage): add retry on 429 for objectstorage control plane #1764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
h3adex wants to merge 6 commits into from
Closed

chore(objectstorage): add retry on 429 for objectstorage control plane #1764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7a31d7e
chore(objectstorage): add retry on 429 for objectstorage control plane
h3adex Sep 11, 2026
20828e7
review changes
h3adex Sep 14, 2026
adacdfb
chore(objectstorage): add retry on 429 for objectstorage control plane
h3adex Sep 11, 2026
0c8d418
review changes
h3adex Sep 14, 2026
1f9d728
review changes
h3adex Sep 16, 2026
62e2e24
Merge remote-tracking branch 'origin/dev/fix-429-error' into dev/fix-…
h3adex Sep 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/data-sources/objectstorage_compliance_lock.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
page_title: "stackit_objectstorage_compliance_lock Data Source - stackit"
subcategory: ""
description: |-
ObjectStorage compliance lock resource schema. Must have a region specified in the provider configuration.
ObjectStorage compliance lock data source schema. Must have a region specified in the provider configuration.
---

# stackit_objectstorage_compliance_lock (Data Source)

ObjectStorage compliance lock resource schema. Must have a `region` specified in the provider configuration.
ObjectStorage compliance lock data source schema. Must have a `region` specified in the provider configuration.

## Example Usage

Expand Down
9 changes: 7 additions & 2 deletions stackit/internal/services/objectstorage/bucket/datasource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,11 @@ func (r *bucketDataSource) Read(ctx context.Context, req datasource.ReadRequest,
ctx = tflog.SetField(ctx, "name", bucketName)
ctx = tflog.SetField(ctx, "region", region)

bucketResp, err := r.client.DefaultAPI.GetBucket(ctx, projectId, region, bucketName).Execute()
bucketResp, err := utils.RetryRequest(
ctx,
r.client.DefaultAPI.GetBucket(ctx, projectId, region, bucketName).Execute,
objectstorageUtils.RateLimitRetryConfig,
)
if err != nil {
utils.LogError(
ctx,
Expand All @@ -139,7 +143,8 @@ func (r *bucketDataSource) Read(ctx context.Context, req datasource.ReadRequest,
"Reading bucket",
fmt.Sprintf("Bucket with name %q does not exist in project %q.", bucketName, projectId),
map[int]string{
http.StatusForbidden: fmt.Sprintf("Project with ID %q not found or forbidden access", projectId),
http.StatusForbidden: fmt.Sprintf("Project with ID %q not found or forbidden access", projectId),
http.StatusTooManyRequests: objectstorageUtils.RateLimitErrMsg,
},
)
resp.State.RemoveResource(ctx)
Expand Down
30 changes: 24 additions & 6 deletions stackit/internal/services/objectstorage/bucket/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,15 @@ func (r *bucketResource) Create(ctx context.Context, req resource.CreateRequest,
}

// Create new bucket
_, err = r.client.DefaultAPI.CreateBucket(ctx, projectId, region, bucketName).ObjectLockEnabled(model.ObjectLock.ValueBool()).Execute()
_, err = utils.RetryRequest(
ctx,
r.client.DefaultAPI.CreateBucket(ctx, projectId, region, bucketName).ObjectLockEnabled(model.ObjectLock.ValueBool()).Execute,
objectstorageUtils.RateLimitRetryConfig,
)
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating bucket", fmt.Sprintf("Calling API: %v", err))
utils.LogError(ctx, &resp.Diagnostics, err, "Error creating bucket", fmt.Sprintf("Calling API: %v", err),
map[int]string{http.StatusTooManyRequests: objectstorageUtils.RateLimitErrMsg},
)
return
}

Expand Down Expand Up @@ -275,14 +281,20 @@ func (r *bucketResource) Read(ctx context.Context, req resource.ReadRequest, res
ctx = tflog.SetField(ctx, "name", bucketName)
ctx = tflog.SetField(ctx, "region", region)

bucketResp, err := r.client.DefaultAPI.GetBucket(ctx, projectId, region, bucketName).Execute()
bucketResp, err := utils.RetryRequest(
ctx,
r.client.DefaultAPI.GetBucket(ctx, projectId, region, bucketName).Execute,
objectstorageUtils.RateLimitRetryConfig,
)
if err != nil {
var oapiErr *oapierror.GenericOpenAPIError
if errors.As(err, &oapiErr) && oapiErr.StatusCode == http.StatusNotFound {
resp.State.RemoveResource(ctx)
return
}
core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading bucket", fmt.Sprintf("Calling API: %v", err))
utils.LogError(ctx, &resp.Diagnostics, err, "Error reading bucket", fmt.Sprintf("Calling API: %v", err),
map[int]string{http.StatusTooManyRequests: objectstorageUtils.RateLimitErrMsg},
)
return
}

Expand Down Expand Up @@ -330,7 +342,11 @@ func (r *bucketResource) Delete(ctx context.Context, req resource.DeleteRequest,
ctx = tflog.SetField(ctx, "region", region)

// Delete existing bucket
_, err := r.client.DefaultAPI.DeleteBucket(ctx, projectId, region, bucketName).Execute()
_, err := utils.RetryRequest(
ctx,
r.client.DefaultAPI.DeleteBucket(ctx, projectId, region, bucketName).Execute,
objectstorageUtils.RateLimitRetryConfig,
)
if err != nil {
var oapiErr *oapierror.GenericOpenAPIError
if errors.As(err, &oapiErr) {
Expand All @@ -343,7 +359,9 @@ func (r *bucketResource) Delete(ctx context.Context, req resource.DeleteRequest,
return
}
}
core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting bucket", fmt.Sprintf("Calling API: %v", err))
utils.LogError(ctx, &resp.Diagnostics, err, "Error deleting bucket", fmt.Sprintf("Calling API: %v", err),
map[int]string{http.StatusTooManyRequests: objectstorageUtils.RateLimitErrMsg},
)
}

ctx = core.LogResponse(ctx)
Expand Down
11 changes: 8 additions & 3 deletions stackit/internal/services/objectstorage/compliance-lock/datasource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func (d *compliancelockDataSource) Configure(ctx context.Context, req datasource
// Schema defines the schema for the resource.
func (d *compliancelockDataSource) Schema(_ context.Context, _ datasource.SchemaRequest, resp *datasource.SchemaResponse) {
descriptions := map[string]string{
"main": "ObjectStorage compliance lock resource schema. Must have a `region` specified in the provider configuration.",
"main": "ObjectStorage compliance lock data source schema. Must have a `region` specified in the provider configuration.",
"id": "Terraform's internal resource identifier. It is structured as \"`project_id`,`region`\".",
"project_id": "STACKIT Project ID to which the compliance lock is associated.",
"region": "The resource region. If not defined, the provider region is used.",
Expand Down Expand Up @@ -110,7 +110,11 @@ func (d *compliancelockDataSource) Read(ctx context.Context, req datasource.Read
ctx = tflog.SetField(ctx, "project_id", projectId)
ctx = tflog.SetField(ctx, "region", region)

complianceResp, err := d.client.DefaultAPI.GetComplianceLock(ctx, projectId, region).Execute()
complianceResp, err := utils.RetryRequest(
ctx,
d.client.DefaultAPI.GetComplianceLock(ctx, projectId, region).Execute,
objectstorageUtils.RateLimitRetryConfig,
)
if err != nil {
utils.LogError(
ctx,
Expand All @@ -119,7 +123,8 @@ func (d *compliancelockDataSource) Read(ctx context.Context, req datasource.Read
"Reading compliance lock",
fmt.Sprintf("Compliance lock does not exist in project %q.", projectId),
map[int]string{
http.StatusForbidden: fmt.Sprintf("Project with ID %q not found or forbidden access", projectId),
http.StatusForbidden: fmt.Sprintf("Project with ID %q not found or forbidden access", projectId),
http.StatusTooManyRequests: objectstorageUtils.RateLimitErrMsg,
Comment thread
h3adex marked this conversation as resolved.
},
)
resp.State.RemoveResource(ctx)
Expand Down
40 changes: 32 additions & 8 deletions stackit/internal/services/objectstorage/compliance-lock/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,20 +165,32 @@ func (r *compliancelockResource) Create(ctx context.Context, req resource.Create
ctx = tflog.SetField(ctx, "project_id", projectId)
ctx = tflog.SetField(ctx, "region", region)

complianceResp, err := r.client.DefaultAPI.CreateComplianceLock(ctx, projectId, region).Execute()
complianceResp, err := utils.RetryRequest(
ctx,
r.client.DefaultAPI.CreateComplianceLock(ctx, projectId, region).Execute,
objectstorageUtils.RateLimitRetryConfig,
)
if err != nil {
var oapiErr *oapierror.GenericOpenAPIError
ok := errors.As(err, &oapiErr)

if !(ok && oapiErr.StatusCode == http.StatusConflict) {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating compliance lock", fmt.Sprintf("Calling API: %v", err))
utils.LogError(ctx, &resp.Diagnostics, err, "Error creating compliance lock", fmt.Sprintf("Calling API: %v", err),
map[int]string{http.StatusTooManyRequests: objectstorageUtils.RateLimitErrMsg},
)
return
}

tflog.Info(ctx, "Compliance lock is already enabled for this project. Please check duplicate resources.")
complianceResp, err = r.client.DefaultAPI.GetComplianceLock(ctx, projectId, region).Execute()
complianceResp, err = utils.RetryRequest(
ctx,
r.client.DefaultAPI.GetComplianceLock(ctx, projectId, region).Execute,
objectstorageUtils.RateLimitRetryConfig,
)
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading compliance lock", fmt.Sprintf("Calling API: %v", err))
utils.LogError(ctx, &resp.Diagnostics, err, "Error reading compliance lock", fmt.Sprintf("Calling API: %v", err),
map[int]string{http.StatusTooManyRequests: objectstorageUtils.RateLimitErrMsg},
)
return
}
}
Expand Down Expand Up @@ -216,14 +228,20 @@ func (r *compliancelockResource) Read(ctx context.Context, req resource.ReadRequ
ctx = tflog.SetField(ctx, "project_id", projectId)
ctx = tflog.SetField(ctx, "region", region)

complianceResp, err := r.client.DefaultAPI.GetComplianceLock(ctx, projectId, region).Execute()
complianceResp, err := utils.RetryRequest(
ctx,
r.client.DefaultAPI.GetComplianceLock(ctx, projectId, region).Execute,
objectstorageUtils.RateLimitRetryConfig,
)
if err != nil {
oapiErr, ok := err.(*oapierror.GenericOpenAPIError) //nolint:errorlint //complaining that error.As should be used to catch wrapped errors, but this error should not be wrapped
if ok && oapiErr.StatusCode == http.StatusNotFound {
resp.State.RemoveResource(ctx)
return
}
core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading compliance lock", fmt.Sprintf("Calling API: %v", err))
utils.LogError(ctx, &resp.Diagnostics, err, "Error reading compliance lock", fmt.Sprintf("Calling API: %v", err),
map[int]string{http.StatusTooManyRequests: objectstorageUtils.RateLimitErrMsg},
)
return
}

Expand Down Expand Up @@ -268,9 +286,15 @@ func (r *compliancelockResource) Delete(ctx context.Context, req resource.Delete
ctx = tflog.SetField(ctx, "project_id", projectId)
ctx = tflog.SetField(ctx, "region", region)

_, err := r.client.DefaultAPI.DeleteComplianceLock(ctx, projectId, region).Execute()
_, err := utils.RetryRequest(
ctx,
r.client.DefaultAPI.DeleteComplianceLock(ctx, projectId, region).Execute,
objectstorageUtils.RateLimitRetryConfig,
)
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting compliance lock", fmt.Sprintf("Calling API: %v", err))
utils.LogError(ctx, &resp.Diagnostics, err, "Error deleting compliance lock", fmt.Sprintf("Calling API: %v", err),
map[int]string{http.StatusTooManyRequests: objectstorageUtils.RateLimitErrMsg},
)
return
}

Expand Down
9 changes: 7 additions & 2 deletions stackit/internal/services/objectstorage/credential/datasource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,11 @@ func (r *credentialDataSource) Read(ctx context.Context, req datasource.ReadRequ
ctx = tflog.SetField(ctx, "credential_id", credentialId)
ctx = tflog.SetField(ctx, "region", region)

credentialsGroupResp, err := r.client.DefaultAPI.ListAccessKeys(ctx, projectId, region).CredentialsGroup(credentialsGroupId).Execute()
credentialsGroupResp, err := utils.RetryRequest(
ctx,
r.client.DefaultAPI.ListAccessKeys(ctx, projectId, region).CredentialsGroup(credentialsGroupId).Execute,
objectstorageUtils.RateLimitRetryConfig,
)
if err != nil {
utils.LogError(
ctx,
Expand All @@ -142,7 +146,8 @@ func (r *credentialDataSource) Read(ctx context.Context, req datasource.ReadRequ
"Reading credential",
fmt.Sprintf("Credential group with ID %q does not exist in project %q.", credentialsGroupId, projectId),
map[int]string{
http.StatusForbidden: fmt.Sprintf("Project with ID %q not found or forbidden access", projectId),
http.StatusForbidden: fmt.Sprintf("Project with ID %q not found or forbidden access", projectId),
http.StatusTooManyRequests: objectstorageUtils.RateLimitErrMsg,
},
)
resp.State.RemoveResource(ctx)
Expand Down
30 changes: 24 additions & 6 deletions stackit/internal/services/objectstorage/credential/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,9 +294,15 @@ func (r *credentialResource) Create(ctx context.Context, req resource.CreateRequ
return
}
// Create new credential
credentialResp, err := r.client.DefaultAPI.CreateAccessKey(ctx, projectId, region).CredentialsGroup(credentialsGroupId).CreateAccessKeyPayload(*payload).Execute()
credentialResp, err := utils.RetryRequest(
ctx,
r.client.DefaultAPI.CreateAccessKey(ctx, projectId, region).CredentialsGroup(credentialsGroupId).CreateAccessKeyPayload(*payload).Execute,
objectstorageUtils.RateLimitRetryConfig,
)
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating credential", fmt.Sprintf("Calling API: %v", err))
utils.LogError(ctx, &resp.Diagnostics, err, "Error creating credential", fmt.Sprintf("Calling API: %v", err),
map[int]string{http.StatusTooManyRequests: objectstorageUtils.RateLimitErrMsg},
)
return
}

Expand Down Expand Up @@ -377,7 +383,9 @@ func (r *credentialResource) Read(ctx context.Context, req resource.ReadRequest,

found, err := readCredentials(ctx, &model, region, r.client)
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading credential", fmt.Sprintf("Finding credential: %v", err))
utils.LogError(ctx, &resp.Diagnostics, err, "Error reading credential", fmt.Sprintf("Finding credential: %v", err),
map[int]string{http.StatusTooManyRequests: objectstorageUtils.RateLimitErrMsg},
)
return
}

Expand Down Expand Up @@ -454,13 +462,19 @@ func (r *credentialResource) Delete(ctx context.Context, req resource.DeleteRequ
ctx = tflog.SetField(ctx, "region", region)

// Delete existing credential
_, err := r.client.DefaultAPI.DeleteAccessKey(ctx, projectId, region, credentialId).CredentialsGroup(credentialsGroupId).Execute()
_, err := utils.RetryRequest(
ctx,
r.client.DefaultAPI.DeleteAccessKey(ctx, projectId, region, credentialId).CredentialsGroup(credentialsGroupId).Execute,
objectstorageUtils.RateLimitRetryConfig,
)
if err != nil {
var oapiErr *oapierror.GenericOpenAPIError
if errors.As(err, &oapiErr) && oapiErr.StatusCode == http.StatusNotFound {
return
}
core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting credential", fmt.Sprintf("Calling API: %v", err))
utils.LogError(ctx, &resp.Diagnostics, err, "Error deleting credential", fmt.Sprintf("Calling API: %v", err),
map[int]string{http.StatusTooManyRequests: objectstorageUtils.RateLimitErrMsg},
)
return
}

Expand Down Expand Up @@ -560,7 +574,11 @@ func readCredentials(ctx context.Context, model *Model, region string, client *o
credentialsGroupId := model.CredentialsGroupId.ValueString()
credentialId := model.CredentialId.ValueString()

credentialsGroupResp, err := client.DefaultAPI.ListAccessKeys(ctx, projectId, region).CredentialsGroup(credentialsGroupId).Execute()
credentialsGroupResp, err := utils.RetryRequest(
ctx,
client.DefaultAPI.ListAccessKeys(ctx, projectId, region).CredentialsGroup(credentialsGroupId).Execute,
objectstorageUtils.RateLimitRetryConfig,
)
if err != nil {
var oapiErr *oapierror.GenericOpenAPIError
if errors.As(err, &oapiErr) && oapiErr.StatusCode == http.StatusNotFound {
Expand Down
30 changes: 24 additions & 6 deletions stackit/internal/services/objectstorage/credentialsgroup/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,15 @@ func (r *credentialsGroupResource) Create(ctx context.Context, req resource.Crea
}

// Create new credentials group
got, err := r.client.DefaultAPI.CreateCredentialsGroup(ctx, projectId, region).CreateCredentialsGroupPayload(createCredentialsGroupPayload).Execute()
got, err := utils.RetryRequest(
ctx,
r.client.DefaultAPI.CreateCredentialsGroup(ctx, projectId, region).CreateCredentialsGroupPayload(createCredentialsGroupPayload).Execute,
objectstorageUtils.RateLimitRetryConfig,
)
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating credentials group", fmt.Sprintf("Calling API: %v", err))
utils.LogError(ctx, &resp.Diagnostics, err, "Error creating credentials group", fmt.Sprintf("Calling API: %v", err),
map[int]string{http.StatusTooManyRequests: objectstorageUtils.RateLimitErrMsg},
)
return
}

Expand Down Expand Up @@ -262,7 +268,9 @@ func (r *credentialsGroupResource) Read(ctx context.Context, req resource.ReadRe

found, err := readCredentialsGroups(ctx, &model, region, r.client.DefaultAPI)
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading credentialsGroup", fmt.Sprintf("getting credential group from list of credentials groups: %v", err))
utils.LogError(ctx, &resp.Diagnostics, err, "Error reading credentialsGroup", fmt.Sprintf("getting credential group from list of credentials groups: %v", err),
map[int]string{http.StatusTooManyRequests: objectstorageUtils.RateLimitErrMsg},
)
return
}

Expand Down Expand Up @@ -310,14 +318,20 @@ func (r *credentialsGroupResource) Delete(ctx context.Context, req resource.Dele
ctx = tflog.SetField(ctx, "region", region)

// Delete existing credentials group
_, err := r.client.DefaultAPI.DeleteCredentialsGroup(ctx, projectId, region, credentialsGroupId).Execute()
_, err := utils.RetryRequest(
ctx,
r.client.DefaultAPI.DeleteCredentialsGroup(ctx, projectId, region, credentialsGroupId).Execute,
objectstorageUtils.RateLimitRetryConfig,
)
if err != nil {
var oapiErr *oapierror.GenericOpenAPIError
if errors.As(err, &oapiErr) && oapiErr.StatusCode == http.StatusNotFound {
resp.State.RemoveResource(ctx)
return
}
core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting credentials group", fmt.Sprintf("Calling API: %v", err))
utils.LogError(ctx, &resp.Diagnostics, err, "Error deleting credentials group", fmt.Sprintf("Calling API: %v", err),
map[int]string{http.StatusTooManyRequests: objectstorageUtils.RateLimitErrMsg},
)
return
}

Expand Down Expand Up @@ -390,7 +404,11 @@ func readCredentialsGroups(ctx context.Context, model *Model, region string, cli
return found, fmt.Errorf("missing configuration: either name or credentials group id must be provided")
}

credentialsGroupsResp, err := client.ListCredentialsGroups(ctx, model.ProjectId.ValueString(), region).Execute()
credentialsGroupsResp, err := utils.RetryRequest(
ctx,
client.ListCredentialsGroups(ctx, model.ProjectId.ValueString(), region).Execute,
objectstorageUtils.RateLimitRetryConfig,
)
if err != nil {
var oapiErr *oapierror.GenericOpenAPIError
if errors.As(err, &oapiErr) && oapiErr.StatusCode == http.StatusNotFound {
Expand Down
11 changes: 9 additions & 2 deletions stackit/internal/services/objectstorage/default-retention/datasource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
objectstorageUtils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/objectstorage/utils"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/utils"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
)

Expand Down Expand Up @@ -110,14 +111,20 @@ func (d *defaultRetentionDataSource) Read(ctx context.Context, req datasource.Re
ctx = tflog.SetField(ctx, "region", region)

// Read default-retention
result, err := d.client.DefaultAPI.GetDefaultRetention(ctx, projectId, region, bucketName).Execute()
result, err := utils.RetryRequest(
ctx,
d.client.DefaultAPI.GetDefaultRetention(ctx, projectId, region, bucketName).Execute,
objectstorageUtils.RateLimitRetryConfig,
)
if err != nil {
var oapiErr *oapierror.GenericOpenAPIError
if errors.As(err, &oapiErr) && oapiErr.StatusCode == http.StatusNotFound {
resp.State.RemoveResource(ctx)
return
}
core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading default-retention", fmt.Sprintf("Calling API: %v", err))
utils.LogError(ctx, &resp.Diagnostics, err, "Error reading default-retention", fmt.Sprintf("Calling API: %v", err),
map[int]string{http.StatusTooManyRequests: objectstorageUtils.RateLimitErrMsg},
)
return
}

Expand Down
Loading
Loading