Skip to content

Commit 1197de5

Browse files
frodenasfrodenas
committed
Upgrade deprecated stateChangeFunc.WaitForState to stateChangeFunc.WaitForStateContext
Signed-off-by: Ferran Rodenas <[email protected]>
1 parent b121fe9 commit 1197de5

6 files changed

+36
-50
lines changed

‎vra/resource_block_device.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ func resourceBlockDeviceCreate(ctx context.Context, d *schema.ResourceData, m in
211211
MinTimeout: 5 * time.Second,
212212
}
213213

214-
resourceIDs, err := stateChangeFunc.WaitForState()
214+
resourceIDs, err := stateChangeFunc.WaitForStateContext(ctx)
215215
if err != nil {
216216
return diag.FromErr(err)
217217
}
@@ -314,7 +314,7 @@ func resourceBlockDeviceUpdate(ctx context.Context, d *schema.ResourceData, m in
314314

315315
id := d.Id()
316316
if d.HasChange("capacity_in_gb") {
317-
err := resizeDisk(d, apiClient, id)
317+
err := resizeDisk(ctx, d, apiClient, id)
318318
if err != nil {
319319
return diag.FromErr(err)
320320
}
@@ -324,7 +324,7 @@ func resourceBlockDeviceUpdate(ctx context.Context, d *schema.ResourceData, m in
324324
return resourceBlockDeviceRead(ctx, d, m)
325325
}
326326

327-
func resizeDisk(d *schema.ResourceData, apiClient *client.MulticloudIaaS, id string) error {
327+
func resizeDisk(ctx context.Context, d *schema.ResourceData, apiClient *client.MulticloudIaaS, id string) error {
328328

329329
log.Printf("Starting resize of vra_block_device resource with name %s", d.Get("name"))
330330

@@ -346,8 +346,7 @@ func resizeDisk(d *schema.ResourceData, apiClient *client.MulticloudIaaS, id str
346346
MinTimeout: 5 * time.Second,
347347
}
348348

349-
_, err = stateChangeFunc.WaitForState()
350-
if err != nil {
349+
if _, err = stateChangeFunc.WaitForStateContext(ctx); err != nil {
351350
return err
352351
}
353352

@@ -396,8 +395,7 @@ func resourceBlockDeviceDelete(ctx context.Context, d *schema.ResourceData, m in
396395
MinTimeout: 5 * time.Second,
397396
}
398397

399-
_, err = stateChangeFunc.WaitForState()
400-
if err != nil {
398+
if _, err = stateChangeFunc.WaitForStateContext(ctx); err != nil {
401399
return diag.FromErr(err)
402400
}
403401

‎vra/resource_block_device_snapshot.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,7 @@ func resourceBlockDeviceSnapshotCreate(ctx context.Context, d *schema.ResourceDa
9696
MinTimeout: 5 * time.Second,
9797
}
9898

99-
_, err = stateChangeFunc.WaitForState()
100-
if err != nil {
99+
if _, err = stateChangeFunc.WaitForStateContext(ctx); err != nil {
101100
return diag.FromErr(err)
102101
}
103102

@@ -227,8 +226,7 @@ func resourceBlockDeviceSnapshotDelete(ctx context.Context, d *schema.ResourceDa
227226
MinTimeout: 5 * time.Second,
228227
}
229228

230-
_, err = stateChangeFunc.WaitForState()
231-
if err != nil {
229+
if _, err = stateChangeFunc.WaitForStateContext(ctx); err != nil {
232230
return diag.FromErr(err)
233231
}
234232

‎vra/resource_deployment.go

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ func resourceDeploymentCreate(ctx context.Context, d *schema.ResourceData, m int
316316
MinTimeout: 5 * time.Second,
317317
}
318318

319-
deploymentID, err := stateChangeFunc.WaitForState()
319+
deploymentID, err := stateChangeFunc.WaitForStateContext(ctx)
320320
if err != nil {
321321
readErrors := resourceDeploymentRead(ctx, d, m)
322322
if readErrors.HasError() {
@@ -430,7 +430,7 @@ func resourceDeploymentUpdate(ctx context.Context, d *schema.ResourceData, m int
430430
}
431431

432432
if d.HasChange("inputs") {
433-
err := runDeploymentUpdateAction(d, apiClient, deploymentUUID)
433+
err := runDeploymentUpdateAction(ctx, d, apiClient, deploymentUUID)
434434
if err != nil {
435435
return diag.FromErr(err)
436436
}
@@ -445,8 +445,7 @@ func resourceDeploymentUpdate(ctx context.Context, d *schema.ResourceData, m int
445445
MinTimeout: 5 * time.Second,
446446
}
447447

448-
_, err := stateChangeFunc.WaitForState()
449-
if err != nil {
448+
if _, err := stateChangeFunc.WaitForStateContext(ctx); err != nil {
450449
readErrors := resourceDeploymentRead(ctx, d, m)
451450
if readErrors.HasError() {
452451
return append(readErrors, diag.Errorf("failed to create deployment: %v", err.Error())...)
@@ -457,7 +456,7 @@ func resourceDeploymentUpdate(ctx context.Context, d *schema.ResourceData, m int
457456

458457
if d.HasChange("owner") {
459458
deploymentUUID := strfmt.UUID(d.Id())
460-
err := runChangeOwnerDeploymentAction(d, apiClient, deploymentUUID)
459+
err := runChangeOwnerDeploymentAction(ctx, d, apiClient, deploymentUUID)
461460
if err != nil {
462461
return diag.FromErr(err)
463462
}
@@ -488,8 +487,7 @@ func resourceDeploymentDelete(ctx context.Context, d *schema.ResourceData, m int
488487
MinTimeout: 5 * time.Second,
489488
}
490489

491-
_, err = stateChangeFunc.WaitForState()
492-
if err != nil {
490+
if _, err = stateChangeFunc.WaitForStateContext(ctx); err != nil {
493491
return diag.FromErr(err)
494492
}
495493

@@ -765,8 +763,7 @@ func updateDeploymentWithNewBlueprint(ctx context.Context, d *schema.ResourceDat
765763
MinTimeout: 5 * time.Second,
766764
}
767765

768-
_, err = stateChangeFunc.WaitForState()
769-
if err != nil {
766+
if _, err = stateChangeFunc.WaitForStateContext(ctx); err != nil {
770767
readErrors := resourceDeploymentRead(ctx, d, m)
771768
if readErrors.HasError() {
772769
return append(readErrors, diag.Errorf("failed to update deployment: %v", err.Error())...)
@@ -799,7 +796,7 @@ func updateDeploymentMetadata(d *schema.ResourceData, apiClient *client.Multiclo
799796
return nil
800797
}
801798

802-
func runDeploymentUpdateAction(d *schema.ResourceData, apiClient *client.MulticloudIaaS, deploymentUUID strfmt.UUID) error {
799+
func runDeploymentUpdateAction(ctx context.Context, d *schema.ResourceData, apiClient *client.MulticloudIaaS, deploymentUUID strfmt.UUID) error {
803800
log.Printf("Noticed changes to inputs. Starting to update deployment with inputs")
804801
// Get the deployment actions
805802
deploymentActions, err := apiClient.DeploymentActions.GetDeploymentActionsUsingGET(deployment_actions.
@@ -871,7 +868,7 @@ func runDeploymentUpdateAction(d *schema.ResourceData, apiClient *client.Multicl
871868
}
872869

873870
reason := "Updated deployment inputs from vRA provider for Terraform."
874-
err = runAction(d, apiClient, deploymentUUID, actionID, inputs, reason)
871+
err = runAction(ctx, d, apiClient, deploymentUUID, actionID, inputs, reason)
875872
if err != nil {
876873
return err
877874
}
@@ -1006,7 +1003,7 @@ func getDeploymentActionInputTypesMap(apiClient *client.MulticloudIaaS, deployme
10061003
return inputTypesMap, nil
10071004
}
10081005

1009-
func runChangeOwnerDeploymentAction(d *schema.ResourceData, apiClient *client.MulticloudIaaS, deploymentUUID strfmt.UUID) error {
1006+
func runChangeOwnerDeploymentAction(ctx context.Context, d *schema.ResourceData, apiClient *client.MulticloudIaaS, deploymentUUID strfmt.UUID) error {
10101007
oldOwner, newOwner := d.GetChange("owner")
10111008
log.Printf("Noticed changes to owner. Starting to change deployment owner from %s to %s", oldOwner.(string), newOwner.(string))
10121009

@@ -1035,7 +1032,7 @@ func runChangeOwnerDeploymentAction(d *schema.ResourceData, apiClient *client.Mu
10351032
}
10361033

10371034
reason := "Updated deployment owner from vRA provider for Terraform."
1038-
err = runAction(d, apiClient, deploymentUUID, actionID, inputs, reason)
1035+
err = runAction(ctx, d, apiClient, deploymentUUID, actionID, inputs, reason)
10391036
if err != nil {
10401037
return err
10411038
}
@@ -1044,7 +1041,7 @@ func runChangeOwnerDeploymentAction(d *schema.ResourceData, apiClient *client.Mu
10441041
return nil
10451042
}
10461043

1047-
func runAction(d *schema.ResourceData, apiClient *client.MulticloudIaaS, deploymentUUID strfmt.UUID, actionID string, inputs map[string]interface{}, reason string) error {
1044+
func runAction(ctx context.Context, d *schema.ResourceData, apiClient *client.MulticloudIaaS, deploymentUUID strfmt.UUID, actionID string, inputs map[string]interface{}, reason string) error {
10481045
resourceActionRequest := models.ResourceActionRequest{
10491046
ActionID: actionID,
10501047
Reason: reason,
@@ -1070,8 +1067,7 @@ func runAction(d *schema.ResourceData, apiClient *client.MulticloudIaaS, deploym
10701067
Timeout: d.Timeout(schema.TimeoutUpdate),
10711068
MinTimeout: 5 * time.Second,
10721069
}
1073-
_, err = stateChangeFunc.WaitForState()
1074-
if err != nil {
1070+
if _, err = stateChangeFunc.WaitForStateContext(ctx); err != nil {
10751071
return err
10761072
}
10771073
return nil

‎vra/resource_load_balancer.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ func resourceLoadBalancerCreate(ctx context.Context, d *schema.ResourceData, m i
150150
MinTimeout: 5 * time.Second,
151151
}
152152

153-
resourceIDs, err := stateChangeFunc.WaitForState()
153+
resourceIDs, err := stateChangeFunc.WaitForStateContext(ctx)
154154
if err != nil {
155155
return diag.FromErr(err)
156156
}
@@ -256,8 +256,7 @@ func resourceLoadBalancerDelete(ctx context.Context, d *schema.ResourceData, m i
256256
MinTimeout: 5 * time.Second,
257257
}
258258

259-
_, err = stateChangeFunc.WaitForState()
260-
if err != nil {
259+
if _, err = stateChangeFunc.WaitForStateContext(ctx); err != nil {
261260
return diag.FromErr(err)
262261
}
263262

‎vra/resource_machine.go

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ func resourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
260260
MinTimeout: 5 * time.Second,
261261
}
262262

263-
resourceIds, err := stateChangeFunc.WaitForState()
263+
resourceIds, err := stateChangeFunc.WaitForStateContext(ctx)
264264
if err != nil {
265265
return diag.FromErr(err)
266266
}
@@ -289,9 +289,8 @@ func resourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
289289
MinTimeout: 5 * time.Second,
290290
}
291291

292-
_, e := stateChangeFunc.WaitForState()
293-
if e != nil {
294-
return diag.FromErr(e)
292+
if _, err := stateChangeFunc.WaitForStateContext(ctx); err != nil {
293+
return diag.FromErr(err)
295294
}
296295
}
297296

@@ -403,15 +402,15 @@ func resourceMachineUpdate(ctx context.Context, d *schema.ResourceData, m interf
403402

404403
// machine resize operation
405404
if d.HasChange("flavor") {
406-
err := resizeMachine(d, apiClient, id)
405+
err := resizeMachine(ctx, d, apiClient, id)
407406
if err != nil {
408407
return diag.FromErr(err)
409408
}
410409
}
411410

412411
// attach and/or detach disks if disks configuration is changed
413412
if d.HasChange("disks") {
414-
err := attachAndDetachDisks(d, apiClient, id)
413+
err := attachAndDetachDisks(ctx, d, apiClient, id)
415414
if err != nil {
416415
return diag.FromErr(err)
417416
}
@@ -422,7 +421,7 @@ func resourceMachineUpdate(ctx context.Context, d *schema.ResourceData, m interf
422421
}
423422

424423
// attaches and detaches disks
425-
func attachAndDetachDisks(d *schema.ResourceData, apiClient *client.MulticloudIaaS, id string) error {
424+
func attachAndDetachDisks(ctx context.Context, d *schema.ResourceData, apiClient *client.MulticloudIaaS, id string) error {
426425
log.Printf("identified change in the disks configuration for the machine %s", d.Get("name"))
427426

428427
oldValue, newValue := d.GetChange("disks")
@@ -454,9 +453,8 @@ func attachAndDetachDisks(d *schema.ResourceData, apiClient *client.MulticloudIa
454453
MinTimeout: 5 * time.Second,
455454
}
456455

457-
_, e := stateChangeFunc.WaitForState()
458-
if e != nil {
459-
return e
456+
if _, err := stateChangeFunc.WaitForStateContext(ctx); err != nil {
457+
return err
460458
}
461459
}
462460

@@ -502,9 +500,8 @@ func attachAndDetachDisks(d *schema.ResourceData, apiClient *client.MulticloudIa
502500
MinTimeout: 5 * time.Second,
503501
}
504502

505-
_, e := stateChangeFunc.WaitForState()
506-
if e != nil {
507-
return e
503+
if _, err := stateChangeFunc.WaitForStateContext(ctx); err != nil {
504+
return err
508505
}
509506
} else {
510507
log.Printf("disk %v is already attached to machine %v, moving on to the next disk to attach", diskID, id)
@@ -558,7 +555,7 @@ func disksDifference(a, b []interface{}) (diff []map[string]interface{}) {
558555
}
559556

560557
// resize machine when there is a change in the flavor
561-
func resizeMachine(d *schema.ResourceData, apiClient *client.MulticloudIaaS, id string) error {
558+
func resizeMachine(ctx context.Context, d *schema.ResourceData, apiClient *client.MulticloudIaaS, id string) error {
562559
log.Printf("identified change in the flavor, machine resize will be performed")
563560
flavor := d.Get("flavor").(string)
564561
resizeMachine, err := apiClient.Compute.ResizeMachine(compute.NewResizeMachineParams().WithID(id).WithName(&flavor))
@@ -573,7 +570,7 @@ func resizeMachine(d *schema.ResourceData, apiClient *client.MulticloudIaaS, id
573570
Timeout: d.Timeout(schema.TimeoutUpdate),
574571
MinTimeout: 5 * time.Second,
575572
}
576-
resourceIds, err := stateChangeFunc.WaitForState()
573+
resourceIds, err := stateChangeFunc.WaitForStateContext(ctx)
577574
if err != nil {
578575
return err
579576
}
@@ -602,8 +599,7 @@ func resourceMachineDelete(ctx context.Context, d *schema.ResourceData, m interf
602599
MinTimeout: 5 * time.Second,
603600
}
604601

605-
_, err = stateChangeFunc.WaitForState()
606-
if err != nil {
602+
if _, err = stateChangeFunc.WaitForStateContext(ctx); err != nil {
607603
return diag.FromErr(err)
608604
}
609605

‎vra/resource_network.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func resourceNetworkCreate(ctx context.Context, d *schema.ResourceData, m interf
141141
Timeout: d.Timeout(schema.TimeoutCreate),
142142
MinTimeout: 5 * time.Second,
143143
}
144-
resourceIds, err := stateChangeFunc.WaitForState()
144+
resourceIds, err := stateChangeFunc.WaitForStateContext(ctx)
145145
log.Printf("Waitforstate returned: %T %+v %+v\n", resourceIds, resourceIds, err)
146146

147147
if err != nil {
@@ -242,8 +242,7 @@ func resourceNetworkDelete(ctx context.Context, d *schema.ResourceData, m interf
242242
MinTimeout: 5 * time.Second,
243243
}
244244

245-
_, err = stateChangeFunc.WaitForState()
246-
if err != nil {
245+
if _, err = stateChangeFunc.WaitForStateContext(ctx); err != nil {
247246
return diag.FromErr(err)
248247
}
249248

0 commit comments

Comments
 (0)