Merge pull request #2153 from oracle/release_gh

Releasing version 6.2.0
oracle · Jul 10, 2024 · 7cac9d9 · 7cac9d9
2 parents 41ab0c3 + 5f2ac33
commit 7cac9d9
Show file tree

Hide file tree

Showing 153 changed files with 626 additions and 125 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 6.2.0 (July 10, 2024)
+
+### Added
+- Support for Support Dynamic list of ZDM parameters for Oracle<>Oracle migrations
+- Support for Shared Resources feature
+### Bug Fix
+- Update current_version_number on secret_content update
+
 ## 6.1.0 (July 02, 2024)
 
 ### Added

diff --git a/examples/databasemigration/migration/migration.tf b/examples/databasemigration/migration/migration.tf
@@ -103,13 +103,14 @@ data "oci_database_migration_job" "test_job" {
   job_id = var.jobId
 }
 
-data "oci_database_migration_agent" "test_agent" {
-  agent_id = "agentId"
-}
 
+
+variable "migration_id" {
+  default = ""
+}
 data "oci_database_migration_migrations" "test_migrations" {
   #Required
-  compartment_id =  var.compartment_id
+  migration_id = var.migration_id
 }
 
 data "oci_database_migration_job_advisor_report" "test_job_advisor_report" {
@@ -123,8 +124,43 @@ data "oci_database_migration_job_output" "test_job_output" {
 data "oci_database_migration_migration_object_types" "test_migration_object_types" {
   connection_type = "MYSQL"
 }
+variable "connection_string" {
+  default = ""
+}
+variable "nsg_ids" {
+  default = ""
+}
+resource "oci_database_migration_connection" "test_connection_rds_source" {
+  compartment_id = var.compartment_id
+  display_name = "TF_display_test_rds_source"
+  connection_type = "ORACLE"
+  key_id = var.kms_key_id
+  vault_id = var.kms_vault_id
+  connection_string = var.connection_string
+  password = "BEstrO0ng_#11"
+  technology_type = "AMAZON_RDS_ORACLE"
+  username = "ggfe"
+  nsg_ids = var.nsg_ids
+  replication_password="replicationPassword"
+  replication_username="replicationUsername"
+}
 
-data "oci_database_migration_agent_images" "test_agent_images" {}
+variable "database_autonomous_id" {
+  default = ""
+}
+resource "oci_database_migration_connection" "test_connection_rds_target" {
+  compartment_id = var.compartment_id
+  display_name = "TF_display_test_rds_target"
+  connection_type = "ORACLE"
+  key_id = var.kms_key_id
+  vault_id = var.kms_vault_id
+  database_id = var.database_autonomous_id
+  password = "BEstrO0ng_#11"
+  technology_type = "OCI_AUTONOMOUS_DATABASE"
+  username = "ggfe"
+  replication_password="replicationPassword"
+  replication_username="replicationUsername"
+}
 
 resource "oci_database_migration_connection" "test_connection_target" {
   compartment_id = var.compartment_id
@@ -200,6 +236,70 @@ resource "oci_database_migration_migration" "test_migration" {
   display_name = "displayName"
 }
 
+resource "oci_database_migration_migration" "test_offline_migration" {
+  compartment_id = var.compartment_id
+  database_combination = "MYSQL"
+  source_database_connection_id = var.source_connection_mysql_id
+  target_database_connection_id = var.target_connection_mysql_id
+  type = "OFFLINE"
+  display_name = "displayName"
+}
+
+variable "source_connection_oracle_id" {
+  default = ""
+}
+variable "source_connection_container_oracle_id" {
+  default = ""
+}
+variable "target_connection_oracle_id" {
+  default = ""
+}
+variable "bucket_oracle_id" {
+  default = ""
+}
+resource "oci_database_migration_migration" "test_oracle_migration" {
+  compartment_id = var.compartment_id
+  database_combination = "ORACLE"
+  source_database_connection_id = var.source_connection_oracle_id
+  source_container_database_connection_id = var.source_connection_container_oracle_id
+  target_database_connection_id = var.target_connection_oracle_id
+  advanced_parameters {
+    data_type = "STRING"
+    name = "DATAPUMPSETTINGS_METADATAONLY"
+    value = "True"
+  }
+  data_transfer_medium_details {
+    type = "OBJECT_STORAGE"
+    object_storage_bucket {
+      bucket = var.bucket_oracle_id
+      namespace = "namespace"
+    }
+  }
+  type = "ONLINE"
+  display_name = "displayName"
+}
+
+resource "oci_database_migration_migration" "test_oracle_rds_migration" {
+  compartment_id = var.compartment_id
+  database_combination = "ORACLE"
+  source_database_connection_id = oci_database_migration_connection.test_connection_rds_source.id
+  target_database_connection_id = oci_database_migration_connection.test_connection_rds_target.id
+
+  data_transfer_medium_details {
+    type = "AWS_S3"
+    name = "rdsbucket"
+    region = "us-east-1"
+    secret_access_key = "12345/12345"
+    access_key_id = "12345"
+    object_storage_bucket {
+      bucket = var.bucket_oracle_id
+      namespace = "namespace"
+    }
+  }
+  type = "ONLINE"
+  display_name = "displayName"
+}
+
 output "password" {
   sensitive = true
   value = random_string.autonomous_database_admin_password.result

diff --git a/examples/metering_computation/usage/main.tf b/examples/metering_computation/usage/main.tf
@@ -5,27 +5,12 @@
 variable "tenancy_ocid" {
 }
 
-variable "user_ocid" {
-}
-
-variable "fingerprint" {
-}
-
-variable "private_key_path" {
-}
-
-variable "compartment_ocid" {
-}
-
 variable "region" {
 }
 
 provider "oci" {
-  region           = var.region
-  tenancy_ocid     = var.tenancy_ocid
-  user_ocid        = var.user_ocid
-  fingerprint      = var.fingerprint
-  private_key_path = var.private_key_path
+  auth                = "SecurityToken"
+  config_file_profile = "terraform-federation-test"
 }
 
 variable "time_usage_ended" {

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/aiDocument.zip b/examples/zips/aiDocument.zip
diff --git a/examples/zips/aiLanguage.zip b/examples/zips/aiLanguage.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/capacity_management.zip b/examples/zips/capacity_management.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/cluster_placement_groups.zip b/examples/zips/cluster_placement_groups.zip
diff --git a/examples/zips/compute.zip b/examples/zips/compute.zip
diff --git a/examples/zips/computecloudatcustomer.zip b/examples/zips/computecloudatcustomer.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/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/demand_signal.zip b/examples/zips/demand_signal.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/generative_ai.zip b/examples/zips/generative_ai.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/identity_domains.zip b/examples/zips/identity_domains.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/jms_java_downloads.zip b/examples/zips/jms_java_downloads.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/os_management_hub.zip b/examples/zips/os_management_hub.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/psql.zip b/examples/zips/psql.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/redis.zip b/examples/zips/redis.zip
diff --git a/examples/zips/resourcemanager.zip b/examples/zips/resourcemanager.zip
diff --git a/examples/zips/resourcescheduler.zip b/examples/zips/resourcescheduler.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
@@ -52,7 +52,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // 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.69.0
+	github.com/oracle/oci-go-sdk/v65 v65.69.1
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sony/gobreaker v0.5.0 // indirect
 	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect

diff --git a/go.sum b/go.sum
@@ -140,8 +140,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.69.0 h1:DbrRf5qcpwl7V3ixk6dxDYfHtOs3aMmlsHFld3oBjMk=
-github.com/oracle/oci-go-sdk/v65 v65.69.0/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
+github.com/oracle/oci-go-sdk/v65 v65.69.1 h1:X3vNSw9tXOxML96L3wBxrK7cwESgP/H1IgR8rTH5Ab4=
+github.com/oracle/oci-go-sdk/v65 v65.69.1/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
 github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
 github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

diff --git a/internal/globalvar/version.go b/internal/globalvar/version.go
@@ -7,8 +7,8 @@ import (
 	"log"
 )
 
-const Version = "6.1.0"
-const ReleaseDate = "2024-07-03"
+const Version = "6.2.0"
+const ReleaseDate = "2024-07-10"
 
 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
@@ -331,8 +331,12 @@ var (
 		"source_type":                     acctest.Representation{RepType: acctest.Required, Create: `bootVolume`},
 		"is_preserve_boot_volume_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`},
 	}
-	CoreInstanceSourceDetailsUpdateImageIdRepresentation = map[string]interface{}{
-		"source_id":                       acctest.Representation{RepType: acctest.Required, Create: `${var.InstanceImageOCIDShieldedCompatible[var.region]}`},
+	CoreInstanceSourceDetailsUpdateImageIdRequiredRepresentation = map[string]interface{}{
+		"source_id":   acctest.Representation{RepType: acctest.Required, Create: `${var.InstanceImageOCIDShieldedCompatible[var.region]}`},
+		"source_type": acctest.Representation{RepType: acctest.Required, Create: `image`},
+	}
+	CoreInstanceSourceDetailsUpdateImageIdOptionalRepresentation = map[string]interface{}{
+		"source_id":                       acctest.Representation{RepType: acctest.Required, Create: `${var.InstanceImageOCID[var.region]}`},
 		"source_type":                     acctest.Representation{RepType: acctest.Required, Create: `image`},
 		"is_preserve_boot_volume_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`},
 		"kms_key_id":                      acctest.Representation{RepType: acctest.Optional, Create: `${lookup(data.oci_kms_keys.test_keys_dependency.keys[0], "id")}`},
@@ -2896,6 +2900,7 @@ func TestAccResourceCoreInstance_UpdateSourceDetails(t *testing.T) {
 
 	config := `
       provider oci {
+		 alias = "boot-volume-replacement"
          test_time_maintenance_reboot_due = "2030-01-01 00:00:00"
       }
    ` + acctest.CommonTestVariables()
@@ -2918,7 +2923,11 @@ func TestAccResourceCoreInstance_UpdateSourceDetails(t *testing.T) {
 			{
 				Config: acctest.ProviderTestConfig() + compartmentIdVariableStr + CoreInstanceBootVolumeSwapResourceDependencies +
 					acctest.GenerateResourceFromRepresentationMap("oci_core_instance", "test_instance", acctest.Optional, acctest.Create,
-						acctest.RepresentationCopyWithRemovedProperties(CoreInstanceRepresentation, []string{"dedicated_vm_host_id", "launch_options", "image"})),
+						acctest.RepresentationCopyWithRemovedProperties(
+							// SourceDetails w/o kms_key
+							acctest.GetUpdatedRepresentationCopy("source_details", acctest.RepresentationGroup{RepType: acctest.Required,
+								Group: instanceSourceDetailsSansKmsRepresentation}, CoreInstanceRepresentation),
+							[]string{"dedicated_vm_host_id", "launch_options", "image"})),
 				Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 					resource.TestCheckResourceAttrSet(resourceName, "availability_domain"),
 					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
@@ -2936,13 +2945,43 @@ func TestAccResourceCoreInstance_UpdateSourceDetails(t *testing.T) {
 				),
 			},
 
-			// Step 1:  verify updates to existing source_details property does not destroy the resource - Update the imageId associated with source details
+			// Step 1:  verify updates to existing source_details property does not destroy the resource - Update only imageId associated with source details
 			{
 				Config: config + compartmentIdVariableStr + CoreInstanceBootVolumeSwapResourceDependencies + utils.DefinedShieldedImageOCIDs +
 					acctest.GenerateResourceFromRepresentationMap("oci_core_instance", "test_instance", acctest.Optional, acctest.Create,
 						acctest.RepresentationCopyWithRemovedProperties(
-							acctest.GetUpdatedRepresentationCopy("source_details", acctest.RepresentationGroup{RepType: acctest.Optional, Group: CoreInstanceSourceDetailsUpdateImageIdRepresentation},
-								CoreInstanceRepresentation),
+							// Updating source_details with only required properties
+							acctest.GetUpdatedRepresentationCopy("source_details", acctest.RepresentationGroup{RepType: acctest.Required,
+								Group: CoreInstanceSourceDetailsUpdateImageIdRequiredRepresentation}, CoreInstanceRepresentation),
+							[]string{"dedicated_vm_host_id", "launch_options", "image"})),
+				Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+					resource.TestCheckResourceAttrSet(resourceName, "availability_domain"),
+					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
+					resource.TestCheckResourceAttr(resourceName, "shape", "VM.Standard2.1"),
+					resource.TestCheckResourceAttrSet(resourceName, "subnet_id"),
+					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, "source_details.0.boot_volume_size_in_gbs", "60"),
+
+					func(s *terraform.State) (err error) {
+						resId2, err = acctest.FromInstanceState(s, resourceName, "id")
+						if resId != resId2 {
+							return fmt.Errorf("Resource recreated when it was supposed to be updated.")
+						}
+						return err
+					},
+				),
+			},
+
+			// Step 2:  verify updates to all optional properties associated with source_details - kmsKey, bootVolumeSize etc.
+			{
+				Config: config + compartmentIdVariableStr + CoreInstanceBootVolumeSwapResourceDependencies + utils.DefinedShieldedImageOCIDs +
+					acctest.GenerateResourceFromRepresentationMap("oci_core_instance", "test_instance", acctest.Optional, acctest.Create,
+						acctest.RepresentationCopyWithRemovedProperties(
+							// Updating source_details with only required properties
+							acctest.GetUpdatedRepresentationCopy("source_details", acctest.RepresentationGroup{RepType: acctest.Optional,
+								Group: CoreInstanceSourceDetailsUpdateImageIdOptionalRepresentation}, CoreInstanceRepresentation),
 							[]string{"dedicated_vm_host_id", "launch_options", "image"})),
 				Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 					resource.TestCheckResourceAttrSet(resourceName, "availability_domain"),
@@ -2965,7 +3004,7 @@ func TestAccResourceCoreInstance_UpdateSourceDetails(t *testing.T) {
 				),
 			},
 
-			// Step 2:  verify updates to existing source_details property does not destroy the resource - Update the bootVolumeId associated with the source details
+			// Step 3:  verify updates to existing source_details property does not destroy the resource - Update the bootVolumeId associated with the source details
 			{
 				Config: config + compartmentIdVariableStr + CoreInstanceBootVolumeSwapResourceDependencies +
 					acctest.GenerateResourceFromRepresentationMap("oci_core_instance", "test_instance", acctest.Optional, acctest.Create,