Merge pull request hashicorp#9312 from nicolai86/chore/upgrade-scaleway-api

provider/scaleway: SDK upgrade

Author: jen20

builtin/providers/scaleway/config.go

@@ -14,6 +14,7 @@ import (
 type Config struct {
 	Organization string
 	APIKey       string
+	Region       string
 }
 
 // Client contains scaleway api clients
@@ -27,6 +28,7 @@ func (c *Config) Client() (*Client, error) {
 		c.Organization,
 		c.APIKey,
 		scwversion.UserAgent(),
+		c.Region,
 		func(s *api.ScalewayAPI) {
 			s.Logger = newTerraformLogger()
 		},

builtin/providers/scaleway/helpers.go

@@ -1,9 +1,7 @@
 package scaleway
 
 import (
-	"fmt"
 	"log"
-	"net/http"
 	"time"
 
 	"github.com/scaleway/scaleway-cli/pkg/api"
@@ -19,33 +17,6 @@ func String(val string) *string {
 	return &val
 }
 
-// DetachIP detaches an IP from a server
-func DetachIP(s *api.ScalewayAPI, ipID string) error {
-	var update struct {
-		Address      string `json:"address"`
-		ID           string `json:"id"`
-		Organization string `json:"organization"`
-	}
-
-	ip, err := s.GetIP(ipID)
-	if err != nil {
-		return err
-	}
-	update.Address = ip.IP.Address
-	update.ID = ip.IP.ID
-	update.Organization = ip.IP.Organization
-
-	resp, err := s.PutResponse(api.ComputeAPI, fmt.Sprintf("ips/%s", ipID), update)
-	if err != nil {
-		return err
-	}
-	if resp.StatusCode != http.StatusOK {
-		return err
-	}
-	resp.Body.Close()
-	return nil
-}
-
 // NOTE copied from github.com/scaleway/scaleway-cli/pkg/api/helpers.go
 // the helpers.go file pulls in quite a lot dependencies, and they're just convenience wrappers anyway
 

builtin/providers/scaleway/provider.go

@@ -21,6 +21,12 @@ func Provider() terraform.ResourceProvider {
 				DefaultFunc: schema.EnvDefaultFunc("SCALEWAY_ORGANIZATION", nil),
 				Description: "The Organization ID for Scaleway API operations.",
 			},
+			"region": &schema.Schema{
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("SCALEWAY_REGION", "par1"),
+				Description: "The Scaleway API region to use.",
+			},
 		},
 
 		ResourcesMap: map[string]*schema.Resource{
@@ -40,6 +46,7 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	config := Config{
 		Organization: d.Get("organization").(string),
 		APIKey:       d.Get("access_key").(string),
+		Region:       d.Get("region").(string),
 	}
 
 	return config.Client()

builtin/providers/scaleway/resource_scaleway_ip.go

@@ -70,7 +70,7 @@ func resourceScalewayIPUpdate(d *schema.ResourceData, m interface{}) error {
 			}
 		} else {
 			log.Printf("[DEBUG] Detaching IP %q\n", d.Id())
-			return DetachIP(scaleway, d.Id())
+			return scaleway.DetachIP(d.Id())
 		}
 	}