Added - Support for Instance Configuration feature parity improvement March 2021 Compute: Instance Configuration feature parity with downstream APIs

Author: Terraform Team Automation

examples/compute/instance_pool/instance_pool.tf

@@ -175,11 +175,16 @@ resource "oci_core_instance_configuration" "test_instance_configuration" {
     */
     block_volumes {
       create_details {
-        compartment_id      = var.compartment_ocid
-        display_name        = "TestCreateVolumeDetails-1"
-        availability_domain = data.oci_identity_availability_domain.ad.name
-        size_in_gbs         = 50
-        vpus_per_gb         = 20 // min vpus
+        compartment_id       = var.compartment_ocid
+        display_name         = "TestCreateVolumeDetails-1"
+        availability_domain  = data.oci_identity_availability_domain.ad.name
+        size_in_gbs          = 50
+        vpus_per_gb          = 20 // min vpus
+        is_auto_tune_enabled = false
+        block_volume_replicas {
+          display_name        = "TestCreateVolumeDetails-1"
+          availability_domain = data.oci_identity_availability_domain.ad.name
+        }
       }
 
       attach_details {
@@ -221,6 +226,11 @@ resource "oci_core_instance_configuration" "test_instance_configuration" {
         is_monitoring_disabled = false
       }
 
+      availability_config {
+        recovery_action             = "RESTORE_INSTANCE"
+        is_live_migration_preferred = false
+      }
+
       launch_options {
         network_type = "PARAVIRTUALIZED"
       }

internal/integrationtest/core_instance_configuration_test.go

@@ -207,6 +207,35 @@ func CoreInstanceConfigurationResource() *schema.Resource {
 													Computed: true,
 													ForceNew: true,
 												},
+												"block_volume_replicas": {
+													Type:     schema.TypeList,
+													Optional: true,
+													Computed: true,
+													ForceNew: true,
+													MinItems: 1,
+													MaxItems: 1,
+													Elem: &schema.Resource{
+														Schema: map[string]*schema.Schema{
+															// Required
+															"availability_domain": {
+																Type:             schema.TypeString,
+																Required:         true,
+																ForceNew:         true,
+																DiffSuppressFunc: tfresource.EqualIgnoreCaseSuppressDiff,
+															},
+
+															// Optional
+															"display_name": {
+																Type:     schema.TypeString,
+																Optional: true,
+																Computed: true,
+																ForceNew: true,
+															},
+
+															// Computed
+														},
+													},
+												},
 												"compartment_id": {
 													Type:     schema.TypeString,
 													Optional: true,
@@ -234,6 +263,12 @@ func CoreInstanceConfigurationResource() *schema.Resource {
 													ForceNew: true,
 													Elem:     schema.TypeString,
 												},
+												"is_auto_tune_enabled": {
+													Type:     schema.TypeBool,
+													Optional: true,
+													Computed: true,
+													ForceNew: true,
+												},
 												"kms_key_id": {
 													Type:     schema.TypeString,
 													Optional: true,
@@ -389,6 +424,11 @@ func CoreInstanceConfigurationResource() *schema.Resource {
 												// Required
 
 												// Optional
+												"is_live_migration_preferred": {
+													Type:     schema.TypeBool,
+													Optional: true,
+													Computed: true,
+												},
 												"recovery_action": {
 													Type:     schema.TypeString,
 													Optional: true,
@@ -888,6 +928,12 @@ func CoreInstanceConfigurationResource() *schema.Resource {
 													Computed: true,
 													ForceNew: true,
 												},
+												"kms_key_id": {
+													Type:     schema.TypeString,
+													Optional: true,
+													Computed: true,
+													ForceNew: true,
+												},
 
 												// Computed
 											},
@@ -1458,6 +1504,11 @@ func InstanceConfigurationAutotunePolicyToMap(obj oci_core.InstanceConfiguration
 func (s *CoreInstanceConfigurationResourceCrud) mapToInstanceConfigurationAvailabilityConfig(fieldKeyFormat string) (oci_core.InstanceConfigurationAvailabilityConfig, error) {
 	result := oci_core.InstanceConfigurationAvailabilityConfig{}
 
+	if isLiveMigrationPreferred, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "is_live_migration_preferred")); ok {
+		tmp := isLiveMigrationPreferred.(bool)
+		result.IsLiveMigrationPreferred = &tmp
+	}
+
 	if recoveryAction, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "recovery_action")); ok {
 		result.RecoveryAction = oci_core.InstanceConfigurationAvailabilityConfigRecoveryActionEnum(recoveryAction.(string))
 	}
@@ -1468,6 +1519,10 @@ func (s *CoreInstanceConfigurationResourceCrud) mapToInstanceConfigurationAvaila
 func InstanceConfigurationAvailabilityConfigToMap(obj *oci_core.InstanceConfigurationAvailabilityConfig) map[string]interface{} {
 	result := map[string]interface{}{}
 
+	if obj.IsLiveMigrationPreferred != nil {
+		result["is_live_migration_preferred"] = bool(*obj.IsLiveMigrationPreferred)
+	}
+
 	result["recovery_action"] = string(obj.RecoveryAction)
 
 	return result
@@ -1528,6 +1583,36 @@ func InstanceConfigurationBlockVolumeDetailsToMap(obj oci_core.InstanceConfigura
 	return result
 }
 
+func (s *CoreInstanceConfigurationResourceCrud) mapToInstanceConfigurationBlockVolumeReplicaDetails(fieldKeyFormat string) (oci_core.InstanceConfigurationBlockVolumeReplicaDetails, error) {
+	result := oci_core.InstanceConfigurationBlockVolumeReplicaDetails{}
+
+	if availabilityDomain, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "availability_domain")); ok {
+		tmp := availabilityDomain.(string)
+		result.AvailabilityDomain = &tmp
+	}
+
+	if displayName, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "display_name")); ok {
+		tmp := displayName.(string)
+		result.DisplayName = &tmp
+	}
+
+	return result, nil
+}
+
+func InstanceConfigurationBlockVolumeReplicaDetailsToMap(obj oci_core.InstanceConfigurationBlockVolumeReplicaDetails) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	if obj.AvailabilityDomain != nil {
+		result["availability_domain"] = string(*obj.AvailabilityDomain)
+	}
+
+	if obj.DisplayName != nil {
+		result["display_name"] = string(*obj.DisplayName)
+	}
+
+	return result
+}
+
 func (s *CoreInstanceConfigurationResourceCrud) mapToInstanceConfigurationCreateVnicDetails(fieldKeyFormat string) (oci_core.InstanceConfigurationCreateVnicDetails, error) {
 	result := oci_core.InstanceConfigurationCreateVnicDetails{}
 
@@ -1677,6 +1762,23 @@ func (s *CoreInstanceConfigurationResourceCrud) mapToInstanceConfigurationCreate
 		result.BackupPolicyId = &tmp
 	}
 
