allow subnetIds in Instance Group Definition

Author: pryan-ryan

docs/resources/datahub_aws_cluster.md

@@ -324,6 +324,7 @@ Optional:
 
 - `availability_zones` (Set of String) The set of availability zones that are going to be used for cluster creation on the given instance group.
 - `recipes` (Set of String) The set of recipe names that are going to be applied on the given instance group.
+- `subnet_ids` (Set of String) The set of subnet ids that are going to be applied on the given instance group in case of multi-availability zone setup
 
 <a id="nestedatt--instance_group--attached_volume_configuration"></a>
 ### Nested Schema for `instance_group.attached_volume_configuration`

resources/datahub/common_schema.go

@@ -160,6 +160,11 @@ var instanceGroupSchemaAttributes = map[string]schema.Attribute{
 					ElementType:         types.StringType,
 					Optional:            true,
 				},
+				"subnet_ids": schema.SetAttribute{
+					MarkdownDescription: "The set of subnet ids that are going to be applied on the given instance group in case of multi-availability zone setup",
+					ElementType:         types.StringType,
+					Optional:            true,
+				},
 				"availability_zones": schema.SetAttribute{
 					MarkdownDescription: "The set of availability zones that are going to be used for cluster creation on the given instance group.",
 					ElementType:         types.StringType,

resources/datahub/converter.go

@@ -39,13 +39,26 @@ func fromModelToAwsRequest(model awsDatahubResourceModel, ctx context.Context) *
 			tflog.Debug(ctx, fmt.Sprintf("Converting AttachedVolumeConfiguration: %+v.", vrs))
 			volReqs = append(volReqs, createAttachedVolumeRequest(vrs))
 		}
+		var igRecipes []string
+		if len(group.Recipes) > 0 {
+			for _, recipe := range group.Recipes {
+				igRecipes = append(igRecipes, recipe.ValueString())
+			}
+		}
+		var igSubnetIds []string
+		if len(group.SubnetIds) > 0 {
+			for _, subnetId := range group.SubnetIds {
+				igSubnetIds = append(igSubnetIds, subnetId.ValueString())
+			}
+		}
 		ig := &datahubmodels.InstanceGroupRequest{
 			AttachedVolumeConfiguration: volReqs,
 			InstanceGroupName:           group.InstanceGroupName.ValueStringPointer(),
 			InstanceGroupType:           group.InstanceGroupType.ValueStringPointer(),
 			InstanceType:                group.InstanceType.ValueStringPointer(),
 			NodeCount:                   group.NodeCount.ValueInt32Pointer(),
-			RecipeNames:                 utils.StringArrayToSlice(group.Recipes),
+			RecipeNames:                 igRecipes,
+			SubnetIds:                   igSubnetIds,
 			RecoveryMode:                group.RecoveryMode.ValueString(),
 			RootVolumeSize:              group.RootVolumeSize.ValueInt32(),
 			VolumeEncryption: &datahubmodels.VolumeEncryptionRequest{

resources/datahub/converter_test.go

@@ -96,6 +96,27 @@ func TestFromModelToRequestRecipe(t *testing.T) {
 	}
 }
 
+func TestFromModelToRequestSubnetId(t *testing.T) {
+	subnetIds := []types.String{types.StringValue("subnet1"), types.StringValue("subnet2")}
+	igs := []InstanceGroup{{SubnetIds: subnetIds}}
+	input := awsDatahubResourceModel{InstanceGroup: igs}
+
+	got := fromModelToAwsRequest(input, context.TODO())
+	test.CompareInts(len(got.InstanceGroups), len(input.InstanceGroup), t)
+	test.CompareInts(len(got.InstanceGroups[0].SubnetIds), len(input.InstanceGroup[0].SubnetIds), t)
+
+	for _, convertedSubnetId := range got.InstanceGroups[0].SubnetIds {
+		var contains bool
+		for _, originalSubnetId := range input.InstanceGroup[0].SubnetIds {
+			if originalSubnetId.ValueString() == convertedSubnetId {
+				contains = true
+			}
+		}
+		if !contains {
+			t.Errorf("Instance group does not contain subnetId: %s", convertedSubnetId)
+		}
+	}
+}
 func TestFromModelToRequestAttachedVolumeConfiguration(t *testing.T) {
 	avcs := []AttachedVolumeConfiguration{{
 		VolumeSize:  types.Int32Value(100),

resources/datahub/model_datahub.go

@@ -24,6 +24,7 @@ type InstanceGroup struct {
 	RecoveryMode                types.String                  `tfsdk:"recovery_mode"`
 	VolumeEncryption            VolumeEncryption              `tfsdk:"volume_encryption"`
 	Recipes                     []types.String                `tfsdk:"recipes"`
+	SubnetIds                   []types.String                `tfsdk:"subnet_ids"`
 	AvailabilityZones           []types.String                `tfsdk:"availability_zones"`
 }