Merge pull request #1794 from oracle/release_gh

Releasing version 4.111.0
oracle · Mar 8, 2023 · 3a2aeaa · 3a2aeaa
2 parents 9134721 + dd10ea6
commit 3a2aeaa
Show file tree

Hide file tree

Showing 277 changed files with 4,824 additions and 282 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 4.111.0 (March 08, 2023)
+
+### Added
+- Support for OCI Data Science Custom Container Images for Model Deployment
+- Support for OCM - Add Disaster Recovery Feature
+- Support for Management Agent API changes
+- Support for ADB-S: Long-Term Automatic Backup Retention
+- Support for UpdateInstanceConstraint in Terraform
+
 ## 4.110.0 (March 01, 2023)
 
 ### Added

diff --git a/examples/datascience/model_deployment/artifact_byoc.zip b/examples/datascience/model_deployment/artifact_byoc.zip
diff --git a/examples/datascience/model_deployment/model_deployment.tf b/examples/datascience/model_deployment/model_deployment.tf
@@ -32,67 +32,11 @@ variable "compartment_ocid" {
 variable "project_ocid" {
 }
 
-variable "model_display_name" {
-  default = "terraform-testing-model"
-}
-
-variable "model_description" {
-  default = "Model for terraform testing"
-}
-
-variable "artifact_content_length" {
-}
-
-variable "model_artifact" {
-}
-
-variable "content_disposition" {
-}
-
 variable "shape" {
 }
 
-variable "model_defined_tags" {
-}
-
-variable "model_freeform_tag" {
-}
-
-variable "model_state" {
-}
-
+variable "model_id" {
 
-# A model resource configurations for creating a new model
-resource "oci_datascience_model" "tf_model" {
-  # Required
-  artifact_content_length = var.artifact_content_length
-  model_artifact          = var.model_artifact
-  compartment_id          = var.compartment_ocid
-  project_id              = var.project_ocid
-  # Optional
-  artifact_content_disposition = var.content_disposition
-  defined_tags                 = var.model_defined_tags
-  description                  = var.model_description
-  display_name                 = var.model_display_name
-  freeform_tags                = var.model_freeform_tag
-}
-
-# A data resource for the list of models in a specified compartment
-data "oci_datascience_models" "tf_models" {
-  # Required
-  compartment_id = var.compartment_ocid
-  # Optional
-  created_by   = var.user_ocid
-  display_name = oci_datascience_model.tf_model.display_name
-  id           = oci_datascience_model.tf_model.id
-  project_id   = var.project_ocid
-  state        = var.model_state
-}
-
-# The data source for a list of model deployment shapes
-data "oci_datascience_model_deployment_shapes" "tf_model_deployment_shapes" {
-  # Required
-  compartment_id = var.compartment_ocid
 }
 
 variable "model_deployment_display_name" {
@@ -143,6 +87,40 @@ variable "model_deployment_model_configuration_details_instance_configuration_mo
 }
 
 variable "model_deployment_state" {
+  default = "ACTIVE"
+}
+
+# these variables for BYOC option
+variable "model_byoc_id" {
+}
+
+variable "model_deployment_byoc_display_name" {
+  default = "terraform-testing-model-deployment_byoc"
+}
+
+variable "model_deployment_model_deployment_configuration_details_environment_configuration_details_environment_configuration_type" {
+  default = "OCIR_CONTAINER"
+}
+
+variable "model_deployment_model_deployment_configuration_details_environment_configuration_details_cmd" {
+}
+
+variable "model_deployment_model_deployment_configuration_details_environment_configuration_details_entrypoint" {
+}
+
+variable "model_deployment_model_deployment_configuration_details_environment_configuration_details_environment_variables" {
+}
+
+variable "model_deployment_model_deployment_configuration_details_environment_configuration_details_health_check_port" {
+}
+
+variable "model_deployment_model_deployment_configuration_details_environment_configuration_details_image" {
+}
+
+variable "model_deployment_model_deployment_configuration_details_environment_configuration_details_image_digest" {
+}
+
+variable "model_deployment_model_deployment_configuration_details_environment_configuration_details_server_port" {
 }
 
 # A model deployment resource configurations for creating a new model deployment
@@ -166,7 +144,7 @@ resource "oci_datascience_model_deployment" "tf_model_deployment" {
           ocpus         = var.model_deployment_model_configuration_details_instance_configuration_model_deployment_instance_shape_config_details_ocpus
         }
       }
-      model_id = oci_datascience_model.tf_model.id
+      model_id = var.model_id
 
       # Optional
       bandwidth_mbps = var.model_deployment_model_deployment_configuration_details_model_configuration_details_bandwidth_mbps
@@ -195,10 +173,81 @@ resource "oci_datascience_model_deployment" "tf_model_deployment" {
     }
   }
   # Optional
