updating instance_reservation_configs field in oci_core_compute_capacity_reservation to typeSet

Author: AravindOracle

internal/integrationtest/core_compute_capacity_reservation_test.go

@@ -64,11 +64,37 @@ var (
 		"instance_shape_config":      acctest.RepresentationGroup{RepType: acctest.Optional, Group: CoreComputeCapacityReservationInstanceReservationConfigsInstanceShapeConfigRepresentation},
 	}
 
+	CoreComputeCapacityReservationInstanceReservationConfigsRepresentation2 = map[string]interface{}{
+		"instance_shape":             acctest.Representation{RepType: acctest.Required, Create: `VM.Standard.E5.Flex`},
+		"fault_domain":               acctest.Representation{RepType: acctest.Optional, Create: `FAULT-DOMAIN-1`},
+		"cluster_placement_group_id": acctest.Representation{RepType: acctest.Optional, Create: `${var.cluster_placement_group_id2}`},
+		"reserved_count":             acctest.Representation{RepType: acctest.Required, Create: `1`, Update: `2`},
+		"instance_shape_config":      acctest.RepresentationGroup{RepType: acctest.Required, Group: CoreComputeCapacityReservationInstanceReservationConfigsInstanceShapeConfigRepresentation2},
+	}
+
+	CoreComputeCapacityReservationInstanceReservationConfigsRepresentation3 = map[string]interface{}{
+		"instance_shape":             acctest.Representation{RepType: acctest.Required, Create: `VM.Standard.E5.Flex`},
+		"fault_domain":               acctest.Representation{RepType: acctest.Optional, Create: `FAULT-DOMAIN-1`},
+		"cluster_placement_group_id": acctest.Representation{RepType: acctest.Optional, Create: `${var.cluster_placement_group_id3}`},
+		"reserved_count":             acctest.Representation{RepType: acctest.Required, Create: `1`, Update: `2`},
+		"instance_shape_config":      acctest.RepresentationGroup{RepType: acctest.Required, Group: CoreComputeCapacityReservationInstanceReservationConfigsInstanceShapeConfigRepresentation3},
+	}
+
 	CoreComputeCapacityReservationInstanceReservationConfigsInstanceShapeConfigRepresentation = map[string]interface{}{
 		"memory_in_gbs": acctest.Representation{RepType: acctest.Optional, Create: `15`},
 		"ocpus":         acctest.Representation{RepType: acctest.Optional, Create: `1`},
 	}
 
+	CoreComputeCapacityReservationInstanceReservationConfigsInstanceShapeConfigRepresentation2 = map[string]interface{}{
+		"memory_in_gbs": acctest.Representation{RepType: acctest.Required, Create: `24`},
+		"ocpus":         acctest.Representation{RepType: acctest.Required, Create: `2`},
+	}
+
+	CoreComputeCapacityReservationInstanceReservationConfigsInstanceShapeConfigRepresentation3 = map[string]interface{}{
+		"memory_in_gbs": acctest.Representation{RepType: acctest.Required, Create: `36`},
+		"ocpus":         acctest.Representation{RepType: acctest.Required, Create: `3`},
+	}
+
 	CoreComputeCapacityReservationResourceDependencies = AvailabilityDomainConfig +
 		DefinedTagsDependencies
 )
@@ -114,11 +140,33 @@ func TestCoreComputeCapacityReservationResource_basic(t *testing.T) {
 			),
 		},
 
-		// Step 1: delete before next Create
+		// Step 1: Add instance reservation config
+		{
+			Config: config + compartmentIdVariableStr + clusterPlacementGroupIdStr + CoreComputeCapacityReservationResourceDependencies +
+				acctest.GenerateResourceFromRepresentationMap("oci_core_compute_capacity_reservation", "test_compute_capacity_reservation", acctest.Optional, acctest.Update, acctest.RepresentationCopyWithNewProperties(CoreComputeCapacityReservationRepresentation, map[string]interface{}{
+					"instance_reservation_configs": []acctest.RepresentationGroup{{RepType: acctest.Optional, Group: CoreComputeCapacityReservationInstanceReservationConfigsRepresentation}, {RepType: acctest.Optional, Group: CoreComputeCapacityReservationInstanceReservationConfigsRepresentation2}},
+				})),
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(resourceName, "instance_reservation_configs.#", "2"),
+			),
+		},
+
+		// Step 2: verify unordered attach
+		{
+			Config: config + compartmentIdVariableStr + clusterPlacementGroupIdStr + CoreComputeCapacityReservationResourceDependencies +
+				acctest.GenerateResourceFromRepresentationMap("oci_core_compute_capacity_reservation", "test_compute_capacity_reservation", acctest.Optional, acctest.Update, acctest.RepresentationCopyWithNewProperties(CoreComputeCapacityReservationRepresentation, map[string]interface{}{
+					"instance_reservation_configs": []acctest.RepresentationGroup{{RepType: acctest.Optional, Group: CoreComputeCapacityReservationInstanceReservationConfigsRepresentation}, {RepType: acctest.Optional, Group: CoreComputeCapacityReservationInstanceReservationConfigsRepresentation3}, {RepType: acctest.Optional, Group: CoreComputeCapacityReservationInstanceReservationConfigsRepresentation2}},
+				})),
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(resourceName, "instance_reservation_configs.#", "3"),
+			),
+		},
+
+		// Step 3: delete before next Create
 		{
 			Config: config + compartmentIdVariableStr + clusterPlacementGroupIdStr + CoreComputeCapacityReservationResourceDependencies,
 		},