+	if blockVolumeReplicas, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "block_volume_replicas")); ok {
+		interfaces := blockVolumeReplicas.([]interface{})
+		tmp := make([]oci_core.InstanceConfigurationBlockVolumeReplicaDetails, len(interfaces))
+		for i := range interfaces {
+			stateDataIndex := i
+			fieldKeyFormatNextLevel := fmt.Sprintf("%s.%d.%%s", fmt.Sprintf(fieldKeyFormat, "block_volume_replicas"), stateDataIndex)
+			converted, err := s.mapToInstanceConfigurationBlockVolumeReplicaDetails(fieldKeyFormatNextLevel)
+			if err != nil {
+				return result, err
+			}
+			tmp[i] = converted
+		}
+		if len(tmp) != 0 || s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "block_volume_replicas")) {
+			result.BlockVolumeReplicas = tmp
+		}
+	}
+
 	if compartmentId, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "compartment_id")); ok {
 		tmp := compartmentId.(string)
 		result.CompartmentId = &tmp
@@ -1699,6 +1801,11 @@ func (s *CoreInstanceConfigurationResourceCrud) mapToInstanceConfigurationCreate
 		result.FreeformTags = tfresource.ObjectMapToStringMap(freeformTags.(map[string]interface{}))
 	}
 
+	if isAutoTuneEnabled, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "is_auto_tune_enabled")); ok {
+		tmp := isAutoTuneEnabled.(bool)
+		result.IsAutoTuneEnabled = &tmp
+	}
+
 	if kmsKeyId, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "kms_key_id")); ok {
 		tmp := kmsKeyId.(string)
 		result.KmsKeyId = &tmp
@@ -1753,6 +1860,12 @@ func InstanceConfigurationCreateVolumeDetailsToMap(obj *oci_core.InstanceConfigu
 		result["backup_policy_id"] = string(*obj.BackupPolicyId)
 	}
 
+	blockVolumeReplicas := []interface{}{}
+	for _, item := range obj.BlockVolumeReplicas {
+		blockVolumeReplicas = append(blockVolumeReplicas, InstanceConfigurationBlockVolumeReplicaDetailsToMap(item))
+	}
+	result["block_volume_replicas"] = blockVolumeReplicas
+
 	if obj.CompartmentId != nil {
 		result["compartment_id"] = string(*obj.CompartmentId)
 	}
@@ -1767,6 +1880,10 @@ func InstanceConfigurationCreateVolumeDetailsToMap(obj *oci_core.InstanceConfigu
 
 	result["freeform_tags"] = obj.FreeformTags
 
+	if obj.IsAutoTuneEnabled != nil {
+		result["is_auto_tune_enabled"] = bool(*obj.IsAutoTuneEnabled)
+	}
+
 	if obj.KmsKeyId != nil {
 		result["kms_key_id"] = string(*obj.KmsKeyId)
 	}
@@ -1951,6 +2068,10 @@ func (s *CoreInstanceConfigurationResourceCrud) mapToInstanceConfigurationInstan
 			tmp := imageId.(string)
 			details.ImageId = &tmp
 		}
+		if kmsKeyId, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "kms_key_id")); ok {
+			tmp := kmsKeyId.(string)
+			details.KmsKeyId = &tmp
+		}
 		baseObject = details
 	default:
 		return nil, fmt.Errorf("unknown source_type '%v' was specified", sourceType)
