@@ -26,7 +26,6 @@ func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
26
26
userData := d .Get ("startup_script" ).(string )
27
27
pairName := d .Id ()
28
28
hddSize := d .Get ("instance_hdd_size" ).(int )
29
- region := GetRegion (d .Get ("region" ).(string ))
30
29
instanceType := getInstanceType (d .Get ("instance_type" ).(string ), d .Get ("instance_gpu" ).(string ))
31
30
ami := d .Get ("image" ).(string )
32
31
keyPublic := d .Get ("ssh_public" ).(string )
@@ -35,7 +34,9 @@ func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
35
34
spotPrice := d .Get ("spot_price" ).(float64 )
36
35
instanceProfile := d .Get ("instance_permission_set" ).(string )
37
36
subnetId := d .Get ("aws_subnet_id" ).(string )
38
- availabilityZone := GetAvailabilityZone (d .Get ("region" ).(string ))
37
+
38
+ region := GetRegion (d .Get ("region" ).(string ))
39
+ availabilityZone := GetAvailabilityZone (region )
39
40
40
41
metadata := map [string ]string {
41
42
"Name" : d .Get ("name" ).(string ),
@@ -417,14 +418,6 @@ func awsClient(region string) (aws.Config, error) {
417
418
)
418
419
}
419
420
420
- func GetAvailabilityZone (region string ) string {
421
- lastChar := region [len (region )- 1 ]
422
- if lastChar >= 'a' && lastChar <= 'z' {
423
- return region
424
- }
425
- return ""
426
- }
427
-
428
421
//GetRegion maps region to real cloud regions
429
422
func GetRegion (region string ) string {
430
423
instanceRegions := make (map [string ]string )
@@ -439,6 +432,14 @@ func GetRegion(region string) string {
439
432
return utils .StripAvailabilityZone (region )
440
433
}
441
434
435
+ func GetAvailabilityZone (region string ) string {
436
+ lastChar := region [len (region )- 1 ]
437
+ if lastChar >= 'a' && lastChar <= 'z' {
438
+ return region
439
+ }
440
+ return ""
441
+ }
442
+
442
443
func getInstanceType (instanceType string , instanceGPU string ) string {
443
444
instanceTypes := make (map [string ]string )
444
445
instanceTypes ["m" ] = "m5.2xlarge"
0 commit comments