Skip to content

chore(lb): add support for context workflow #624

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

Merged
merged 2 commits into from
Oct 12, 2020
Merged

chore(lb): add support for context workflow #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47eb41c
chore(lb): add support for context workflow
remyleone Oct 12, 2020
ce91cd5
Merge branch 'master' into context_lb
remyleone Oct 12, 2020
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
23 changes: 13 additions & 10 deletions scaleway/data_source_lb_ip_beta.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package scaleway

import (
"context"
"fmt"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"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"
)

func dataSourceScalewayLbIPBeta() *schema.Resource {
Expand All @@ -26,15 +29,15 @@ func dataSourceScalewayLbIPBeta() *schema.Resource {
}

return &schema.Resource{
Read: dataSourceScalewayLbIPBetaRead,
Schema: dsSchema,
ReadContext: dataSourceScalewayLbIPBetaRead,
Schema: dsSchema,
}
}

func dataSourceScalewayLbIPBetaRead(d *schema.ResourceData, m interface{}) error {
func dataSourceScalewayLbIPBetaRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
api, region, err := lbAPIWithRegion(d, m)
if err != nil {
return err
return diag.FromErr(err)
}

ipID, ok := d.GetOk("ip_id")
Expand All @@ -44,15 +47,15 @@ func dataSourceScalewayLbIPBetaRead(d *schema.ResourceData, m interface{}) error
IPAddress: expandStringPtr(d.Get("ip_address")),
OrganizationID: expandStringPtr(d.Get("organization_id")),
ProjectID: expandStringPtr(d.Get("project_id")),
})
}, scw.WithContext(ctx))
if err != nil {
return err
return diag.FromErr(err)
}
if len(res.IPs) == 0 {
return fmt.Errorf("no ips found with the address %s", d.Get("ip_address"))
return diag.FromErr(fmt.Errorf("no ips found with the address %s", d.Get("ip_address")))
}
if len(res.IPs) > 1 {
return fmt.Errorf("%d ips found with the same address %s", len(res.IPs), d.Get("ip_address"))
return diag.FromErr(fmt.Errorf("%d ips found with the same address %s", len(res.IPs), d.Get("ip_address")))
}
ipID = res.IPs[0].ID
}
Expand All @@ -61,7 +64,7 @@ func dataSourceScalewayLbIPBetaRead(d *schema.ResourceData, m interface{}) error
d.SetId(regionalID)
err = d.Set("ip_id", regionalID)
if err != nil {
return err
return diag.FromErr(err)
}
return resourceScalewayLbIPBetaRead(d, m)
return resourceScalewayLbIPBetaRead(ctx, d, m)
}
58 changes: 31 additions & 27 deletions scaleway/resource_lb_backend_beta.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
package scaleway

import (
"context"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
"github.com/scaleway/scaleway-sdk-go/api/lb/v1"
"github.com/scaleway/scaleway-sdk-go/scw"
)

func resourceScalewayLbBackendBeta() *schema.Resource {
return &schema.Resource{
Create: resourceScalewayLbBackendBetaCreate,
Read: resourceScalewayLbBackendBetaRead,
Update: resourceScalewayLbBackendBetaUpdate,
Delete: resourceScalewayLbBackendBetaDelete,
CreateContext: resourceScalewayLbBackendBetaCreate,
ReadContext: resourceScalewayLbBackendBetaRead,
UpdateContext: resourceScalewayLbBackendBetaUpdate,
DeleteContext: resourceScalewayLbBackendBetaDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
StateContext: schema.ImportStatePassthroughContext,
},
SchemaVersion: 0,
Schema: map[string]*schema.Schema{
Expand Down Expand Up @@ -228,12 +232,12 @@ func resourceScalewayLbBackendBeta() *schema.Resource {
}
}

func resourceScalewayLbBackendBetaCreate(d *schema.ResourceData, m interface{}) error {
func resourceScalewayLbBackendBetaCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
lbAPI := lbAPI(m)

region, LbID, err := parseRegionalID(d.Get("lb_id").(string))
if err != nil {
return err
return diag.FromErr(err)
}

healthCheckPort := d.Get("health_check_port").(int)
Expand Down Expand Up @@ -268,33 +272,33 @@ func resourceScalewayLbBackendBetaCreate(d *schema.ResourceData, m interface{})
OnMarkedDownAction: expandLbBackendMarkdownAction(d.Get("on_marked_down_action")),
}

res, err := lbAPI.CreateBackend(createReq)
res, err := lbAPI.CreateBackend(createReq, scw.WithContext(ctx))
if err != nil {
return err
return diag.FromErr(err)
}

d.SetId(newRegionalIDString(region, res.ID))

return resourceScalewayLbBackendBetaRead(d, m)
return resourceScalewayLbBackendBetaRead(ctx, d, m)
}