-  defined_tags  = var.model_deployment_defined_tags
+//  defined_tags  = var.model_deployment_defined_tags
   description   = var.model_deployment_description
   display_name  = var.model_deployment_display_name
-  freeform_tags = var.model_deployment_freeform_tag
+//  freeform_tags = var.model_deployment_freeform_tag
+}
+
+
+resource "oci_datascience_model_deployment" "tf_model_deployment_byoc" {
+  # Required
+  compartment_id = var.compartment_ocid
+  model_deployment_configuration_details {
+    # Required
+    deployment_type = var.model_deployment_model_deployment_configuration_details_deployment_type
+    model_configuration_details {
+      # Required
+      instance_configuration {
+        # Required
+        instance_shape_name = var.shape
+
+        #Optional
+        model_deployment_instance_shape_config_details {
+
+          #Optional
+          memory_in_gbs = var.model_deployment_model_configuration_details_instance_configuration_model_deployment_instance_shape_config_details_memory_in_gbs
+          ocpus         = var.model_deployment_model_configuration_details_instance_configuration_model_deployment_instance_shape_config_details_ocpus
+        }
+      }
+      model_id = var.model_byoc_id
+
+      # Optional
+      bandwidth_mbps = var.model_deployment_model_deployment_configuration_details_model_configuration_details_bandwidth_mbps
+      scaling_policy {
+        # Required
+        instance_count = var.model_deployment_model_deployment_configuration_details_model_configuration_details_scaling_policy_instance_count
+        policy_type    = var.model_deployment_model_deployment_configuration_details_model_configuration_details_scaling_policy_policy_type
+      }
+    }
+
+    # Optional for BYOC
+    environment_configuration_details {
+      #Required
+      environment_configuration_type = var.model_deployment_model_deployment_configuration_details_environment_configuration_details_environment_configuration_type
+
+      #Optional
+      cmd = var.model_deployment_model_deployment_configuration_details_environment_configuration_details_cmd
+      entrypoint = var.model_deployment_model_deployment_configuration_details_environment_configuration_details_entrypoint
+      environment_variables = var.model_deployment_model_deployment_configuration_details_environment_configuration_details_environment_variables
+      health_check_port = var.model_deployment_model_deployment_configuration_details_environment_configuration_details_health_check_port
+      image = var.model_deployment_model_deployment_configuration_details_environment_configuration_details_image
+      image_digest = var.model_deployment_model_deployment_configuration_details_environment_configuration_details_image_digest
+      server_port = var.model_deployment_model_deployment_configuration_details_environment_configuration_details_server_port
+    }
+  }
+  project_id = var.project_ocid
+
+  # Optional
+  category_log_details {
+
+    # Optional
+    access {
+      # Required
+      log_group_id = var.log_group_id
+      log_id       = var.access_log_id
+    }
+    predict {
+      # Required
+      log_group_id = var.log_group_id
+      log_id       = var.predict_log_id
+    }
+  }
+  # Optional
+  //  defined_tags  = var.model_deployment_defined_tags
+  description   = var.model_deployment_description
+  display_name  = var.model_deployment_byoc_display_name
+  //  freeform_tags = var.model_deployment_freeform_tag
 }
 
 # The data resource for a list of model deployments in a specified compartment

diff --git a/examples/management_agent/management_agent_agents_count.tf b/examples/management_agent/management_agent_agents_count.tf
@@ -6,4 +6,3 @@ data "oci_management_agent_management_agent_count" "test_management_agent_count"
   compartment_id = var.compartment_ocid
   group_by = ["version"]
 }
