update local getregion funcs

Author: dacbd

iterative/azure/provider.go

@@ -8,6 +8,8 @@ import (
 	"strings"
 	"time"
 
+	"terraform-provider-iterative/iterative/utils"
+
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-30/compute"
 	"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-11-01/network"
 	"github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2020-06-01/resources"
@@ -18,7 +20,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-//ResourceMachineCreate creates AWS instance
+//ResourceMachineCreate creates Azure instance
 func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interface{}) error {
 	subscriptionID, err := subscriptionID()
 	if err != nil {
@@ -27,7 +29,7 @@ func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
 
 	username := "ubuntu"
 	customData := d.Get("startup_script").(string)
-	region := GetRegion(d.Get("region").(string))
+	region := utils.GetRegion(d)
 	instanceType := getInstanceType(d.Get("instance_type").(string), d.Get("instance_gpu").(string))
 	keyPublic := d.Get("ssh_public").(string)
 	hddSize := int32(d.Get("instance_hdd_size").(int))
@@ -360,21 +362,6 @@ func getVMClient(subscriptionID string) (compute.VirtualMachinesClient, error) {
 	return client, err
 }
 
-//GetRegion maps region to real cloud regions
-func GetRegion(region string) string {
-	instanceRegions := make(map[string]string)
-	instanceRegions["us-east"] = "eastus"
-	instanceRegions["us-west"] = "westus2"
-	instanceRegions["eu-north"] = "northeurope"
-	instanceRegions["eu-west"] = "westeurope"
-
-	if val, ok := instanceRegions[region]; ok {
-		return val
-	}
-
-	return region
-}
-
 func getInstanceType(instanceType string, instanceGPU string) string {
 	instanceTypes := make(map[string]string)
 	instanceTypes["m"] = "Standard_F8s_v2"

iterative/gcp/provider.go

@@ -31,7 +31,7 @@ func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
 
 	networkName := "iterative"
 	instanceName := d.Get("name").(string)
-	instanceZone := getRegion(d.Get("region").(string))
+	instanceZone := utils.GetRegion(d)
 	instanceHddSize := int64(d.Get("instance_hdd_size").(int))
 	instancePublicSshKey := fmt.Sprintf("%s:%s %s\n", "ubuntu", strings.TrimSpace(d.Get("ssh_public").(string)), "ubuntu")
 	instanceServiceAccount := d.Get("instance_permission_set").(string)
@@ -277,7 +277,7 @@ func ResourceMachineDelete(ctx context.Context, d *schema.ResourceData, m interf
 		return err
 	}
 
-	instanceZone := getRegion(d.Get("region").(string))
+	instanceZone := utils.GetRegion(d)
 	instanceName := d.Get("name").(string)
 
 	service.Instances.Delete(project, instanceZone, instanceName).Do()
@@ -343,20 +343,6 @@ func waitForOperation(ctx context.Context, timeout time.Duration, function func(
 	return result, err
 }
 
-func getRegion(region string) string {
-	instanceRegions := make(map[string]string)
-	instanceRegions["us-east"] = "us-east1-c"
-	instanceRegions["us-west"] = "us-west1-b"
-	instanceRegions["eu-north"] = "europe-north1-a"
-	instanceRegions["eu-west"] = "europe-west1-d"
-
-	if val, ok := instanceRegions[region]; ok {
-		return val
-	}
-
-	return region
-}
-
 func getInstanceType(instanceType string, instanceGPU string) (map[string]map[string]string, error) {
 	instanceTypes := make(map[string]map[string]map[string]string)
 	instanceTypes["m"] = map[string]map[string]string{