Added - Support for UpdateInstanceConstraint in Terraform

Author: Terraform Team Automation

internal/integrationtest/core_instance_test.go

@@ -55,15 +55,16 @@ var (
 		"ocpus":         acctest.Representation{RepType: acctest.Required, Create: `1`},
 	}
 	CoreInstanceRepresentation = map[string]interface{}{
-		"availability_domain":  acctest.Representation{RepType: acctest.Required, Create: `${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}`},
-		"compartment_id":       acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
-		"shape":                acctest.Representation{RepType: acctest.Required, Create: `VM.Standard2.1`},
-		"agent_config":         acctest.RepresentationGroup{RepType: acctest.Optional, Group: CoreInstanceAgentConfigRepresentation},
-		"availability_config":  acctest.RepresentationGroup{RepType: acctest.Optional, Group: CoreInstanceAvailabilityConfigRepresentation},
-		"create_vnic_details":  acctest.RepresentationGroup{RepType: acctest.Optional, Group: CoreInstanceCreateVnicDetailsRepresentation},
-		"dedicated_vm_host_id": acctest.Representation{RepType: acctest.Optional, Create: `${oci_core_dedicated_vm_host.test_dedicated_vm_host.id}`},
-		"defined_tags":         acctest.Representation{RepType: acctest.Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, Update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
-		"display_name":         acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
+		"availability_domain":         acctest.Representation{RepType: acctest.Required, Create: `${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}`},
+		"compartment_id":              acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
+		"shape":                       acctest.Representation{RepType: acctest.Required, Create: `VM.Standard2.1`},
+		"update_operation_constraint": acctest.Representation{RepType: acctest.Optional, Create: `ALLOW_DOWNTIME`, Update: `ALLOW_DOWNTIME`},
+		"agent_config":                acctest.RepresentationGroup{RepType: acctest.Optional, Group: CoreInstanceAgentConfigRepresentation},
+		"availability_config":         acctest.RepresentationGroup{RepType: acctest.Optional, Group: CoreInstanceAvailabilityConfigRepresentation},
+		"create_vnic_details":         acctest.RepresentationGroup{RepType: acctest.Optional, Group: CoreInstanceCreateVnicDetailsRepresentation},
+		"dedicated_vm_host_id":        acctest.Representation{RepType: acctest.Optional, Create: `${oci_core_dedicated_vm_host.test_dedicated_vm_host.id}`},
+		"defined_tags":                acctest.Representation{RepType: acctest.Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, Update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
+		"display_name":                acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
 		"extended_metadata": acctest.Representation{RepType: acctest.Optional, Create: map[string]string{
 			"some_string":   "stringA",
 			"nested_object": "{\\\"some_string\\\": \\\"stringB\\\", \\\"object\\\": {\\\"some_string\\\": \\\"stringC\\\"}}",
@@ -673,6 +674,7 @@ func TestCoreInstanceResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "state", "STOPPED"),
 				resource.TestCheckResourceAttrSet(resourceName, "subnet_id"),
 				resource.TestCheckResourceAttrSet(resourceName, "time_created"),
+				resource.TestCheckResourceAttr(resourceName, "update_operation_constraint", "ALLOW_DOWNTIME"),
 
 				func(s *terraform.State) (err error) {
 					resId2, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -687,7 +689,7 @@ func TestCoreInstanceResource_basic(t *testing.T) {
 		// verify updates to updatable parameters
 		{
 			Config: config + compartmentIdVariableStr + managementEndpointStr + CoreInstanceResourceDependencies +
-				acctest.GenerateResourceFromRepresentationMap("oci_core_instance", "test_instance", acctest.Optional, acctest.Update, CoreInstanceRepresentation),
+				acctest.GenerateResourceFromRepresentationMap("oci_core_instance", "test_instance", acctest.Optional, acctest.Update, acctest.GetUpdatedRepresentationCopy("update_operation_constraint", acctest.Representation{RepType: acctest.Optional, Update: `ALLOW_DOWNTIME`}, CoreInstanceRepresentation)),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttr(resourceName, "agent_config.#", "1"),
 				resource.TestCheckResourceAttr(resourceName, "agent_config.0.are_all_plugins_disabled", "false"),
@@ -742,6 +744,7 @@ func TestCoreInstanceResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "state", "RUNNING"),
 				resource.TestCheckResourceAttrSet(resourceName, "subnet_id"),
 				resource.TestCheckResourceAttrSet(resourceName, "time_created"),
+				resource.TestCheckResourceAttr(resourceName, "update_operation_constraint", "ALLOW_DOWNTIME"),
 
 				func(s *terraform.State) (err error) {
 					resId2, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -914,6 +917,7 @@ func TestCoreInstanceResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "state", "STOPPED"),
 				resource.TestCheckResourceAttrSet(resourceName, "subnet_id"),
 				resource.TestCheckResourceAttrSet(resourceName, "time_created"),
+				resource.TestCheckResourceAttr(resourceName, "update_operation_constraint", "ALLOW_DOWNTIME"),
 
 				func(s *terraform.State) (err error) {
 					resId2, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -935,6 +939,7 @@ func TestCoreInstanceResource_basic(t *testing.T) {
 				// and so it may complain that values are different.
 				"extended_metadata",
 				"hostname_label",
+				"update_operation_constraint",
 				"is_pv_encryption_in_transit_enabled",
 				"create_vnic_details.0.assign_private_dns_record",
 				"subnet_id",

internal/service/core/core_instance_resource.go

@@ -593,6 +593,10 @@ func CoreInstanceResource() *schema.Resource {
 				Type:     schema.TypeBool,
 				Optional: true,
 			},
+			"update_operation_constraint": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"source_details": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -1125,6 +1129,10 @@ func (s *CoreInstanceResourceCrud) Update() error {
 
 	request := oci_core.UpdateInstanceRequest{}
 
+	if updateOperationConstraint, ok := s.D.GetOkExists("update_operation_constraint"); ok {
+		request.UpdateOperationConstraint = oci_core.UpdateInstanceDetailsUpdateOperationConstraintEnum(updateOperationConstraint.(string))
+	}
+
 	if agentConfig, ok := s.D.GetOkExists("agent_config"); ok {
 		if tmpList := agentConfig.([]interface{}); len(tmpList) > 0 {
 			fieldKeyFormat := fmt.Sprintf("%s.%d.%%s", "agent_config", 0)
@@ -2914,6 +2922,10 @@ func (s *CoreInstanceResourceCrud) updateOptionsViaWorkRequest() error {
 		}
 	}
 
+	if updateOperationConstraint, ok := s.D.GetOkExists("update_operation_constraint"); ok {
+		request.UpdateOperationConstraint = oci_core.UpdateInstanceDetailsUpdateOperationConstraintEnum(updateOperationConstraint.(string))
+	}
+
 	if request.Shape == nil && request.ShapeConfig == nil && request.LaunchOptions == nil && request.FaultDomain == nil {
 		// no-op
 		return nil

internal/utils/helpers.go

@@ -64,7 +64,7 @@ const (
 	variable "FlexInstanceImageOCID" {
 	  type = "map"
 	  default = {
-		us-phoenix-1 = "ocid1.image.oc1.phx.aaaaaaaa6hooptnlbfwr5lwemqjbu3uqidntrlhnt45yihfj222zahe7p3wq"
+		us-phoenix-1 = "ocid1.image.oc1.phx.aaaaaaaalgvdp6hhnulo3tlxz3mtff625s7ix6ianpmv5l7chz5rcakrxbiq"
 		us-ashburn-1 = "ocid1.image.oc1.iad.aaaaaaaa6tp7lhyrcokdtf7vrbmxyp2pctgg4uxvt4jz4vc47qoc2ec4anha"
 		eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaadvi77prh3vjijhwe5xbd6kjg3n5ndxjcpod6om6qaiqeu3csof7a"
 		uk-london-1 = "ocid1.image.oc1.uk-london-1.aaaaaaaaw5gvriwzjhzt2tnylrfnpanz5ndztyrv3zpwhlzxdbkqsjfkwxaq"

website/docs/d/core_boot_volume.html.markdown

@@ -49,7 +49,7 @@ The following attributes are exported:
 * `image_id` - The image OCID used to create the boot volume.
 * `is_auto_tune_enabled` - Specifies whether the auto-tune performance is enabled for this boot volume. This field is deprecated. Use the `DetachedVolumeAutotunePolicy` instead to enable the volume for detached autotune. 
 * `is_hydrated` - Specifies whether the boot volume's data has finished copying from the source boot volume or boot volume backup. 
-* `kms_key_id` - The OCID of the Key Management master encryption key assigned to the boot volume.
+* `kms_key_id` - The OCID of the Vault service master encryption key assigned to the boot volume.
 * `size_in_gbs` - The size of the boot volume in GBs.
 * `size_in_mbs` - The size of the volume in MBs. The value must be a multiple of 1024. This field is deprecated. Please use `size_in_gbs`. 
 * `source_details` - 

website/docs/d/core_boot_volume_backup.html.markdown

@@ -40,7 +40,7 @@ The following attributes are exported:
 * `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 of the boot volume backup.
 * `image_id` - The image OCID used to create the boot volume the backup is taken from. 
-* `kms_key_id` - The OCID of the Key Management master encryption assigned to the boot volume backup. For more information about the Key Management service and encryption keys, see [Overview of Key Management](https://docs.cloud.oracle.com/iaas/Content/KeyManagement/Concepts/keyoverview.htm) and [Using Keys](https://docs.cloud.oracle.com/iaas/Content/KeyManagement/Tasks/usingkeys.htm). 
+* `kms_key_id` - The OCID of the Vault service master encryption assigned to the boot volume backup. For more information about the Vault service and encryption keys, see [Overview of Vault service](https://docs.cloud.oracle.com/iaas/Content/KeyManagement/Concepts/keyoverview.htm) and [Using Keys](https://docs.cloud.oracle.com/iaas/Content/KeyManagement/Tasks/usingkeys.htm). 
 * `size_in_gbs` - The size of the boot volume, in GBs. 
 * `source_boot_volume_backup_id` - The OCID of the source boot volume backup.
 * `source_type` - Specifies whether the backup was created manually, or via scheduled backup policy. 

website/docs/d/core_boot_volume_backups.html.markdown

@@ -57,7 +57,7 @@ The following attributes are exported:
 * `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 of the boot volume backup.
 * `image_id` - The image OCID used to create the boot volume the backup is taken from. 
-* `kms_key_id` - The OCID of the Key Management master encryption assigned to the boot volume backup. For more information about the Key Management service and encryption keys, see [Overview of Key Management](https://docs.cloud.oracle.com/iaas/Content/KeyManagement/Concepts/keyoverview.htm) and [Using Keys](https://docs.cloud.oracle.com/iaas/Content/KeyManagement/Tasks/usingkeys.htm). 
+* `kms_key_id` - The OCID of the Vault service master encryption assigned to the boot volume backup. For more information about the Vault service and encryption keys, see [Overview of Vault service](https://docs.cloud.oracle.com/iaas/Content/KeyManagement/Concepts/keyoverview.htm) and [Using Keys](https://docs.cloud.oracle.com/iaas/Content/KeyManagement/Tasks/usingkeys.htm). 
 * `size_in_gbs` - The size of the boot volume, in GBs. 
 * `source_boot_volume_backup_id` - The OCID of the source boot volume backup.
 * `source_type` - Specifies whether the backup was created manually, or via scheduled backup policy. 

website/docs/d/core_boot_volumes.html.markdown

@@ -61,7 +61,7 @@ The following attributes are exported:
 * `image_id` - The image OCID used to create the boot volume.
 * `is_auto_tune_enabled` - Specifies whether the auto-tune performance is enabled for this boot volume. This field is deprecated. Use the `DetachedVolumeAutotunePolicy` instead to enable the volume for detached autotune. 
 * `is_hydrated` - Specifies whether the boot volume's data has finished copying from the source boot volume or boot volume backup. 
-* `kms_key_id` - The OCID of the Key Management master encryption key assigned to the boot volume.
+* `kms_key_id` - The OCID of the Vault service master encryption key assigned to the boot volume.
 * `size_in_gbs` - The size of the boot volume in GBs.
 * `size_in_mbs` - The size of the volume in MBs. The value must be a multiple of 1024. This field is deprecated. Please use `size_in_gbs`. 
 * `source_details` - 

website/docs/d/core_drg_route_table_route_rules.html.markdown

@@ -48,7 +48,7 @@ The following attributes are exported:
 	Potential values:
 	* An IP address range (IPv4 or IPv6) in CIDR notation. For example: `192.168.1.0/24` or `2001:0db8:0123:45::/56`.
 	* When you're setting up a security rule for traffic destined for a particular `Service` through a service gateway, this is the `cidrBlock` value associated with that [Service](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/20160918/Service/). For example: `oci-phx-objectstorage`. 
-* `destination_type` - The type of destination for the rule. the type is required if `direction` = `EGRESS`.
+* `destination_type` - The type of destination for the rule.
 
 	Allowed values:
 	* `CIDR_BLOCK`: If the rule's `destination` is an IP address range in CIDR notation.

website/docs/d/core_images.html.markdown

@@ -14,7 +14,7 @@ Lists a subset of images available in the specified compartment, including
 [platform images](https://docs.cloud.oracle.com/iaas/Content/Compute/References/images.htm) and
 [custom images](https://docs.cloud.oracle.com/iaas/Content/Compute/Tasks/managingcustomimages.htm).
 The list of platform images includes the three most recently published versions
-of each major distribution.
+of each major distribution. The list does not support filtering based on image tags.
 
 The list of images returned is ordered to first show the recent platform images,
 then all of the custom images.

website/docs/d/core_instance.html.markdown

@@ -12,6 +12,10 @@ This data source provides details about a specific Instance resource in Oracle C
 
 Gets information about the specified instance.
 
+**Note:** To retrieve public and private IP addresses for an instance, use the [ListVnicAttachments](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/VnicAttachment/ListVnicAttachments)
+operation to get the VNIC ID for the instance, and then call [GetVnic](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/Vnic/GetVnic) with the VNIC ID.
+
+
 ## Example Usage
 
 ```hcl
@@ -204,9 +208,9 @@ The following attributes are exported:
 		* `20`: Represents Higher Performance option.
 		* `30`-`120`: Represents the Ultra High Performance option.
 
-		For volumes with the auto-tuned performance feature enabled, this is set to the default (minimum) VPUs/GB. 
-	* `kms_key_id` - The OCID of the Key Management key to assign as the master encryption key for the boot volume.
-	* `source_id` - The OCID of an image or a boot volume to use, depending on the value of `source_type`.
+		For volumes with the auto-tuned performance feature enabled, this is set to the default (minimum) VPUs/GB.
+	* `kms_key_id` - The OCID of the Vault service key to assign as the master encryption key for the boot volume.
+	* `source_id` - The OCID of the boot volume used to boot the instance.
 	* `source_type` - The source type for the instance. Use `image` when specifying the image OCID. Use `bootVolume` when specifying the boot volume OCID. 
 * `state` - The current state of the instance.
 * `system_tags` - System tags for this resource. Each key is predefined and scoped to a namespace. Example: `{"foo-namespace.bar-key": "value"}`