-
diff --git a/examples/oracle_content_experience/main.tf b/examples/oracle_content_experience/main.tf
@@ -55,6 +55,12 @@ resource "oci_oce_oce_instance" "test_oce_instance" {
   instance_license_type = "BYOL"
   upgrade_schedule      = "UPGRADE_IMMEDIATELY"
   waf_primary_domain    = "oracle.com"
+
+  timeouts {
+    create = "2h"
+    update = "60m"
+    delete = "1h"
+  }
 }
 
 data "oci_oce_oce_instances" "test_oce_instances" {

diff --git a/examples/zips/adm.zip b/examples/zips/adm.zip
diff --git a/examples/zips/aiAnomalyDetection.zip b/examples/zips/aiAnomalyDetection.zip
diff --git a/examples/zips/aiVision.zip b/examples/zips/aiVision.zip
diff --git a/examples/zips/always_free.zip b/examples/zips/always_free.zip
diff --git a/examples/zips/analytics.zip b/examples/zips/analytics.zip
diff --git a/examples/zips/announcements_service.zip b/examples/zips/announcements_service.zip
diff --git a/examples/zips/api_gateway.zip b/examples/zips/api_gateway.zip
diff --git a/examples/zips/apm.zip b/examples/zips/apm.zip
diff --git a/examples/zips/appmgmt_control.zip b/examples/zips/appmgmt_control.zip
diff --git a/examples/zips/artifacts.zip b/examples/zips/artifacts.zip
diff --git a/examples/zips/audit.zip b/examples/zips/audit.zip
diff --git a/examples/zips/autoscaling.zip b/examples/zips/autoscaling.zip
diff --git a/examples/zips/bastion.zip b/examples/zips/bastion.zip
diff --git a/examples/zips/big_data_service.zip b/examples/zips/big_data_service.zip
diff --git a/examples/zips/blockchain.zip b/examples/zips/blockchain.zip
diff --git a/examples/zips/budget.zip b/examples/zips/budget.zip
diff --git a/examples/zips/certificatesManagement.zip b/examples/zips/certificatesManagement.zip
diff --git a/examples/zips/cloudBridge.zip b/examples/zips/cloudBridge.zip
diff --git a/examples/zips/cloudMigrations.zip b/examples/zips/cloudMigrations.zip
diff --git a/examples/zips/cloudguard.zip b/examples/zips/cloudguard.zip
diff --git a/examples/zips/compute.zip b/examples/zips/compute.zip
diff --git a/examples/zips/computeinstanceagent.zip b/examples/zips/computeinstanceagent.zip
diff --git a/examples/zips/concepts.zip b/examples/zips/concepts.zip
diff --git a/examples/zips/container_engine.zip b/examples/zips/container_engine.zip
diff --git a/examples/zips/container_instances.zip b/examples/zips/container_instances.zip
diff --git a/examples/zips/dataConnectivity.zip b/examples/zips/dataConnectivity.zip
diff --git a/examples/zips/database.zip b/examples/zips/database.zip
diff --git a/examples/zips/databaseTools.zip b/examples/zips/databaseTools.zip
diff --git a/examples/zips/databasemanagement.zip b/examples/zips/databasemanagement.zip
diff --git a/examples/zips/databasemigration.zip b/examples/zips/databasemigration.zip
diff --git a/examples/zips/datacatalog.zip b/examples/zips/datacatalog.zip
diff --git a/examples/zips/dataflow.zip b/examples/zips/dataflow.zip
diff --git a/examples/zips/dataintegration.zip b/examples/zips/dataintegration.zip
diff --git a/examples/zips/datalabeling.zip b/examples/zips/datalabeling.zip
diff --git a/examples/zips/datasafe.zip b/examples/zips/datasafe.zip
diff --git a/examples/zips/datascience.zip b/examples/zips/datascience.zip
diff --git a/examples/zips/devops.zip b/examples/zips/devops.zip
diff --git a/examples/zips/disaster_recovery.zip b/examples/zips/disaster_recovery.zip
diff --git a/examples/zips/dns.zip b/examples/zips/dns.zip
diff --git a/examples/zips/em_warehouse.zip b/examples/zips/em_warehouse.zip
diff --git a/examples/zips/email.zip b/examples/zips/email.zip
diff --git a/examples/zips/events.zip b/examples/zips/events.zip
diff --git a/examples/zips/fast_connect.zip b/examples/zips/fast_connect.zip
diff --git a/examples/zips/functions.zip b/examples/zips/functions.zip
diff --git a/examples/zips/fusionapps.zip b/examples/zips/fusionapps.zip
diff --git a/examples/zips/goldengate.zip b/examples/zips/goldengate.zip
diff --git a/examples/zips/health_checks.zip b/examples/zips/health_checks.zip
diff --git a/examples/zips/id6.zip b/examples/zips/id6.zip
diff --git a/examples/zips/identity.zip b/examples/zips/identity.zip
diff --git a/examples/zips/identity_data_plane.zip b/examples/zips/identity_data_plane.zip
diff --git a/examples/zips/integration.zip b/examples/zips/integration.zip
diff --git a/examples/zips/jms.zip b/examples/zips/jms.zip
diff --git a/examples/zips/kms.zip b/examples/zips/kms.zip
diff --git a/examples/zips/license_manager.zip b/examples/zips/license_manager.zip
diff --git a/examples/zips/limits.zip b/examples/zips/limits.zip
diff --git a/examples/zips/load_balancer.zip b/examples/zips/load_balancer.zip
diff --git a/examples/zips/log_analytics.zip b/examples/zips/log_analytics.zip
diff --git a/examples/zips/logging.zip b/examples/zips/logging.zip
diff --git a/examples/zips/management_agent.zip b/examples/zips/management_agent.zip
diff --git a/examples/zips/management_dashboard.zip b/examples/zips/management_dashboard.zip
diff --git a/examples/zips/marketplace.zip b/examples/zips/marketplace.zip
diff --git a/examples/zips/media_services.zip b/examples/zips/media_services.zip
diff --git a/examples/zips/metering_computation.zip b/examples/zips/metering_computation.zip
diff --git a/examples/zips/monitoring.zip b/examples/zips/monitoring.zip
diff --git a/examples/zips/mysql.zip b/examples/zips/mysql.zip
diff --git a/examples/zips/network_firewall.zip b/examples/zips/network_firewall.zip
diff --git a/examples/zips/network_load_balancer.zip b/examples/zips/network_load_balancer.zip
diff --git a/examples/zips/networking.zip b/examples/zips/networking.zip
diff --git a/examples/zips/nosql.zip b/examples/zips/nosql.zip
diff --git a/examples/zips/notifications.zip b/examples/zips/notifications.zip
diff --git a/examples/zips/object_storage.zip b/examples/zips/object_storage.zip
diff --git a/examples/zips/ocvp.zip b/examples/zips/ocvp.zip
diff --git a/examples/zips/onesubscription.zip b/examples/zips/onesubscription.zip
diff --git a/examples/zips/opa.zip b/examples/zips/opa.zip
diff --git a/examples/zips/opensearch.zip b/examples/zips/opensearch.zip
diff --git a/examples/zips/operator_access_control.zip b/examples/zips/operator_access_control.zip
diff --git a/examples/zips/opsi.zip b/examples/zips/opsi.zip
diff --git a/examples/zips/optimizer.zip b/examples/zips/optimizer.zip
diff --git a/examples/zips/oracle_cloud_vmware_solution.zip b/examples/zips/oracle_cloud_vmware_solution.zip
diff --git a/examples/zips/oracle_content_experience.zip b/examples/zips/oracle_content_experience.zip
diff --git a/examples/zips/oracle_digital_assistant.zip b/examples/zips/oracle_digital_assistant.zip
diff --git a/examples/zips/osmanagement.zip b/examples/zips/osmanagement.zip
diff --git a/examples/zips/osp_gateway.zip b/examples/zips/osp_gateway.zip
diff --git a/examples/zips/osub_billing_schedule.zip b/examples/zips/osub_billing_schedule.zip
diff --git a/examples/zips/osub_organization_subscription.zip b/examples/zips/osub_organization_subscription.zip
diff --git a/examples/zips/osub_subscription.zip b/examples/zips/osub_subscription.zip
diff --git a/examples/zips/osub_usage.zip b/examples/zips/osub_usage.zip
diff --git a/examples/zips/pic.zip b/examples/zips/pic.zip
diff --git a/examples/zips/queue.zip b/examples/zips/queue.zip
diff --git a/examples/zips/recovery.zip b/examples/zips/recovery.zip
diff --git a/examples/zips/resourcemanager.zip b/examples/zips/resourcemanager.zip
diff --git a/examples/zips/serviceManagerProxy.zip b/examples/zips/serviceManagerProxy.zip
diff --git a/examples/zips/service_catalog.zip b/examples/zips/service_catalog.zip
diff --git a/examples/zips/service_connector_hub.zip b/examples/zips/service_connector_hub.zip
diff --git a/examples/zips/service_mesh.zip b/examples/zips/service_mesh.zip
diff --git a/examples/zips/stack_monitoring.zip b/examples/zips/stack_monitoring.zip
diff --git a/examples/zips/storage.zip b/examples/zips/storage.zip
diff --git a/examples/zips/streaming.zip b/examples/zips/streaming.zip
diff --git a/examples/zips/usage_proxy.zip b/examples/zips/usage_proxy.zip
diff --git a/examples/zips/vault_secret.zip b/examples/zips/vault_secret.zip
diff --git a/examples/zips/vbs_inst.zip b/examples/zips/vbs_inst.zip
diff --git a/examples/zips/visual_builder.zip b/examples/zips/visual_builder.zip
diff --git a/examples/zips/vn_monitoring.zip b/examples/zips/vn_monitoring.zip
diff --git a/examples/zips/vulnerability_scanning_service.zip b/examples/zips/vulnerability_scanning_service.zip
diff --git a/examples/zips/web_app_acceleration.zip b/examples/zips/web_app_acceleration.zip
diff --git a/examples/zips/web_app_firewall.zip b/examples/zips/web_app_firewall.zip
diff --git a/examples/zips/web_application_acceleration_and_security.zip b/examples/zips/web_application_acceleration_and_security.zip
diff --git a/go.mod b/go.mod
@@ -53,7 +53,7 @@ require (
 	github.com/mitchellh/mapstructure v1.1.2 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/oklog/run v1.0.0 // indirect
-	github.com/oracle/oci-go-sdk/v65 v65.31.1
+	github.com/oracle/oci-go-sdk/v65 v65.32.0
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sony/gobreaker v0.5.0 // indirect
 	github.com/ulikunitz/xz v0.5.8 // indirect

diff --git a/go.sum b/go.sum
@@ -289,8 +289,8 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/oracle/oci-go-sdk/v65 v65.31.1 h1:GcVydzh3M4IbH4Y1XienA3W/bR02SMag0stfw9UbjtQ=
-github.com/oracle/oci-go-sdk/v65 v65.31.1/go.mod h1:oyMrMa1vOzzKTmPN+kqrTR9y9kPA2tU1igN3NUSNTIE=
+github.com/oracle/oci-go-sdk/v65 v65.32.0 h1:6ASjGPE+k42xHgeAavNGbWtTZ4Z4KhlEhvJ4SVFMZrI=
+github.com/oracle/oci-go-sdk/v65 v65.32.0/go.mod h1:oyMrMa1vOzzKTmPN+kqrTR9y9kPA2tU1igN3NUSNTIE=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

diff --git a/internal/globalvar/version.go b/internal/globalvar/version.go
@@ -7,8 +7,8 @@ import (
 	"log"
 )
 
-const Version = "4.110.0"
-const ReleaseDate = "2023-03-01"
+const Version = "4.111.0"
+const ReleaseDate = "2023-03-08"
 
 func PrintVersion() {
 	log.Printf("[INFO] terraform-provider-oci %s\n", Version)

diff --git a/internal/integrationtest/core_instance_test.go b/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",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,3 @@ data "oci_management_agent_management_agent_count" "test_management_agent_count"
		compartment_id = var.compartment_ocid
		group_by = ["version"]
		}