-		// Step 2: verify Create with optionals
+		// Step 4: verify Create with optionals
 		{
 			Config: config + compartmentIdVariableStr + clusterPlacementGroupIdStr + CoreComputeCapacityReservationResourceDependencies +
 				acctest.GenerateResourceFromRepresentationMap("oci_core_compute_capacity_reservation", "test_compute_capacity_reservation", acctest.Optional, acctest.Create, CoreComputeCapacityReservationRepresentation),
@@ -153,7 +201,7 @@ func TestCoreComputeCapacityReservationResource_basic(t *testing.T) {
 			),
 		},
 
-		// Step 3: verify Update to the compartment (the compartment will be switched back in the next step)
+		// Step 5: verify Update to the compartment (the compartment will be switched back in the next step)
 		{
 			Config: config + compartmentIdVariableStr + compartmentIdUVariableStr + clusterPlacementGroupIdStr + CoreComputeCapacityReservationResourceDependencies +
 				acctest.GenerateResourceFromRepresentationMap("oci_core_compute_capacity_reservation", "test_compute_capacity_reservation", acctest.Optional, acctest.Create,
@@ -189,7 +237,7 @@ func TestCoreComputeCapacityReservationResource_basic(t *testing.T) {
 			),
 		},
 
-		// Step 4: verify updates to updatable parameters
+		// Step 6: verify updates to updatable parameters
 		{
 			Config: config + compartmentIdVariableStr + CoreComputeCapacityReservationResourceDependencies + clusterPlacementGroupIdStr +
 				acctest.GenerateResourceFromRepresentationMap("oci_core_compute_capacity_reservation", "test_compute_capacity_reservation", acctest.Optional, acctest.Update, CoreComputeCapacityReservationRepresentation),
@@ -221,7 +269,7 @@ func TestCoreComputeCapacityReservationResource_basic(t *testing.T) {
 				},
 			),
 		},
-		// Step 5: verify datasource
+		// Step 7: verify datasource
 		{
 			Config: config +
 				acctest.GenerateDataSourceFromRepresentationMap("oci_core_compute_capacity_reservations", "test_compute_capacity_reservations", acctest.Optional, acctest.Update, CoreCoreComputeCapacityReservationDataSourceRepresentation) +
@@ -247,7 +295,7 @@ func TestCoreComputeCapacityReservationResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(datasourceName, "compute_capacity_reservations.0.used_instance_count"),
 			),
 		},
