From 8f2435be05ec7be7c0367892b82c093bbee43557 Mon Sep 17 00:00:00 2001 From: Marcel Jacek <72880145+marceljk@users.noreply.github.com> Date: Fri, 21 Feb 2025 15:12:39 +0100 Subject: [PATCH] fix: new region field in object storage forces recreation (#689) --- stackit/internal/services/objectstorage/bucket/resource.go | 3 +++ stackit/internal/services/objectstorage/credential/resource.go | 3 +++ .../services/objectstorage/credentialsgroup/resource.go | 3 +++ 3 files changed, 9 insertions(+) diff --git a/stackit/internal/services/objectstorage/bucket/resource.go b/stackit/internal/services/objectstorage/bucket/resource.go index 65727a61..ce6e0981 100644 --- a/stackit/internal/services/objectstorage/bucket/resource.go +++ b/stackit/internal/services/objectstorage/bucket/resource.go @@ -248,6 +248,9 @@ func (r *bucketResource) Read(ctx context.Context, req resource.ReadRequest, res projectId := model.ProjectId.ValueString() bucketName := model.Name.ValueString() region := model.Region.ValueString() + if region == "" { + region = r.providerData.Region + } ctx = tflog.SetField(ctx, "project_id", projectId) ctx = tflog.SetField(ctx, "name", bucketName) diff --git a/stackit/internal/services/objectstorage/credential/resource.go b/stackit/internal/services/objectstorage/credential/resource.go index 5358fee7..d9c1e53b 100644 --- a/stackit/internal/services/objectstorage/credential/resource.go +++ b/stackit/internal/services/objectstorage/credential/resource.go @@ -346,6 +346,9 @@ func (r *credentialResource) Read(ctx context.Context, req resource.ReadRequest, credentialsGroupId := model.CredentialsGroupId.ValueString() credentialId := model.CredentialId.ValueString() region := model.Region.ValueString() + if region == "" { + region = r.providerData.Region + } ctx = tflog.SetField(ctx, "project_id", projectId) ctx = tflog.SetField(ctx, "credentials_group_id", credentialsGroupId) diff --git a/stackit/internal/services/objectstorage/credentialsgroup/resource.go b/stackit/internal/services/objectstorage/credentialsgroup/resource.go index be9c7b35..e1e91230 100644 --- a/stackit/internal/services/objectstorage/credentialsgroup/resource.go +++ b/stackit/internal/services/objectstorage/credentialsgroup/resource.go @@ -249,6 +249,9 @@ func (r *credentialsGroupResource) Read(ctx context.Context, req resource.ReadRe ctx = tflog.SetField(ctx, "project_id", projectId) ctx = tflog.SetField(ctx, "credentials_group_id", credentialsGroupId) ctx = tflog.SetField(ctx, "region", region) + if region == "" { + region = r.providerData.Region + } found, err := readCredentialsGroups(ctx, &model, region, r.client) if err != nil {