Skip to content

chore(baremetal): add support for context workflow #616

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 4 commits into from
Oct 12, 2020
Merged

chore(baremetal): add support for context workflow #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2422e7b
chore(baremetal): add support for context workflow
remyleone Oct 9, 2020
c3e18d6
Merge branch 'master' into context_baremetal
remyleone Oct 12, 2020
2f16c9f
Fix
remyleone Oct 12, 2020
55b766b
Merge branch 'master' into context_baremetal
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
20 changes: 11 additions & 9 deletions scaleway/data_source_baremetal_offer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
package scaleway

import (
"context"
"fmt"

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

func dataSourceScalewayBaremetalOffer() *schema.Resource {
return &schema.Resource{
Read: dataSourceScalewayBaremetalOfferRead,
ReadContext: dataSourceScalewayBaremetalOfferRead,

Schema: map[string]*schema.Schema{
"name": {
Expand Down Expand Up @@ -129,35 +131,35 @@ func dataSourceScalewayBaremetalOffer() *schema.Resource {
}
}

func dataSourceScalewayBaremetalOfferRead(d *schema.ResourceData, m interface{}) error {
func dataSourceScalewayBaremetalOfferRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
meta := m.(*Meta)
baremetalAPI, fallBackZone, err := baremetalAPIWithZone(d, meta)
if err != nil {
return err
return diag.FromErr(err)
}

zone, offerID, _ := parseZonedID(datasourceNewZonedID(d.Get("offer_id"), fallBackZone))
res, err := baremetalAPI.ListOffers(&baremetal.ListOffersRequest{
Zone: zone,
}, scw.WithAllPages())
}, scw.WithAllPages(), scw.WithContext(ctx))
if err != nil {
return err
return diag.FromErr(err)
}

matches := []*baremetal.Offer(nil)
for _, offer := range res.Offers {
if offer.Name == d.Get("name") || offer.ID == offerID {
if !offer.Enable && !d.Get("include_disabled").(bool) {
return fmt.Errorf("offer %s (%s) found in zone %s but is disabled. Add allow_disabled=true in your terraform config to use it", offer.Name, offer.ID, zone)
return diag.FromErr(fmt.Errorf("offer %s (%s) found in zone %s but is disabled. Add allow_disabled=true in your terraform config to use it", offer.Name, offer.ID, zone))
}
matches = append(matches, offer)
}
}
if len(matches) == 0 {
return fmt.Errorf("no offer found with the name %s in zone %s", d.Get("name"), zone)
return diag.FromErr(fmt.Errorf("no offer found with the name %s in zone %s", d.Get("name"), zone))
}
if len(matches) > 1 {
return fmt.Errorf("%d offers found with the same name %s in zone %s", len(matches), d.Get("name"), zone)
return diag.FromErr(fmt.Errorf("%d offers found with the same name %s in zone %s", len(matches), d.Get("name"), zone))
}

offer := matches[0]
Expand Down
71 changes: 37 additions & 34 deletions scaleway/resource_baremetal_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
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"
baremetal "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
Expand All @@ -10,12 +13,12 @@ import (

func resourceScalewayBaremetalServer() *schema.Resource {
return &schema.Resource{
Create: resourceScalewayBaremetalServerCreate,
Read: resourceScalewayBaremetalServerRead,
Update: resourceScalewayBaremetalServerUpdate,
Delete: resourceScalewayBaremetalServerDelete,
CreateContext: resourceScalewayBaremetalServerCreate,
ReadContext: resourceScalewayBaremetalServerRead,
UpdateContext: resourceScalewayBaremetalServerUpdate,
DeleteContext: resourceScalewayBaremetalServerDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
StateContext: schema.ImportStatePassthroughContext,
},
SchemaVersion: 0,
Timeouts: &schema.ResourceTimeout{
Expand Down Expand Up @@ -118,10 +121,10 @@ func resourceScalewayBaremetalServer() *schema.Resource {
}
}

func resourceScalewayBaremetalServerCreate(d *schema.ResourceData, m interface{}) error {
func resourceScalewayBaremetalServerCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
baremetalAPI, zone, err := baremetalAPIWithZone(d, m)
if err != nil {
return err
return diag.FromErr(err)
}

offerID := expandZonedID(d.Get("offer"))
Expand All @@ -131,7 +134,7 @@ func resourceScalewayBaremetalServerCreate(d *schema.ResourceData, m interface{}
Zone: zone,
})
if err != nil {
return err
return diag.FromErr(err)
}
offerID = newZonedID(zone, o.ID)
}
Expand All @@ -144,9 +147,9 @@ func resourceScalewayBaremetalServerCreate(d *schema.ResourceData, m interface{}
Description: d.Get("description").(string),
OfferID: offerID.ID,
Tags: expandStrings(d.Get("tags")),
})
}, scw.WithContext(ctx))
if err != nil {
return err
return diag.FromErr(err)
}

d.SetId(newZonedID(server.Zone, server.ID).String())
Expand All @@ -157,7 +160,7 @@ func resourceScalewayBaremetalServerCreate(d *schema.ResourceData, m interface{}
Timeout: scw.TimeDurationPtr(baremetalServerWaitForTimeout),
})
if err != nil {
return err
return diag.FromErr(err)
}