func resourceScalewayLbBackendBetaRead(d *schema.ResourceData, m interface{}) error {
func resourceScalewayLbBackendBetaRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
lbAPI, region, ID, err := lbAPIWithRegionAndID(m, d.Id())
if err != nil {
return err
return diag.FromErr(err)
}

res, err := lbAPI.GetBackend(&lb.GetBackendRequest{
Region: region,
BackendID: ID,
})
}, scw.WithContext(ctx))

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

_ = d.Set("lb_id", newRegionalIDString(region, res.LB.ID))
Expand Down Expand Up @@ -322,10 +326,10 @@ func resourceScalewayLbBackendBetaRead(d *schema.ResourceData, m interface{}) er
return nil
}

func resourceScalewayLbBackendBetaUpdate(d *schema.ResourceData, m interface{}) error {
func resourceScalewayLbBackendBetaUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
lbAPI, region, ID, err := lbAPIWithRegionAndID(m, d.Id())
if err != nil {
return err
return diag.FromErr(err)
}

req := &lb.UpdateBackendRequest{
Expand All @@ -345,9 +349,9 @@ func resourceScalewayLbBackendBetaUpdate(d *schema.ResourceData, m interface{})
OnMarkedDownAction: expandLbBackendMarkdownAction(d.Get("on_marked_down_action")),
}

_, err = lbAPI.UpdateBackend(req)
_, err = lbAPI.UpdateBackend(req, scw.WithContext(ctx))
if err != nil {
return err
return diag.FromErr(err)
}

// Update Health Check
Expand All @@ -367,37 +371,37 @@ func resourceScalewayLbBackendBetaUpdate(d *schema.ResourceData, m interface{})
updateHCRequest.TCPConfig = expandLbHCTCP(d.Get("health_check_tcp"))
}

_, err = lbAPI.UpdateHealthCheck(updateHCRequest)
_, err = lbAPI.UpdateHealthCheck(updateHCRequest, scw.WithContext(ctx))
if err != nil {
return err
return diag.FromErr(err)
}

// Update Backend servers
_, err = lbAPI.SetBackendServers(&lb.SetBackendServersRequest{
Region: region,
BackendID: ID,
ServerIP: expandStrings(d.Get("server_ips")),
})
}, scw.WithContext(ctx))
if err != nil {
return err
return diag.FromErr(err)
}

return resourceScalewayLbBackendBetaRead(d, m)
return resourceScalewayLbBackendBetaRead(ctx, d, m)
}

func resourceScalewayLbBackendBetaDelete(d *schema.ResourceData, m interface{}) error {
func resourceScalewayLbBackendBetaDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
lbAPI, region, ID, err := lbAPIWithRegionAndID(m, d.Id())
if err != nil {
return err
return diag.FromErr(err)
}

err = lbAPI.DeleteBackend(&lb.DeleteBackendRequest{
Region: region,
BackendID: ID,
})
}, scw.WithContext(ctx))

if err != nil && !is404Error(err) {
return err
return diag.FromErr(err)
}

return nil
Expand Down
56 changes: 29 additions & 27 deletions scaleway/resource_lb_beta.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
package scaleway

import (
"context"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
lb "github.com/scaleway/scaleway-sdk-go/api/lb/v1"
"github.com/scaleway/scaleway-sdk-go/scw"
)