-		// Step 6: verify singular datasource
+		// Step 8: verify singular datasource
 		{
 			Config: config +
 				acctest.GenerateDataSourceFromRepresentationMap("oci_core_compute_capacity_reservation", "test_compute_capacity_reservation", acctest.Required, acctest.Create, CoreCoreComputeCapacityReservationSingularDataSourceRepresentation) +

internal/service/core/core_compute_capacity_reservation_resource.go

@@ -4,12 +4,14 @@
 package core
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"strconv"
 
 	"github.com/oracle/terraform-provider-oci/internal/client"
 	"github.com/oracle/terraform-provider-oci/internal/tfresource"
+	"github.com/oracle/terraform-provider-oci/internal/utils"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 
@@ -60,8 +62,9 @@ func CoreComputeCapacityReservationResource() *schema.Resource {
 				Elem:     schema.TypeString,
 			},
 			"instance_reservation_configs": {
-				Type:     schema.TypeList,
+				Type:     schema.TypeSet,
 				Required: true,
+				Set:      instanceReservationConfigsHashCodeForSets,
 				MinItems: 1,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
@@ -284,10 +287,13 @@ func (s *CoreComputeCapacityReservationResourceCrud) Create() error {
 	}
 
 	if instanceReservationConfigs, ok := s.D.GetOkExists("instance_reservation_configs"); ok {
-		interfaces := instanceReservationConfigs.([]interface{})
+
+		set := instanceReservationConfigs.(*schema.Set)
+		interfaces := set.List()
+
 		tmp := make([]oci_core.InstanceReservationConfigDetails, len(interfaces))
 		for i := range interfaces {
-			stateDataIndex := i
+			stateDataIndex := instanceReservationConfigsHashCodeForSets(interfaces[i])
 			fieldKeyFormat := fmt.Sprintf("%s.%d.%%s", "instance_reservation_configs", stateDataIndex)
 			converted, err := s.mapToInstanceReservationConfigDetails(fieldKeyFormat)
 			if err != nil {
@@ -382,10 +388,12 @@ func (s *CoreComputeCapacityReservationResourceCrud) Update() error {
 	}
 
 	if instanceReservationConfigs, ok := s.D.GetOkExists("instance_reservation_configs"); ok {
-		interfaces := instanceReservationConfigs.([]interface{})
+		set := instanceReservationConfigs.(*schema.Set)
+		interfaces := set.List()
+
 		tmp := make([]oci_core.InstanceReservationConfigDetails, len(interfaces))
 		for i := range interfaces {
-			stateDataIndex := i
+			stateDataIndex := instanceReservationConfigsHashCodeForSets(interfaces[i])
 			fieldKeyFormat := fmt.Sprintf("%s.%d.%%s", "instance_reservation_configs", stateDataIndex)
 			converted, err := s.mapToInstanceReservationConfigDetails(fieldKeyFormat)
 			if err != nil {
@@ -677,3 +685,53 @@ func (s *CoreComputeCapacityReservationResourceCrud) updateCompartment(compartme
 	}
 	return nil
 }
+
+func instanceReservationConfigsHashCodeForSets(v interface{}) int {
+	var buf bytes.Buffer
+	m := v.(map[string]interface{})
+
+	if instanceShape, ok := m["instance_shape"]; ok && instanceShape != "" {
+		buf.WriteString(fmt.Sprintf("%v-", instanceShape))
+	}
+
+	if reservedCount, ok := m["reserved_count"]; ok && reservedCount != "" {
+		buf.WriteString(fmt.Sprintf("%v-", reservedCount))
+	}
+
+	if clusterConfig, ok := m["cluster_config"]; ok && clusterConfig != "" {
+		if clusterConfigList, ok := clusterConfig.([]interface{}); ok && len(clusterConfigList) > 0 {
+			buf.WriteString("cluster_config-")
+			for _, clusterConfigMapInterface := range clusterConfigList {
+				clusterConfigMap := clusterConfigMapInterface.(map[string]interface{})
+				if hpcIslandIdVal, ok := clusterConfigMap["hpc_island_id"].(string); ok && hpcIslandIdVal != "" {
+					buf.WriteString(fmt.Sprintf("%v-", hpcIslandIdVal))
+				}
+				if networkBlockIdsVal, ok := clusterConfigMap["network_block_ids"]; ok && networkBlockIdsVal != "" {
+					if networkBlockIdsList, ok := networkBlockIdsVal.([]interface{}); ok && len(networkBlockIdsList) > 0 {
+						buf.WriteString("network_block_ids-")
+						for _, networkBlockIdInterface := range networkBlockIdsList {
+							networkBlockId := networkBlockIdInterface.(string)
+							buf.WriteString(fmt.Sprintf("%s-", networkBlockId))
+						}
+					}
+				}
+			}
+		}
+	}
+
+	if clusterPlacementGroupId, ok := m["cluster_placement_group_id"]; ok && clusterPlacementGroupId != "" {
+		buf.WriteString(fmt.Sprintf("%v-", clusterPlacementGroupId))
+	}
+
+	if faultDomain, ok := m["fault_domain"]; ok && faultDomain != "" {
+		buf.WriteString(fmt.Sprintf("%v-", faultDomain))
+	}
+
+	if usedCountInterface, ok := m["used_count"]; ok && usedCountInterface != "" {
+		if usedCountInt, ok := usedCountInterface.(int); ok && usedCountInt > 0 {
+			buf.WriteString(fmt.Sprintf("%d-", usedCountInt))
+		}
+	}
+
+	return utils.GetStringHashcode(buf.String())
+}

website/docs/r/core_compute_capacity_reservation.html.markdown

@@ -64,7 +64,7 @@ The following arguments are supported:
 * `defined_tags` - (Optional) (Updatable) Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}` 
 * `display_name` - (Optional) (Updatable) A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information. 
 * `freeform_tags` - (Optional) (Updatable) Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}` 
-* `instance_reservation_configs` - (Optional) (Updatable) The capacity configurations for the capacity reservation.
+* `instance_reservation_configs` - (Optional) (Updatable) The capacity configurations for the capacity reservation. (Note: From 6.17.0 instance_reservation_configs field in oci_core_compute_capacity_reservation is changed from TypeList to TypeSet - to avoid unnecessary updates. Also, configs cant by accessed by index)
 
 	To use the reservation for the desired shape, specify the shape, count, and optionally the fault domain where you want this configuration. 
 	* `cluster_config` - (Optional) (Updatable) The HPC cluster configuration requested when launching instances in a compute capacity reservation.
@@ -105,7 +105,7 @@ The following attributes are exported:
 * `display_name` - A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information. 
 * `freeform_tags` - Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}` 
 * `id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compute capacity reservation.
-* `instance_reservation_configs` - The capacity configurations for the capacity reservation.
+* `instance_reservation_configs` - The capacity configurations for the capacity reservation. (Note: From 6.17.0 instance_reservation_configs field in oci_core_compute_capacity_reservation is changed from TypeList to TypeSet - to avoid unnecessary updates. Also, configs cant by accessed by index)
 
 	To use the reservation for the desired shape, specify the shape, count, and optionally the fault domain where you want this configuration. 
 	* `cluster_config` - The HPC cluster configuration requested when launching instances in a compute capacity reservation.

website/docs/r/core_instance_pool.html.markdown

@@ -86,7 +86,7 @@ The following arguments are supported:
 * `instance_configuration_id` - (Required) (Updatable) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the instance configuration associated with the instance pool. 
 * `instance_display_name_formatter` - (Optional) (Updatable) A user-friendly formatter for the instance pool's instances. Instance displaynames follow the format. The formatter does not retroactively change instance's displaynames, only instance displaynames in the future follow the format 
 * `instance_hostname_formatter` - (Optional) (Updatable) A user-friendly formatter for the instance pool's instances. Instance hostnames follow the format. The formatter does not retroactively change instance's hostnames, only instance hostnames in the future follow the format 
-* `load_balancers` - (Optional) The load balancers to attach to the instance pool. (Note: From 6.14.0 load_balancers field in oci_core_instance_pool is changed from TypeList to TypeSet - to support load balancer insert operation. Also, LB cant by accessed by index)
+* `load_balancers` - (Optional) The load balancers to attach to the instance pool. (Note: From 6.16.0 load_balancers field in oci_core_instance_pool is changed from TypeList to TypeSet - to support load balancer insert operation. Also, LB cant by accessed by index)
 	* `backend_set_name` - (Required) The name of the backend set on the load balancer to add instances to.
 	* `load_balancer_id` - (Required) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the load balancer to attach to the instance pool. 
 	* `port` - (Required) The port value to use when creating the backend set.
@@ -135,7 +135,7 @@ The following attributes are exported:
 * `instance_configuration_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the instance configuration associated with the instance pool. 
 * `instance_display_name_formatter` - A user-friendly formatter for the instance pool's instances. Instance displaynames follow the format. The formatter does not retroactively change instance's displaynames, only instance displaynames in the future follow the format 
 * `instance_hostname_formatter` - A user-friendly formatter for the instance pool's instances. Instance hostnames follow the format. The formatter does not retroactively change instance's hostnames, only instance hostnames in the future follow the format 
-* `load_balancers` - The load balancers attached to the instance pool. (Note: From 6.14.0 load_balancers field in oci_core_instance_pool is changed from TypeList to TypeSet - to support load balancer insert operation. Also, LB cant by accessed by index)
+* `load_balancers` - The load balancers attached to the instance pool. (Note: From 6.16.0 load_balancers field in oci_core_instance_pool is changed from TypeList to TypeSet - to support load balancer insert operation. Also, LB cant by accessed by index)
 	* `backend_set_name` - The name of the backend set on the load balancer.
 	* `id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the load balancer attachment.
 	* `instance_pool_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the instance pool of the load balancer attachment.