Added support of SubnetIDs under AvailabilityZone (#615)

Author: sharadkesarwani

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Unreleased
 
+## 1.212.0 (March, 12 2025)
+ENHANCEMENTS:
+* resource/spotinst_elastigroup_aws: Fixed `availability_zones` object to align with API route.
+
 ## 1.211.0 (March, 06 2025)
 ENHANCEMENTS:
 * resource/spotinst_elastigroup_gcp: Added `shielded_instance_config` object to support `enable_secure_boot` and `enable_integrity_monitoring` fields.

docs/resources/elastigroup_aws.md

@@ -28,6 +28,13 @@ resource "spotinst_elastigroup_aws" "default-elastigroup" {
   region     = "us-west-2"
   subnet_ids = ["sb-123456", "sb-456789"]
 
+  # When availability_zones is set, subnet_ids should be left unused.
+  availability_zones {
+    availability_zones_name    = "us-west-2a"
+    subnet_ids                 = ["subnet-123456"]
+    placement_group_name       = "placementGroupName"
+  }
+
   image_id             = "ami-a27d8fda"
   iam_instance_profile = "iam-profile"
   key_name             = "my-key.ssh"
@@ -160,9 +167,10 @@ The following arguments are supported:
 * `product` - (Required) Operation system type. Valid values: `"Linux/UNIX"`, `"SUSE Linux"`, `"Windows"`. 
 For EC2 Classic instances: `"SUSE Linux (Amazon VPC)"`, `"Windows (Amazon VPC)"`.    
 
-* `availability_zones` - (Optional) List of Strings of availability zones. When this parameter is set, `subnet_ids` should be left unused.
-Note: `availability_zones` naming syntax follows the convention `availability-zone:subnet:placement-group-name`. For example, to set an AZ in `us-east-1` with subnet `subnet-123456` and placement group `ClusterI03`, you would set:
-`availability_zones = ["us-east-1a:subnet-123456:ClusterI03"]`
+* `availability_zones` - (Optional) One or more availability Zones for the group. When this parameter is set, compute.subnetIds should be left unused.
+    * `availability_zones_name` - (Required) The Availability Zone name.
+    * `subnet_ids` - (Optional) A comma-separated list of subnet identifiers for your group.
+    * `placement_group_name` - (Optional) specify a Placement Group name, the instances will be launched in the Placement Group for the AZ.
 
 * `subnet_ids` - (Optional) List of Strings of subnet identifiers.
 Note: When this parameter is set, `availability_zones` should be left unused.

spotinst/elastigroup_aws/consts.go

@@ -37,6 +37,8 @@ const (
 	Region                     commons.FieldName = "region"
 	SubnetIDs                  commons.FieldName = "subnet_ids"
 	AvailabilityZones          commons.FieldName = "availability_zones"
+	PlacementGroupName         commons.FieldName = "placement_group_name"
+	AvailabilityZoneName       commons.FieldName = "availability_zones_name"
 	PreferredAvailabilityZones commons.FieldName = "preferred_availability_zones"
 	ElasticLoadBalancers       commons.FieldName = "elastic_load_balancers"
 	TargetGroupArns            commons.FieldName = "target_group_arns"

spotinst/elastigroup_aws/fields_spotinst_elastigroup_aws.go

@@ -440,6 +440,7 @@ func Setup(fieldsMap map[commons.FieldName]*commons.GenericField) {
 			Elem:          &schema.Schema{Type: schema.TypeString},
 			ConflictsWith: []string{string(AvailabilityZones)},
 			Optional:      true,
+			Deprecated:    "This field will soon be deprecated and handled by availability_zones",
 		},
 		func(resourceObject interface{}, resourceData *schema.ResourceData, meta interface{}) error {
 			egWrapper := resourceObject.(*commons.ElastigroupWrapper)
@@ -536,39 +537,65 @@ func Setup(fieldsMap map[commons.FieldName]*commons.GenericField) {
 		AvailabilityZones,
 		&schema.Schema{
 			Type:     schema.TypeList,
-			Elem:     &schema.Schema{Type: schema.TypeString},
 			Optional: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					string(SubnetIDs): {
+						Type:     schema.TypeList,
+						Optional: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString},
+					},
+					string(AvailabilityZoneName): {
+						Type:     schema.TypeString,
+						Required: true,
+					},
+					string(PlacementGroupName): {
+						Type:     schema.TypeString,
+						Optional: true,
+					},
+				},
+			},
 		},
 		func(resourceObject interface{}, resourceData *schema.ResourceData, meta interface{}) error {
-			// Skip
+			egWrapper := resourceObject.(*commons.ElastigroupWrapper)
+			elastigroup := egWrapper.GetElastigroup()
+			var result []interface{} = nil
+			if elastigroup.Compute != nil && elastigroup.Compute.AvailabilityZones != nil {
+				az := elastigroup.Compute.AvailabilityZones
+				result = flattenAvailabilityZones(az)
+			}
+			if result != nil {
+				if err := resourceData.Set(string(AvailabilityZones), result); err != nil {
+					return fmt.Errorf("failed to set availabilityZone configuration: %#v", err)
+				}
+			}
 			return nil
 		},
 		func(resourceObject interface{}, resourceData *schema.ResourceData, meta interface{}) error {
 			egWrapper := resourceObject.(*commons.ElastigroupWrapper)
 			elastigroup := egWrapper.GetElastigroup()
-			if _, exists := resourceData.GetOk(string(SubnetIDs)); !exists {
-				if value, ok := resourceData.GetOk(string(AvailabilityZones)); ok {
-					if zones, err := expandAvailabilityZonesSlice(value); err != nil {
-						return err
-					} else {
-						elastigroup.Compute.SetAvailabilityZones(zones)
-					}
+			if v, ok := resourceData.GetOk(string(AvailabilityZones)); ok {
+				if availabilityZones, err := expandAvailabilityZones(v); err != nil {
+					return err
+				} else {
+					elastigroup.Compute.SetAvailabilityZones(availabilityZones)
 				}
 			}
 			return nil
 		},
 		func(resourceObject interface{}, resourceData *schema.ResourceData, meta interface{}) error {
 			egWrapper := resourceObject.(*commons.ElastigroupWrapper)
 			elastigroup := egWrapper.GetElastigroup()
-			if _, exists := resourceData.GetOk(string(SubnetIDs)); !exists {
-				if value, ok := resourceData.GetOk(string(AvailabilityZones)); ok {
-					if zones, err := expandAvailabilityZonesSlice(value); err != nil {
-						return err
-					} else {
-						elastigroup.Compute.SetAvailabilityZones(zones)
-					}
+			var result []*aws.AvailabilityZone = nil
+			if v, ok := resourceData.GetOk(string(AvailabilityZones)); ok {
+				if availabilityZones, err := expandAvailabilityZones(v); err != nil {
+					return err
+				} else {
+					result = availabilityZones
 				}
 			}
+			elastigroup.Compute.SetAvailabilityZones(result)
 			return nil
 		},
 		nil,
@@ -1384,3 +1411,49 @@ func extractTargetGroupFromArn(arn string) (string, error) {
 	}
 	return name, nil
 }
+
+func expandAvailabilityZones(data interface{}) ([]*aws.AvailabilityZone, error) {
+	if list := data.([]interface{}); len(list) > 0 {
+		availabilityZones := make([]*aws.AvailabilityZone, 0, len(list))
+		for _, item := range list {
+			m := item.(map[string]interface{})
+			availabilityZone := &aws.AvailabilityZone{}
+
+			if v, ok := m[string(AvailabilityZoneName)].(string); ok && v != "" {
+				availabilityZone.SetName(spotinst.String(v))
+			}
+
+			if v, ok := m[string(PlacementGroupName)].(string); ok && v != "" {
+				availabilityZone.SetPlacementGroupName(spotinst.String(v))
+			}
+
+			if v, ok := m[string(SubnetIDs)]; ok && len(v.([]interface{})) > 0 {
+				if subnetIDs, err := expandSubnetIDs(v); err != nil {
+					return nil, err
+				} else {
+					availabilityZone.SetSubnetIDs(subnetIDs)
+				}
+			}
+			availabilityZones = append(availabilityZones, availabilityZone)
+		}
+		return availabilityZones, nil
+	}
+	return nil, nil
+
+}
+
+func flattenAvailabilityZones(availabilityZones []*aws.AvailabilityZone) []interface{} {
+	result := make([]interface{}, 0, len(availabilityZones))
+
+	for _, availabilityZone := range availabilityZones {
+		m := make(map[string]interface{})
+		if availabilityZone.SubnetIDs != nil {
+			m[string(SubnetIDs)] = spotinst.StringSlice(availabilityZone.SubnetIDs)
+		}
+		m[string(AvailabilityZoneName)] = spotinst.StringValue(availabilityZone.Name)
+		m[string(PlacementGroupName)] = spotinst.StringValue(availabilityZone.PlacementGroupName)
+
+		result = append(result, m)
+	}
+	return result
+}