Skip to content

Commit 1c4a3ec

Browse files
authored
BUGFIX fix seg fault in load balancer creation (#359)
1 parent ee905a3 commit 1c4a3ec

3 files changed

Lines changed: 0 additions & 68 deletions

File tree

stackit/internal/services/loadbalancer/credential/resource.go

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"github.com/stackitcloud/stackit-sdk-go/core/config"
1919
"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
2020
"github.com/stackitcloud/stackit-sdk-go/services/loadbalancer"
21-
"github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/wait"
2221
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion"
2322
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
2423
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
@@ -173,28 +172,6 @@ func (r *credentialResource) Create(ctx context.Context, req resource.CreateRequ
173172
projectId := model.ProjectId.ValueString()
174173
ctx = tflog.SetField(ctx, "project_id", projectId)
175174

176-
// Get status of load balancer functionality
177-
statusResp, err := r.client.GetServiceStatus(ctx, projectId).Execute()
178-
if err != nil {
179-
core.LogAndAddError(ctx, &resp.Diagnostics, "Error getting status of load balancer functionality", fmt.Sprintf("Calling API: %v", err))
180-
return
181-
}
182-
183-
// If load balancer functionality is not enabled, enable it
184-
if *statusResp.Status != wait.FunctionalityStatusReady {
185-
_, err = r.client.EnableService(ctx, projectId).XRequestID(uuid.NewString()).Execute()
186-
if err != nil {
187-
core.LogAndAddError(ctx, &resp.Diagnostics, "Error enabling load balancer functionality", fmt.Sprintf("Calling API: %v", err))
188-
return
189-
}
190-
191-
_, err := wait.EnableServiceWaitHandler(ctx, r.client, projectId).WaitWithContext(ctx)
192-
if err != nil {
193-
core.LogAndAddError(ctx, &resp.Diagnostics, "Error enabling load balancer functionality", fmt.Sprintf("Waiting for enablement: %v", err))
194-
return
195-
}
196-
}
197-
198175
// Generate API request body from model
199176
payload, err := toCreatePayload(&model)
200177
if err != nil {

stackit/internal/services/loadbalancer/loadbalancer/resource.go

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -566,28 +566,6 @@ func (r *loadBalancerResource) Create(ctx context.Context, req resource.CreateRe
566566
projectId := model.ProjectId.ValueString()
567567
ctx = tflog.SetField(ctx, "project_id", projectId)
568568

569-
// Get status of load balancer functionality
570-
statusResp, err := r.client.GetServiceStatus(ctx, projectId).Execute()
571-
if err != nil {
572-
core.LogAndAddError(ctx, &resp.Diagnostics, "Error getting status of load balancer functionality", fmt.Sprintf("Calling API: %v", err))
573-
return
574-
}
575-
576-
// If load balancer functionality is not enabled, enable it
577-
if *statusResp.Status != wait.FunctionalityStatusReady {
578-
_, err = r.client.EnableService(ctx, projectId).XRequestID(uuid.NewString()).Execute()
579-
if err != nil {
580-
core.LogAndAddError(ctx, &resp.Diagnostics, "Error enabling load balancer functionality", fmt.Sprintf("Calling API: %v", err))
581-
return
582-
}
583-
584-
_, err := wait.EnableServiceWaitHandler(ctx, r.client, projectId).WaitWithContext(ctx)
585-
if err != nil {
586-
core.LogAndAddError(ctx, &resp.Diagnostics, "Error enabling load balancer functionality", fmt.Sprintf("Waiting for enablement: %v", err))
587-
return
588-
}
589-
}
590-
591569
// Generate API request body from model
592570
payload, err := toCreatePayload(ctx, &model)
593571
if err != nil {

stackit/internal/services/loadbalancer/observability-credential/resource.go

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"github.com/stackitcloud/stackit-sdk-go/core/config"
1919
"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
2020
"github.com/stackitcloud/stackit-sdk-go/services/loadbalancer"
21-
"github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/wait"
2221
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion"
2322
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
2423
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
@@ -168,28 +167,6 @@ func (r *observabilityCredentialResource) Create(ctx context.Context, req resour
168167
projectId := model.ProjectId.ValueString()
169168
ctx = tflog.SetField(ctx, "project_id", projectId)
170169

171-
// Get status of load balancer functionality
172-
statusResp, err := r.client.GetServiceStatus(ctx, projectId).Execute()
173-
if err != nil {
174-
core.LogAndAddError(ctx, &resp.Diagnostics, "Error getting status of load balancer functionality", fmt.Sprintf("Calling API: %v", err))
175-
return
176-
}
177-
178-
// If load balancer functionality is not enabled, enable it
179-
if *statusResp.Status != wait.FunctionalityStatusReady {
180-
_, err = r.client.EnableService(ctx, projectId).XRequestID(uuid.NewString()).Execute()
181-
if err != nil {
182-
core.LogAndAddError(ctx, &resp.Diagnostics, "Error enabling load balancer functionality", fmt.Sprintf("Calling API: %v", err))
183-
return
184-
}
185-
186-
_, err := wait.EnableServiceWaitHandler(ctx, r.client, projectId).WaitWithContext(ctx)
187-
if err != nil {
188-
core.LogAndAddError(ctx, &resp.Diagnostics, "Error enabling load balancer functionality", fmt.Sprintf("Waiting for enablement: %v", err))
189-
return
190-
}
191-
}
192-
193170
// Generate API request body from model
194171
payload, err := toCreatePayload(&model)
195172
if err != nil {

0 commit comments

Comments
 (0)