_, err = baremetalAPI.InstallServer(&baremetal.InstallServerRequest{
Expand All @@ -166,9 +169,9 @@ func resourceScalewayBaremetalServerCreate(d *schema.ResourceData, m interface{}
OsID: expandZonedID(d.Get("os")).ID,
Hostname: expandStringWithDefault(d.Get("hostname"), server.Name),
SSHKeyIDs: expandStrings(d.Get("ssh_key_ids")),
})
}, scw.WithContext(ctx))
if err != nil {
return err
return diag.FromErr(err)
}

_, err = baremetalAPI.WaitForServerInstall(&baremetal.WaitForServerInstallRequest{
Expand All @@ -177,36 +180,36 @@ func resourceScalewayBaremetalServerCreate(d *schema.ResourceData, m interface{}
Timeout: scw.TimeDurationPtr(baremetalServerWaitForTimeout),
})
if err != nil {
return err
return diag.FromErr(err)
}

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

func resourceScalewayBaremetalServerRead(d *schema.ResourceData, m interface{}) error {
func resourceScalewayBaremetalServerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
baremetalAPI, zonedID, err := baremetalAPIWithZoneAndID(m, d.Id())
if err != nil {
return err
return diag.FromErr(err)
}

server, err := baremetalAPI.GetServer(&baremetal.GetServerRequest{
Zone: zonedID.Zone,
ServerID: zonedID.ID,
})
}, scw.WithContext(ctx))
if err != nil {
if is404Error(err) {
d.SetId("")
return nil
}
return err
return diag.FromErr(err)
}

offer, err := baremetalAPI.GetOffer(&baremetal.GetOfferRequest{
Zone: server.Zone,
OfferID: server.OfferID,
})
}, scw.WithContext(ctx))
if err != nil {
return err
return diag.FromErr(err)
}

_ = d.Set("name", server.Name)
Expand All @@ -226,10 +229,10 @@ func resourceScalewayBaremetalServerRead(d *schema.ResourceData, m interface{})
return nil
}

func resourceScalewayBaremetalServerUpdate(d *schema.ResourceData, m interface{}) error {
func resourceScalewayBaremetalServerUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
baremetalAPI, zonedID, err := baremetalAPIWithZoneAndID(m, d.Id())
if err != nil {
return err
return diag.FromErr(err)
}

_, err = baremetalAPI.UpdateServer(&baremetal.UpdateServerRequest{
Expand All @@ -238,9 +241,9 @@ func resourceScalewayBaremetalServerUpdate(d *schema.ResourceData, m interface{}
Name: expandStringPtr(d.Get("name")),
Description: expandStringPtr(d.Get("description")),
Tags: scw.StringsPtr(expandStrings(d.Get("tags"))),
})
}, scw.WithContext(ctx))
if err != nil {
return err
return diag.FromErr(err)
}

if d.HasChange("os") || d.HasChange("ssh_key_ids") {
Expand All @@ -252,9 +255,9 @@ func resourceScalewayBaremetalServerUpdate(d *schema.ResourceData, m interface{}
SSHKeyIDs: expandStrings(d.Get("ssh_key_ids")),
}

server, err := baremetalAPI.InstallServer(installReq)
server, err := baremetalAPI.InstallServer(installReq, scw.WithContext(ctx))
if err != nil {
return err
return diag.FromErr(err)
}

_, err = baremetalAPI.WaitForServerInstall(&baremetal.WaitForServerInstallRequest{
Expand All @@ -263,26 +266,26 @@ func resourceScalewayBaremetalServerUpdate(d *schema.ResourceData, m interface{}
Timeout: scw.TimeDurationPtr(baremetalServerWaitForTimeout),
})
if err != nil {
return err
return diag.FromErr(err)
}
}

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

func resourceScalewayBaremetalServerDelete(d *schema.ResourceData, m interface{}) error {
func resourceScalewayBaremetalServerDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
baremetalAPI, zonedID, err := baremetalAPIWithZoneAndID(m, d.Id())
if err != nil {
return err
return diag.FromErr(err)
}

server, err := baremetalAPI.DeleteServer(&baremetal.DeleteServerRequest{
Zone: zonedID.Zone,
ServerID: zonedID.ID,
})
}, scw.WithContext(ctx))

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

_, err = baremetalAPI.WaitForServer(&baremetal.WaitForServerRequest{
Expand All @@ -295,5 +298,5 @@ func resourceScalewayBaremetalServerDelete(d *schema.ResourceData, m interface{}
return nil
}

return err
return diag.FromErr(err)
}