Bug Fix: Fixed DB unique name parameter not getting honoured for new base DB system resource

Author: Terraform Team Automation

examples/database/db_systems/db_vm/db_vm_amd/main.tf

@@ -55,7 +55,7 @@ variable "db_admin_password" {
 }
 
 variable "db_version" {
-  default = "19.0.0.0"
+  default = "19.24.0.0"
 }
 
 variable "db_disk_redundancy" {
@@ -146,17 +146,13 @@ data "oci_database_databases" "databases" {
   db_home_id     = data.oci_database_db_homes.db_homes.db_homes[0].db_home_id
 }
 
-d
-
-
-
-ata "oci_database_db_versions" "test_db_versions_by_db_system_id" {
+data "oci_database_db_versions" "test_db_versions_by_db_system_id" {
   compartment_id = var.compartment_ocid
   db_system_id   = oci_database_db_system.test_db_system.id
 }
 
 resource "oci_database_backup" "test_backup" {
-  database_id = "${data.oci_database_databases.databases.databases.0.id}"
+  database_id = data.oci_database_databases.databases.databases.0.id
   display_name = "Monthly Backup"
 }
 
@@ -303,6 +299,7 @@ resource "oci_database_db_system" "test_db_system" {
 #      kms_key_id     = var.kms_key_id
 #      vault_id       = var.vault_id
       db_name        = "aTFdbVm"
+      db_unique_name = "aTFdbVm_xyz"
       character_set  = var.character_set
       ncharacter_set = var.n_character_set
       db_workload    = var.db_workload
@@ -313,7 +310,7 @@ resource "oci_database_db_system" "test_db_system" {
       }
     }
 
-    db_version   = "19.15.0.0"
+    db_version   = "19.24.0.0"
     display_name = "MyTFDBHomeVm"
   }
 
@@ -360,12 +357,12 @@ resource "oci_database_db_system" "db_system_bkup" {
   display_name = "tfDbSystemFromBackupWithCustImg"
 
   db_home {
-    db_version = "19.15.0.0"
+    db_version = "19.24.0.0"
 #    database_software_image_id = var.test_database_software_image_ocid
     database {
       admin_password = "BEstrO0ng_#11"
       backup_tde_password = "BEstrO0ng_#11"
-      backup_id = "${oci_database_backup.test_backup.id}"
+      backup_id = oci_database_backup.test_backup.id
       db_name = "dbback"
     }
   }

internal/integrationtest/database_db_system_resource_amd_vm_test.go

@@ -30,11 +30,12 @@ func TestResourceDatabaseDBSystemAmdVM(t *testing.T) {
 		node_count = "1"
 		display_name = "tfDbSystemTest"
 		db_home {
-			db_version = "19.15.0.0"
+			db_version = "19.24.0.0"
 			display_name = "dbHome1"
 			database {
 				admin_password = "BEstrO0ng_#11"
 				db_name = "aTFdb"
+				db_unique_name = "aTFdb_xyz"
 				character_set = "AL32UTF8"
 				ncharacter_set = "AL16UTF16"
 				db_workload = "OLTP"
@@ -76,8 +77,9 @@ func TestResourceDatabaseDBSystemAmdVM(t *testing.T) {
 				resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "data_storage_size_in_gb", "256"),
 				resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "license_model", "LICENSE_INCLUDED"),
 				resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "node_count", "1"),
-				resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "db_home.0.db_version", "19.15.0.0"),
+				resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "db_home.0.db_version", "19.24.0.0"),
 				resource.TestCheckResourceAttrSet(ResourceDatabaseResourceName, "db_home.0.display_name"),
+				resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "db_home.0.database.0.db_unique_name", "aTFdb_xyz"),
 			),
 		},
 	})

internal/service/database/database_db_system_resource.go

@@ -301,7 +301,9 @@ func DatabaseDbSystemResource() *schema.Resource {
 									},
 									"db_unique_name": {
 										Type:     schema.TypeString,
+										Optional: true,
 										Computed: true,
+										ForceNew: true,
 									},
 									"id": {
 										Type:     schema.TypeString,
@@ -1551,6 +1553,11 @@ func (s *DatabaseDbSystemResourceCrud) mapToCreateDatabaseDetails(fieldKeyFormat
 		result.DbName = &tmp
 	}
 
+	if dbUniqueName, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "db_unique_name")); ok {
+		tmp := dbUniqueName.(string)
+		result.DbUniqueName = &tmp
+	}
+
 	if dbWorkload, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "db_workload")); ok {
 		result.DbWorkload = oci_database.CreateDatabaseDetailsDbWorkloadEnum(dbWorkload.(string))
 	}
@@ -1623,6 +1630,10 @@ func CreateDatabaseDetailsToMap(obj *oci_database.CreateDatabaseDetails) map[str
 		result["db_name"] = string(*obj.DbName)
 	}
 
+	if obj.DbUniqueName != nil {
+		result["db_unique_name"] = string(*obj.DbUniqueName)
+	}
+
 	result["db_workload"] = string(obj.DbWorkload)
 
 	if obj.DefinedTags != nil {

website/docs/r/database_db_system.html.markdown

@@ -79,6 +79,7 @@ resource "oci_database_db_system" "test_db_system" {
 
 		#Optional
 		database_software_image_id = oci_database_database_software_image.test_database_software_image.id
+		db_unique_name = var.db_unique_name
 		db_version = var.db_system_db_home_db_version
 		defined_tags = var.db_system_db_home_defined_tags
 		display_name = var.db_system_db_home_display_name
@@ -225,6 +226,7 @@ The following arguments are supported:
 		* `time_stamp_for_point_in_time_recovery` - (Applicable when source=DATABASE) The point in time of the original database from which the new database is created. If not specifed, the latest backup is used to create the database.
 		* `vault_id` - (Applicable when source=NONE) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Oracle Cloud Infrastructure [vault](https://docs.cloud.oracle.com/iaas/Content/KeyManagement/Concepts/keyoverview.htm#concepts).
 	* `database_software_image_id` - (Applicable when source=DB_BACKUP | NONE) The database software image [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the image to be used to restore a database.
+    * `db_unique_name` - (Optional) The `DB_UNIQUE_NAME` of the Oracle Database.
 	* `db_version` - (Required when source=NONE) A valid Oracle Database version. For a list of supported versions, use the ListDbVersions operation.
 
 		This cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, adminPassword, whitelistedIps, isMTLSConnectionRequired, openMode, permissionLevel, dbWorkload, privateEndpointLabel, nsgIds, isRefreshable, dbName, scheduledOperations, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier.