feat: custom URL and custom regions/zones (#542)

Signed-off-by: Patrik Cyvoct <[email protected]>
Co-authored-by: Jerome Quere <[email protected]>

Author: Sh4d1

scaleway/config.go

@@ -9,6 +9,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -31,6 +32,7 @@ type Meta struct {
 	DefaultOrganizationID string
 	DefaultRegion         scw.Region
 	DefaultZone           scw.Zone
+	APIURL                string
 	TerraformVersion      string
 
 	// scwClient is the Scaleway SDK client.
@@ -91,6 +93,10 @@ func (m *Meta) bootstrapScwClient() error {
 		options = append(options, scw.WithDefaultZone(m.DefaultZone))
 	}
 
+	if m.APIURL != "" {
+		options = append(options, scw.WithAPIURL(m.APIURL))
+	}
+
 	client, err := scw.NewClient(options...)
 	if err != nil {
 		return fmt.Errorf("cannot create SDK client: %s", err)
@@ -167,6 +173,11 @@ func (m *Meta) bootstrapDeprecatedClient() error {
 		options,
 	)
 	if err != nil {
+		// Ugly fix bug this should be removed when we remove support for older resources.
+		if strings.HasSuffix(err.Error(), "isn't a valid region") {
+			// will panic if using the deprecated client
+			return nil
+		}
 		return fmt.Errorf("cannot create deprecated SDK client: %s", err)
 	}
 

scaleway/provider.go

@@ -9,6 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 	"github.com/mitchellh/go-homedir"
+	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
@@ -168,7 +169,20 @@ func Provider() terraform.ResourceProvider {
 				},
 				ValidateFunc: validationZone(),
 			},
-
+			"api_url": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "The Scaleway API URL to use.",
+				DefaultFunc: func() (interface{}, error) {
+					if envProfile.APIURL != nil {
+						return *envProfile.APIURL, nil
+					}
+					if activeProfile != nil && activeProfile.APIURL != nil {
+						return *activeProfile.APIURL, nil
+					}
+					return nil, nil
+				},
+			},
 			// Deprecated values
 			"token": {
 				Type:       schema.TypeString,
@@ -294,6 +308,7 @@ func providerConfigure(d *schema.ResourceData, terraformVersion string) (interfa
 		DefaultRegion:         region,
 		DefaultZone:           zone,
 		TerraformVersion:      terraformVersion,
+		APIURL:                d.Get("api_url").(string),
 	}
 
 	err = meta.bootstrap()
@@ -303,10 +318,15 @@ func providerConfigure(d *schema.ResourceData, terraformVersion string) (interfa
 
 	// fetch known scaleway server types to support validation in r/server
 	if len(commercialServerTypes) == 0 {
-		if availability, err := meta.deprecatedClient.GetServerAvailabilities(); err == nil {
-			commercialServerTypes = availability.CommercialTypes()
+		instanceAPI := instance.NewAPI(meta.scwClient)
+		availabilityResp, err := instanceAPI.GetServerTypesAvailability(&instance.GetServerTypesAvailabilityRequest{}, scw.WithAllPages())
+		if err == nil {
+			for k := range availabilityResp.Servers {
+				commercialServerTypes = append(commercialServerTypes, k)
+			}
 			sort.StringSlice(commercialServerTypes).Sort()
 		}
+
 		if os.Getenv("DISABLE_SCALEWAY_SERVER_TYPE_VALIDATION") != "" {
 			commercialServerTypes = commercialServerTypes[:0]
 		}