Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(lb): add wait lb & instances attached #983

Merged
merged 5 commits into from
Dec 29, 2021
Merged

feat(lb): add wait lb & instances attached #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
35b9587
add wait lb and instances
Monitob Dec 28, 2021
dbb131f
add wait lb and instances on ip
Monitob Dec 28, 2021
a753458
update the retry interval
Monitob Dec 29, 2021
7b04049
check nil pointer
Monitob Dec 29, 2021
454f83b
update cassettes with new queries
Monitob Dec 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions scaleway/helpers_lb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
const (
LbWaitForTimeout = 10 * time.Minute
defaultLbLbTimeout = 10 * time.Minute
retryLbIPInterval = 5 * time.Second
)

// lbAPIWithZone returns an lb API WITH zone for a Create request
Expand Down
13 changes: 6 additions & 7 deletions scaleway/resource_lb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,12 +361,11 @@ func resourceScalewayLbDelete(ctx context.Context, d *schema.ResourceData, meta
}

// check if current lb is on stable state
retryInterval := DefaultWaitLBRetryInterval
currentLB, err := lbAPI.WaitForLb(&lb.ZonedAPIWaitForLBRequest{
currentLB, err := lbAPI.WaitForLbInstances(&lb.ZonedAPIWaitForLBInstancesRequest{
LBID: ID,
Zone: zone,
Timeout: scw.TimeDurationPtr(LbWaitForTimeout),
RetryInterval: &retryInterval,
RetryInterval: scw.TimeDurationPtr(DefaultWaitLBRetryInterval),
}, scw.WithContext(ctx))
if err != nil {
return diag.FromErr(err)
Expand All @@ -393,11 +392,11 @@ func resourceScalewayLbDelete(ctx context.Context, d *schema.ResourceData, meta
}
}

_, err = lbAPI.WaitForLb(&lb.ZonedAPIWaitForLBRequest{
_, err = lbAPI.WaitForLbInstances(&lb.ZonedAPIWaitForLBInstancesRequest{
LBID: ID,
Zone: zone,
Timeout: scw.TimeDurationPtr(LbWaitForTimeout),
RetryInterval: &retryInterval,
RetryInterval: scw.TimeDurationPtr(DefaultWaitLBRetryInterval),
}, scw.WithContext(ctx))
if err != nil && !is404Error(err) {
return diag.FromErr(err)
Expand All @@ -419,11 +418,11 @@ func resourceScalewayLbDelete(ctx context.Context, d *schema.ResourceData, meta
return diag.FromErr(err)
}

_, err = lbAPI.WaitForLb(&lb.ZonedAPIWaitForLBRequest{
_, err = lbAPI.WaitForLbInstances(&lb.ZonedAPIWaitForLBInstancesRequest{
LBID: ID,
Zone: zone,
Timeout: scw.TimeDurationPtr(LbWaitForTimeout),
RetryInterval: &retryInterval,
RetryInterval: scw.TimeDurationPtr(DefaultWaitLBRetryInterval),
}, scw.WithContext(ctx))
if err != nil && !is404Error(err) {
return diag.FromErr(err)
Expand Down
109 changes: 71 additions & 38 deletions scaleway/resource_lb_ip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/scaleway/scaleway-sdk-go/api/lb/v1"
"github.com/scaleway/scaleway-sdk-go/scw"
Expand Down Expand Up @@ -79,24 +80,36 @@ func resourceScalewayLbIPRead(ctx context.Context, d *schema.ResourceData, meta
return diag.FromErr(err)
}

res, err := lbAPI.GetIP(&lb.ZonedAPIGetIPRequest{
Zone: zone,
IPID: ID,
}, scw.WithContext(ctx))
var ip *lb.IP
err = resource.RetryContext(ctx, retryLbIPInterval, func() *resource.RetryError {
res, errGet := lbAPI.GetIP(&lb.ZonedAPIGetIPRequest{
Zone: zone,
IPID: ID,
}, scw.WithContext(ctx))
if err != nil {
if is403Error(errGet) {
return resource.RetryableError(errGet)
}
return resource.NonRetryableError(errGet)
}

ip = res
return nil
})

if err != nil {
if is404Error(err) || is403Error(err) {
if is404Error(err) {
d.SetId("")
return nil
}
return diag.FromErr(err)
}

// check lb state if it is attached
if res.LBID != nil {
if ip.LBID != nil {
_, err = lbAPI.WaitForLb(&lb.ZonedAPIWaitForLBRequest{
Zone: zone,
LBID: *res.LBID,
LBID: *ip.LBID,
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
RetryInterval: scw.TimeDurationPtr(DefaultWaitLBRetryInterval),
}, scw.WithContext(ctx))
Expand All @@ -116,12 +129,12 @@ func resourceScalewayLbIPRead(ctx context.Context, d *schema.ResourceData, meta
}

_ = d.Set("region", string(region))
_ = d.Set("zone", res.Zone.String())
_ = d.Set("organization_id", res.OrganizationID)
_ = d.Set("project_id", res.ProjectID)
_ = d.Set("ip_address", res.IPAddress)
_ = d.Set("reverse", res.Reverse)
_ = d.Set("lb_id", flattenStringPtr(res.LBID))
_ = d.Set("zone", ip.Zone.String())
_ = d.Set("organization_id", ip.OrganizationID)
_ = d.Set("project_id", ip.ProjectID)
_ = d.Set("ip_address", ip.IPAddress)
_ = d.Set("reverse", ip.Reverse)
_ = d.Set("lb_id", flattenStringPtr(ip.LBID))

return nil
}
Expand All @@ -132,23 +145,35 @@ func resourceScalewayLbIPUpdate(ctx context.Context, d *schema.ResourceData, met
return diag.FromErr(err)
}

res, err := lbAPI.GetIP(&lb.ZonedAPIGetIPRequest{
Zone: zone,
IPID: ID,
}, scw.WithContext(ctx))
var ip *lb.IP
err = resource.RetryContext(ctx, retryLbIPInterval, func() *resource.RetryError {
res, errGet := lbAPI.GetIP(&lb.ZonedAPIGetIPRequest{
Zone: zone,
IPID: ID,
}, scw.WithContext(ctx))
if err != nil {
if is403Error(errGet) {
return resource.RetryableError(errGet)
}
return resource.NonRetryableError(errGet)
}

ip = res
return nil
})

if err != nil {
if is404Error(err) || is403Error(err) {
if is404Error(err) {
d.SetId("")
return nil
}
return diag.FromErr(err)
}

if res.LBID != nil {
if ip.LBID != nil {
_, err = lbAPI.WaitForLb(&lb.ZonedAPIWaitForLBRequest{
Zone: zone,
LBID: *res.LBID,
LBID: *ip.LBID,
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
RetryInterval: scw.TimeDurationPtr(DefaultWaitLBRetryInterval),
}, scw.WithContext(ctx))
Expand All @@ -174,10 +199,10 @@ func resourceScalewayLbIPUpdate(ctx context.Context, d *schema.ResourceData, met
}
}

if res.LBID != nil {
if ip.LBID != nil {
_, err = lbAPI.WaitForLb(&lb.ZonedAPIWaitForLBRequest{
Zone: zone,
LBID: *res.LBID,
LBID: *ip.LBID,
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
RetryInterval: scw.TimeDurationPtr(DefaultWaitLBRetryInterval),
}, scw.WithContext(ctx))
Expand All @@ -199,25 +224,33 @@ func resourceScalewayLbIPDelete(ctx context.Context, d *schema.ResourceData, met
return diag.FromErr(err)
}

res, err := lbAPI.GetIP(&lb.ZonedAPIGetIPRequest{
Zone: zone,
IPID: ID,
}, scw.WithContext(ctx))
var ip *lb.IP
err = resource.RetryContext(ctx, retryLbIPInterval, func() *resource.RetryError {
res, errGet := lbAPI.GetIP(&lb.ZonedAPIGetIPRequest{
Zone: zone,
IPID: ID,
}, scw.WithContext(ctx))
if err != nil {
if is403Error(errGet) {
return resource.RetryableError(errGet)
}
return resource.NonRetryableError(errGet)
}

ip = res
return nil
})

if err != nil {
if is404Error(err) || is403Error(err) {
d.SetId("")
return nil
}
return diag.FromErr(err)
}

// check lb state
if res.LBID != nil {
_, err = lbAPI.WaitForLb(&lb.ZonedAPIWaitForLBRequest{
if ip != nil && ip.LBID != nil {
_, err = lbAPI.WaitForLbInstances(&lb.ZonedAPIWaitForLBInstancesRequest{
LBID: ID,
Zone: zone,
LBID: *res.LBID,
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
Timeout: scw.TimeDurationPtr(LbWaitForTimeout),
RetryInterval: scw.TimeDurationPtr(DefaultWaitLBRetryInterval),
}, scw.WithContext(ctx))
if err != nil {
Expand All @@ -239,11 +272,11 @@ func resourceScalewayLbIPDelete(ctx context.Context, d *schema.ResourceData, met
}

// check lb state
if res.LBID != nil {
_, err = lbAPI.WaitForLb(&lb.ZonedAPIWaitForLBRequest{
if ip != nil && ip.LBID != nil {
_, err = lbAPI.WaitForLbInstances(&lb.ZonedAPIWaitForLBInstancesRequest{
LBID: ID,
Zone: zone,
LBID: *res.LBID,
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
Timeout: scw.TimeDurationPtr(LbWaitForTimeout),
RetryInterval: scw.TimeDurationPtr(DefaultWaitLBRetryInterval),
}, scw.WithContext(ctx))
if err != nil {
Expand Down
23 changes: 16 additions & 7 deletions scaleway/resource_lb_ip_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package scaleway

import (
"context"
"fmt"
"testing"

Expand All @@ -18,18 +19,19 @@ func init() {
}

func testSweepLBIP(_ string) error {
return sweepZones([]scw.Zone{scw.ZoneFrPar1, scw.ZoneNlAms1, scw.ZonePlWaw1}, func(scwClient *scw.Client, region scw.Zone) error {
return sweepZones([]scw.Zone{scw.ZoneFrPar1, scw.ZoneNlAms1, scw.ZonePlWaw1}, func(scwClient *scw.Client, zone scw.Zone) error {
lbAPI := lb.NewZonedAPI(scwClient)

l.Debugf("sweeper: destroying the lb ips in (%s)", region)
listIPs, err := lbAPI.ListIPs(&lb.ZonedAPIListIPsRequest{}, scw.WithAllPages())
l.Debugf("sweeper: destroying the lb ips in zone (%s)", zone)
listIPs, err := lbAPI.ListIPs(&lb.ZonedAPIListIPsRequest{Zone: zone}, scw.WithAllPages())
if err != nil {
return fmt.Errorf("error listing lb ips in (%s) in sweeper: %s", region, err)
return fmt.Errorf("error listing lb ips in (%s) in sweeper: %s", zone, err)
}

for _, ip := range listIPs.IPs {
if ip.LBID == nil {
err := lbAPI.ReleaseIP(&lb.ZonedAPIReleaseIPRequest{
Zone: zone,
IPID: ip.ID,
})
if err != nil {
Expand Down Expand Up @@ -146,9 +148,16 @@ func testAccCheckScalewayLbIPDestroy(tt *TestTools) resource.TestCheckFunc {
}
}

_, err = lbAPI.GetIP(&lb.ZonedAPIGetIPRequest{
Zone: zone,
IPID: ID,
err = resource.RetryContext(context.Background(), retryLbIPInterval, func() *resource.RetryError {
_, errGet := lbAPI.GetIP(&lb.ZonedAPIGetIPRequest{
Zone: zone,
IPID: ID,
})
if is403Error(errGet) {
return resource.RetryableError(errGet)
}

return resource.NonRetryableError(errGet)
})

// If no error resource still exist
Expand Down
Loading