Skip to content

Commit 2ee0acd

Browse files
authored
Fix(lb): wait on read lb and add wait to sweeper test. (#1028)
1 parent c700c0d commit 2ee0acd

13 files changed

+3056
-3113
lines changed

scaleway/resource_lb.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func resourceScalewayLbRead(ctx context.Context, d *schema.ResourceData, meta in
193193
}
194194

195195
retryInterval := DefaultWaitLBRetryInterval
196-
res, err := lbAPI.WaitForLb(&lb.ZonedAPIWaitForLBRequest{
196+
res, err := lbAPI.WaitForLbInstances(&lb.ZonedAPIWaitForLBInstancesRequest{
197197
Zone: zone,
198198
LBID: ID,
199199
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),

scaleway/resource_lb_ip_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func testAccCheckScalewayLbIPDestroy(tt *TestTools) resource.TestCheckFunc {
135135

136136
lbID, lbExist := rs.Primary.Attributes["lb_id"]
137137
if lbExist && len(lbID) > 0 {
138-
_, err = lbAPI.WaitForLb(&lb.ZonedAPIWaitForLBRequest{
138+
_, err = lbAPI.WaitForLbInstances(&lb.ZonedAPIWaitForLBInstancesRequest{
139139
Zone: zone,
140140
LBID: lbID,
141141
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),

scaleway/resource_lb_test.go

+9
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,15 @@ func testSweepLB(_ string) error {
3232
}
3333

3434
for _, l := range listLBs.LBs {
35+
_, err = lbAPI.WaitForLbInstances(&lb.ZonedAPIWaitForLBInstancesRequest{
36+
LBID: l.ID,
37+
Zone: zone,
38+
Timeout: scw.TimeDurationPtr(LbWaitForTimeout),
39+
RetryInterval: scw.TimeDurationPtr(DefaultWaitLBRetryInterval),
40+
})
41+
if err != nil {
42+
return fmt.Errorf("error waiting for lb in sweeper: %s", err)
43+
}
3544
err := lbAPI.DeleteLB(&lb.ZonedAPIDeleteLBRequest{
3645
LBID: l.ID,
3746
ReleaseIP: true,

scaleway/testdata/data-source-lb-basic.cassette.yaml

+156-156
Large diffs are not rendered by default.

scaleway/testdata/data-source-lbip-basic.cassette.yaml

+96-96
Large diffs are not rendered by default.

scaleway/testdata/lb-backend-basic.cassette.yaml

+280-280
Large diffs are not rendered by default.

scaleway/testdata/lb-backend-health-check.cassette.yaml

+291-291
Large diffs are not rendered by default.

scaleway/testdata/lb-certificate-basic.cassette.yaml

+365-365
Large diffs are not rendered by default.

scaleway/testdata/lb-frontend-basic.cassette.yaml

+290-290
Large diffs are not rendered by default.

scaleway/testdata/lb-route-basic.cassette.yaml

+188-188
Large diffs are not rendered by default.

scaleway/testdata/lbacl-basic.cassette.yaml

+386-386
Large diffs are not rendered by default.

scaleway/testdata/lbip-basic.cassette.yaml

+165-165
Large diffs are not rendered by default.

scaleway/testdata/lblb-with-ip.cassette.yaml

+828-894
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)