Skip to content

Commit 4a7106c

Browse files
authored
fix(iaas): wait for network area deletion until projects are deleted (#978)
* fix: add ReadyForDeletionWaitHandler to avoid error when deleting a network area with projects in deletion state
1 parent ba6ee8b commit 4a7106c

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.4.0
1616
github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.1
1717
github.com/stackitcloud/stackit-sdk-go/services/git v0.7.1
18-
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.29.2
18+
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.30.0
1919
github.com/stackitcloud/stackit-sdk-go/services/iaasalpha v0.1.21-alpha
2020
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.5.1
2121
github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.1 h1:CnhAMLql0MNmAeq4r
160160
github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.1/go.mod h1:7Bx85knfNSBxulPdJUFuBePXNee3cO+sOTYnUG6M+iQ=
161161
github.com/stackitcloud/stackit-sdk-go/services/git v0.7.1 h1:hkFixFnBcQzU4BSIZFITc8N0gK0pUYk7mk0wdUu5Ki8=
162162
github.com/stackitcloud/stackit-sdk-go/services/git v0.7.1/go.mod h1:Ng1EzrRndG3iGXGH90AZJz//wfK+2YOyDwTnTLwX3a4=
163-
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.29.2 h1:BvrbqLi9u0943TTkflPDLGbXgqgVzv7oy8tZHD3q3lg=
164-
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.29.2/go.mod h1:b/jgJf7QHdRzU2fmZeJJtu5j0TAevDRghzcn5MyRmOI=
163+
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.30.0 h1:01+noyCSadNH3ALHufcVXxNs0hBsetzJkOMN1Fe0VLc=
164+
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.30.0/go.mod h1:854gnLR92NvAbJAA1xZEumrtNh1DoBP1FXTMvhwYA6w=
165165
github.com/stackitcloud/stackit-sdk-go/services/iaasalpha v0.1.21-alpha h1:m1jq6a8dbUe+suFuUNdHmM/cSehpGLUtDbK1CqLqydg=
166166
github.com/stackitcloud/stackit-sdk-go/services/iaasalpha v0.1.21-alpha/go.mod h1:Nu1b5Phsv8plgZ51+fkxPVsU91ZJ5Ayz+cthilxdmQ8=
167167
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.5.1 h1:OdJEs8eOfrzn9tCBDLxIyP8hX50zPfcXNYnRoQX+chs=

stackit/internal/services/iaas/networkarea/resource.go

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ import (
66
"net/http"
77
"strings"
88

9+
"github.com/stackitcloud/stackit-sdk-go/services/resourcemanager"
910
iaasUtils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iaas/utils"
11+
resourcemanagerUtils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/resourcemanager/utils"
1012

1113
"github.com/hashicorp/terraform-plugin-framework-validators/int64validator"
1214
"github.com/hashicorp/terraform-plugin-framework-validators/listvalidator"
@@ -73,7 +75,8 @@ func NewNetworkAreaResource() resource.Resource {
7375

7476
// networkResource is the resource implementation.
7577
type networkAreaResource struct {
76-
client *iaas.APIClient
78+
client *iaas.APIClient
79+
resourceManagerClient *resourcemanager.APIClient
7780
}
7881

7982
// Metadata returns the resource type name.
@@ -93,6 +96,11 @@ func (r *networkAreaResource) Configure(ctx context.Context, req resource.Config
9396
return
9497
}
9598
r.client = apiClient
99+
resourceManagerClient := resourcemanagerUtils.ConfigureClient(ctx, &providerData, &resp.Diagnostics)
100+
if resp.Diagnostics.HasError() {
101+
return
102+
}
103+
r.resourceManagerClient = resourceManagerClient
96104
tflog.Info(ctx, "IaaS client configured")
97105
}
98106

@@ -411,14 +419,9 @@ func (r *networkAreaResource) Delete(ctx context.Context, req resource.DeleteReq
411419
ctx = tflog.SetField(ctx, "organization_id", organizationId)
412420
ctx = tflog.SetField(ctx, "network_area_id", networkAreaId)
413421

414-
projects, err := r.client.ListNetworkAreaProjects(ctx, organizationId, networkAreaId).Execute()
422+
_, err := wait.ReadyForNetworkAreaDeletionWaitHandler(ctx, r.client, r.resourceManagerClient, organizationId, networkAreaId).WaitWithContext(ctx)
415423
if err != nil {
416-
core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting network area", fmt.Sprintf("Calling API to get the list of projects: %v", err))
417-
return
418-
}
419-
420-
if projects != nil && len(*projects.Items) > 0 {
421-
core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting network area", fmt.Sprintln("You still have projects attached to the network area. Please delete or remove them from the network area before deleting the network area."))
424+
core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting network area", fmt.Sprintf("Network area ready for deletion waiting: %v", err))
422425
return
423426
}
424427

0 commit comments

Comments
 (0)