func resourceScalewayLbBeta() *schema.Resource {
return &schema.Resource{
Create: resourceScalewayLbBetaCreate,
Read: resourceScalewayLbBetaRead,
Update: resourceScalewayLbBetaUpdate,
Delete: resourceScalewayLbBetaDelete,
CreateContext: resourceScalewayLbBetaCreate,
ReadContext: resourceScalewayLbBetaRead,
UpdateContext: resourceScalewayLbBetaUpdate,
DeleteContext: resourceScalewayLbBetaDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
StateContext: schema.ImportStatePassthroughContext,
},
SchemaVersion: 0,
Schema: map[string]*schema.Schema{
Expand Down Expand Up @@ -59,10 +61,10 @@ func resourceScalewayLbBeta() *schema.Resource {
}
}

func resourceScalewayLbBetaCreate(d *schema.ResourceData, m interface{}) error {
func resourceScalewayLbBetaCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
lbAPI, region, err := lbAPIWithRegion(d, m)
if err != nil {
return err
return diag.FromErr(err)
}

createReq := &lb.CreateLBRequest{
Expand All @@ -79,9 +81,9 @@ func resourceScalewayLbBetaCreate(d *schema.ResourceData, m interface{}) error {
createReq.Tags = append(createReq.Tags, tag.(string))
}
}
res, err := lbAPI.CreateLB(createReq)
res, err := lbAPI.CreateLB(createReq, scw.WithContext(ctx))
if err != nil {
return err
return diag.FromErr(err)
}

d.SetId(newRegionalIDString(region, res.ID))
Expand All @@ -90,31 +92,31 @@ func resourceScalewayLbBetaCreate(d *schema.ResourceData, m interface{}) error {
Region: region,
LBID: res.ID,
Timeout: scw.TimeDurationPtr(InstanceServerWaitForTimeout),
})
}, scw.WithContext(ctx))
if err != nil {
return err
return diag.FromErr(err)
}

return resourceScalewayLbBetaRead(d, m)
return resourceScalewayLbBetaRead(ctx, d, m)
}

func resourceScalewayLbBetaRead(d *schema.ResourceData, m interface{}) error {
func resourceScalewayLbBetaRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
lbAPI, region, ID, err := lbAPIWithRegionAndID(m, d.Id())
if err != nil {
return err
return diag.FromErr(err)
}

res, err := lbAPI.GetLB(&lb.GetLBRequest{
Region: region,
LBID: ID,
})
}, scw.WithContext(ctx))

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

_ = d.Set("name", res.Name)
Expand All @@ -130,10 +132,10 @@ func resourceScalewayLbBetaRead(d *schema.ResourceData, m interface{}) error {
return nil
}

func resourceScalewayLbBetaUpdate(d *schema.ResourceData, m interface{}) error {
func resourceScalewayLbBetaUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
lbAPI, region, ID, err := lbAPIWithRegionAndID(m, d.Id())
if err != nil {
return err
return diag.FromErr(err)
}

if d.HasChange("name") || d.HasChange("tags") {
Expand All @@ -144,39 +146,39 @@ func resourceScalewayLbBetaUpdate(d *schema.ResourceData, m interface{}) error {
Tags: expandStrings(d.Get("tags")),
}

_, err = lbAPI.UpdateLB(req)
_, err = lbAPI.UpdateLB(req, scw.WithContext(ctx))
if err != nil {
return err
return diag.FromErr(err)
}
}

return resourceScalewayLbBetaRead(d, m)
return resourceScalewayLbBetaRead(ctx, d, m)
}

func resourceScalewayLbBetaDelete(d *schema.ResourceData, m interface{}) error {
func resourceScalewayLbBetaDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
lbAPI, region, ID, err := lbAPIWithRegionAndID(m, d.Id())
if err != nil {
return err
return diag.FromErr(err)
}

err = lbAPI.DeleteLB(&lb.DeleteLBRequest{
Region: region,
LBID: ID,
ReleaseIP: false,
})
}, scw.WithContext(ctx))

if err != nil && !is404Error(err) {
return err
return diag.FromErr(err)
}

_, err = lbAPI.WaitForLb(&lb.WaitForLBRequest{
LBID: ID,
Region: region,
Timeout: scw.TimeDurationPtr(LbWaitForTimeout),
})
}, scw.WithContext(ctx))

if err != nil && !is404Error(err) {
return err
return diag.FromErr(err)
}

return nil
Expand Down
Loading