bugfix for shape_config missing error for update_instance_request if only shape is changed

Author: zexinwanoci

oci/core_instance_resource.go

@@ -1860,6 +1860,16 @@ func (s *CoreInstanceResourceCrud) updateOptionsViaWorkRequest() error {
 		if newRaw != "" && oldRaw != "" {
 			shapeTmp := shape.(string)
 			request.Shape = &shapeTmp
+			if shapeConfig, ok := s.D.GetOkExists("shape_config"); ok && !s.D.HasChange("shape_config") {
+				if tmpList := shapeConfig.([]interface{}); len(tmpList) > 0 {
+					fieldKeyFormat := fmt.Sprintf("%s.%d.%%s", "shape_config", 0)
+					tmp, err := s.mapToUpdateInstanceShapeConfigDetails(fieldKeyFormat)
+					if err != nil {
+						return err
+					}
+					request.ShapeConfig = &tmp
+				}
+			}
 		}
 	}
 

oci/core_instance_resource_test.go

@@ -43,6 +43,19 @@ var (
 		"ocpus":         Representation{repType: Optional, create: "2"},
 		"memory_in_gbs": Representation{repType: Optional, create: `10.0`, update: `20.0`},
 	}
+	instanceShapeConfigRepresentation_ForFlexibleMemoryNoUpdate = map[string]interface{}{
+		"ocpus":         Representation{repType: Optional, create: "2"},
+		"memory_in_gbs": Representation{repType: Optional, create: `10.0`, update: `20.0`},
+	}
+	instanceRepresentationCore_ForFlexibleMemoryNoUpdate = representationCopyWithRemovedProperties(representationCopyWithNewProperties(instanceRepresentation, map[string]interface{}{
+		"fault_domain":   Representation{repType: Optional, create: `FAULT-DOMAIN-3`, update: `FAULT-DOMAIN-2`},
+		"shape":          Representation{repType: Required, create: `VM.Standard.E3.Flex`},
+		"image":          Representation{repType: Required, create: `${var.FlexInstanceImageOCID[var.region]}`},
+		"shape_config":   RepresentationGroup{Optional, instanceShapeConfigRepresentation_ForFlexibleMemoryNoUpdate},
+		"source_details": RepresentationGroup{Optional, instanceFlexSourceDetailsRepresentation},
+	}), []string{
+		"dedicated_vm_host_id",
+	})
 	instanceLaunchOptionsRepresentation_ForLaunchOptionsUpdate = representationCopyWithNewProperties(instanceLaunchOptionsRepresentation, map[string]interface{}{
 		"boot_volume_type":                    Representation{repType: Optional, create: `ISCSI`, update: `PARAVIRTUALIZED`},
 		"is_pv_encryption_in_transit_enabled": Representation{repType: Optional, update: `true`},
@@ -1774,6 +1787,58 @@ func TestAccResourceCoreInstance_FlexibleMemory(t *testing.T) {
 				),
 			},
 
+			// verify updates to updatable parameters but no change in shape_config
+			{
+				Config: config + compartmentIdVariableStr + InstanceResourceDependenciesWithoutDHV + FlexVmImageIdsVariable +
+					generateResourceFromRepresentationMap("oci_core_instance", "test_instance", Optional, Update, instanceRepresentationCore_ForFlexibleMemoryNoUpdate),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "agent_config.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "agent_config.0.is_management_disabled", "true"),
+					resource.TestCheckResourceAttr(resourceName, "agent_config.0.is_monitoring_disabled", "true"),
+					resource.TestCheckResourceAttrSet(resourceName, "availability_domain"),
+					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
+					resource.TestCheckResourceAttr(resourceName, "create_vnic_details.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.assign_public_ip", "true"),
+					resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.defined_tags.%", "1"),
+					resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.display_name", "displayName"),
+					resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.freeform_tags.%", "1"),
+					resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.hostname_label", "hostnamelabel"),
+					resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.nsg_ids.#", "0"),
+					resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.private_ip", "10.0.0.5"),
+					resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.skip_source_dest_check", "false"),
+					resource.TestCheckResourceAttrSet(resourceName, "create_vnic_details.0.subnet_id"),
+					resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
+					resource.TestCheckResourceAttr(resourceName, "display_name", "displayName2"),
+					resource.TestCheckResourceAttr(resourceName, "extended_metadata.%", "3"),
+					resource.TestCheckResourceAttr(resourceName, "fault_domain", "FAULT-DOMAIN-2"),
+					resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
+					resource.TestCheckResourceAttr(resourceName, "hostname_label", "hostnamelabel"),
+					resource.TestCheckResourceAttrSet(resourceName, "id"),
+					resource.TestCheckResourceAttrSet(resourceName, "image"),
+					resource.TestCheckResourceAttr(resourceName, "ipxe_script", "ipxeScript"),
+					resource.TestCheckResourceAttr(resourceName, "is_pv_encryption_in_transit_enabled", "false"),
+					resource.TestCheckResourceAttr(resourceName, "metadata.%", "2"),
+					resource.TestCheckResourceAttrSet(resourceName, "region"),
+					resource.TestCheckResourceAttr(resourceName, "shape", "VM.Standard.E3.Flex"),
+					resource.TestCheckResourceAttr(resourceName, "shape_config.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "shape_config.0.memory_in_gbs", "20"),
+					resource.TestCheckResourceAttr(resourceName, "source_details.#", "1"),
+					resource.TestCheckResourceAttrSet(resourceName, "source_details.0.source_id"),
+					resource.TestCheckResourceAttr(resourceName, "source_details.0.source_type", "image"),
+					resource.TestCheckResourceAttr(resourceName, "state", "RUNNING"),
+					resource.TestCheckResourceAttrSet(resourceName, "subnet_id"),
+					resource.TestCheckResourceAttrSet(resourceName, "time_created"),
+
+					func(s *terraform.State) (err error) {
+						resId2, err = fromInstanceState(s, resourceName, "id")
+						if resId != resId2 {
+							return fmt.Errorf("Resource recreated when it was supposed to be updated.")
+						}
+						return err
+					},
+				),
+			},
+
 			// verify updates to updatable parameters
 			{
 				Config: config + compartmentIdVariableStr + InstanceResourceDependenciesWithoutDHV + FlexVmImageIdsVariable +
@@ -1825,6 +1890,7 @@ func TestAccResourceCoreInstance_FlexibleMemory(t *testing.T) {
 					},
 				),
 			},
+
 			// verify datasource
 			{
 				Config: config +