@@ -1981,6 +2102,10 @@ func InstanceConfigurationInstanceSourceDetailsToMap(obj *oci_core.InstanceConfi
 		if v.ImageId != nil {
 			result["image_id"] = string(*v.ImageId)
 		}
+
+		if v.KmsKeyId != nil {
+			result["kms_key_id"] = string(*v.KmsKeyId)
+		}
 	default:
 		log.Printf("[WARN] Received 'source_type' of unknown type %v", *obj)
 		return nil

internal/service/core/core_instance_configuration_resource.go

@@ -60,7 +60,7 @@ The following attributes are exported:
 			To enable the monitoring and management plugins, the `isMonitoringDisabled` and `isManagementDisabled` attributes must also be set to false. 
 		* `name` - The plugin name. To get a list of available plugins, use the [ListInstanceagentAvailablePlugins](https://docs.cloud.oracle.com/iaas/api/#/en/instanceagent/20180530/Plugin/ListInstanceagentAvailablePlugins) operation in the Oracle Cloud Agent API. For more information about the available plugins, see [Managing Plugins with Oracle Cloud Agent](https://docs.cloud.oracle.com/iaas/Content/Compute/Tasks/manage-plugins.htm). 
 * `availability_config` - Options for defining the availabiity of a VM instance after a maintenance event that impacts the underlying hardware. 
-	* `is_live_migration_preferred` - Whether live migration is preferred for infrastructure maintenance.  If null preference is specified, live migration will be preferred for infrastructure maintenance for applicable instances. 
+	* `is_live_migration_preferred` - Whether to live migrate supported VM instances to a healthy physical VM host without disrupting running instances during infrastructure maintenance events. If null, Oracle chooses the best option for migrating the VM during infrastructure maintenance events. 
 	* `recovery_action` - The lifecycle state for an instance when it is recovered after infrastructure maintenance.
 		* `RESTORE_INSTANCE` - The instance is restored to the lifecycle state it was in before the maintenance event. If the instance was running, it is automatically rebooted. This is the default action when a value is not set.
 		* `STOP_INSTANCE` - The instance is recovered in the stopped state. 

website/docs/d/core_instance.html.markdown

@@ -54,10 +54,14 @@ The following attributes are exported:
 				* `max_vpus_per_gb` - This will be the maximum VPUs/GB performance level that the volume will be auto-tuned temporarily based on performance monitoring. 
 			* `availability_domain` - The availability domain of the volume.  Example: `Uocm:PHX-AD-1` 
 			* `backup_policy_id` - If provided, specifies the ID of the volume backup policy to assign to the newly created volume. If omitted, no policy will be assigned. 
+			* `block_volume_replicas` - The list of block volume replicas to be enabled for this volume in the specified destination availability domains. 
+				* `availability_domain` - The availability domain of the block volume replica.  Example: `Uocm:PHX-AD-1` 
+				* `display_name` - The display name of the block volume replica. You may optionally specify a *display name* for the block volume replica, otherwise a default is provided. 
 			* `compartment_id` - The OCID of the compartment that contains the volume.
 			* `defined_tags` - 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` - 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"}` 
+			* `is_auto_tune_enabled` - Specifies whether the auto-tune performance is enabled for this boot volume. This field is deprecated. Use the `InstanceConfigurationDetachedVolumeAutotunePolicy` instead to enable the volume for detached autotune. 
 			* `kms_key_id` - The OCID of the Vault service key to assign as the master encryption key for the volume. 
 			* `size_in_gbs` - The size of the volume in GBs.
 			* `source_details` - 
@@ -101,6 +105,7 @@ The following attributes are exported:
 					To enable the monitoring and management plugins, the `isMonitoringDisabled` and `isManagementDisabled` attributes must also be set to false. 
 				* `name` - The plugin name. To get a list of available plugins, use the [ListInstanceagentAvailablePlugins](https://docs.cloud.oracle.com/iaas/api/#/en/instanceagent/20180530/Plugin/ListInstanceagentAvailablePlugins) operation in the Oracle Cloud Agent API. For more information about the available plugins, see [Managing Plugins with Oracle Cloud Agent](https://docs.cloud.oracle.com/iaas/Content/Compute/Tasks/manage-plugins.htm). 
 		* `availability_config` - Options for defining the availabiity of a VM instance after a maintenance event that impacts the underlying hardware. 
+			* `is_live_migration_preferred` - Whether to live migrate supported VM instances to a healthy physical VM host without disrupting running instances during infrastructure maintenance events. If null, Oracle chooses the best option for migrating the VM during infrastructure maintenance events. 
 			* `recovery_action` - The lifecycle state for an instance when it is recovered after infrastructure maintenance.
 				* `RESTORE_INSTANCE` - The instance is restored to the lifecycle state it was in before the maintenance event. If the instance was running, it is automatically rebooted. This is the default action when a value is not set.
 				* `STOP_INSTANCE` - The instance is recovered in the stopped state. 
@@ -252,6 +257,7 @@ The following attributes are exported:
 				* `20`: Represents Higher Performance option.
 				* `30`-`120`: Represents the Ultra High Performance option. 
 			* `image_id` - The OCID of the image used to boot the instance.
+			* `kms_key_id` - The OCID of the Vault service key to assign as the master encryption key for the boot volume.
 			* `source_type` - The source type for the instance. Use `image` when specifying the image OCID. Use `bootVolume` when specifying the boot volume OCID. 
 	* `secondary_vnics` - Secondary VNIC parameters.
 		* `create_vnic_details` - Contains the properties of the VNIC for an instance configuration. See [CreateVnicDetails](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/CreateVnicDetails/) and [Instance Configurations](https://docs.cloud.oracle.com/iaas/Content/Compute/Concepts/instancemanagement.htm#config) for more information. 

website/docs/d/core_instance_configuration.html.markdown

@@ -61,10 +61,14 @@ The following attributes are exported:
 				* `max_vpus_per_gb` - This will be the maximum VPUs/GB performance level that the volume will be auto-tuned temporarily based on performance monitoring. 
 			* `availability_domain` - The availability domain of the volume.  Example: `Uocm:PHX-AD-1` 
 			* `backup_policy_id` - If provided, specifies the ID of the volume backup policy to assign to the newly created volume. If omitted, no policy will be assigned. 
+			* `block_volume_replicas` - The list of block volume replicas to be enabled for this volume in the specified destination availability domains. 
+				* `availability_domain` - The availability domain of the block volume replica.  Example: `Uocm:PHX-AD-1` 
+				* `display_name` - The display name of the block volume replica. You may optionally specify a *display name* for the block volume replica, otherwise a default is provided. 
 			* `compartment_id` - The OCID of the compartment that contains the volume.
 			* `defined_tags` - 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` - 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"}` 
+			* `is_auto_tune_enabled` - Specifies whether the auto-tune performance is enabled for this boot volume. This field is deprecated. Use the `InstanceConfigurationDetachedVolumeAutotunePolicy` instead to enable the volume for detached autotune. 
 			* `kms_key_id` - The OCID of the Vault service key to assign as the master encryption key for the volume. 
 			* `size_in_gbs` - The size of the volume in GBs.
 			* `source_details` - 
@@ -108,6 +112,7 @@ The following attributes are exported:
 					To enable the monitoring and management plugins, the `isMonitoringDisabled` and `isManagementDisabled` attributes must also be set to false. 
 				* `name` - The plugin name. To get a list of available plugins, use the [ListInstanceagentAvailablePlugins](https://docs.cloud.oracle.com/iaas/api/#/en/instanceagent/20180530/Plugin/ListInstanceagentAvailablePlugins) operation in the Oracle Cloud Agent API. For more information about the available plugins, see [Managing Plugins with Oracle Cloud Agent](https://docs.cloud.oracle.com/iaas/Content/Compute/Tasks/manage-plugins.htm). 
 		* `availability_config` - Options for defining the availabiity of a VM instance after a maintenance event that impacts the underlying hardware. 
+			* `is_live_migration_preferred` - Whether to live migrate supported VM instances to a healthy physical VM host without disrupting running instances during infrastructure maintenance events. If null, Oracle chooses the best option for migrating the VM during infrastructure maintenance events. 
 			* `recovery_action` - The lifecycle state for an instance when it is recovered after infrastructure maintenance.
 				* `RESTORE_INSTANCE` - The instance is restored to the lifecycle state it was in before the maintenance event. If the instance was running, it is automatically rebooted. This is the default action when a value is not set.
 				* `STOP_INSTANCE` - The instance is recovered in the stopped state. 
@@ -259,6 +264,7 @@ The following attributes are exported:
 				* `20`: Represents Higher Performance option.
 				* `30`-`120`: Represents the Ultra High Performance option. 
 			* `image_id` - The OCID of the image used to boot the instance.
+			* `kms_key_id` - The OCID of the Vault service key to assign as the master encryption key for the boot volume.
 			* `source_type` - The source type for the instance. Use `image` when specifying the image OCID. Use `bootVolume` when specifying the boot volume OCID. 
 	* `secondary_vnics` - Secondary VNIC parameters.
 		* `create_vnic_details` - Contains the properties of the VNIC for an instance configuration. See [CreateVnicDetails](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/CreateVnicDetails/) and [Instance Configurations](https://docs.cloud.oracle.com/iaas/Content/Compute/Concepts/instancemanagement.htm#config) for more information.