Bug Fix - Exacs dbHome, pdb, cvm bug fixes

Author: alex-mui

examples/database/db_systems/db_exacs/variables.tf

@@ -47,7 +47,7 @@ variable "cloud_vm_cluster_cpu_core_count" {
 }
 
 variable "cloud_vm_cluster_ocpu_count" {
-  default = "8.0"
+  default = "16.0"
 }
 
 variable "cloud_vm_cluster_gi_version" {

internal/service/database/database_backup_resource.go

@@ -374,6 +374,8 @@ func (s *DatabaseBackupResourceCrud) SetData() error {
 
 	if s.Res.EncryptionKeyLocationDetails != nil {
 		s.D.Set("encryption_key_location_details", []interface{}{EncryptionKeyLocationDetailsToMap(&s.Res.EncryptionKeyLocationDetails, "")})
+	} else {
+		s.D.Set("encryption_key_location_details", nil)
 	}
 
 	if s.Res.KeyStoreId != nil {

internal/service/database/database_cloud_exadata_infrastructure_resource.go

@@ -676,7 +676,7 @@ func (s *DatabaseCloudExadataInfrastructureResourceCrud) Update() error {
 		if s.Res.ActivatedStorageCount != nil {
 			userStorageCount := storageCount.(int)
 			activatedStorageCount := *s.Res.ActivatedStorageCount
-			if utils.IsMultiVm(*s.Res.Shape, s.Res.MaxDataStorageInTBs) && activatedStorageCount < userStorageCount {
+			if utils.IsMultiVm(s.Res.ActivatedStorageCount) && activatedStorageCount < userStorageCount {
 				err := s.addStorageMVM()
 				if err != nil {
 					return err

internal/service/database/database_cloud_vm_cluster_resource.go

@@ -930,7 +930,7 @@ func (s *DatabaseCloudVmClusterResourceCrud) Update() error {
 			}
 		}
 	}
-	if !utils.IsMultiVm(*s.Infra.Shape, s.Infra.MaxDataStorageInTBs) {
+	if !utils.IsMultiVm(s.Infra.ActivatedStorageCount) {
 		if nodeCount, ok := s.D.GetOkExists("node_count"); ok {
 			if s.Infra.ComputeCount != nil && *s.Infra.ComputeCount != nodeCount {
 				request.ComputeNodes = []string{"ALL"}

internal/service/database/database_pluggable_database_resource.go

@@ -37,9 +37,10 @@ func DatabasePluggableDatabaseResource() *schema.Resource {
 				ForceNew: true,
 			},
 			"pdb_name": {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
+				Type:             schema.TypeString,
+				Required:         true,
+				ForceNew:         true,
+				DiffSuppressFunc: tfresource.EqualIgnoreCaseSuppressDiff,
 			},
 
 			// Optional

internal/tfresource/crud_helpers.go

@@ -529,7 +529,7 @@ func DbVersionDiffSuppress(key string, old string, new string, d *schema.Resourc
 	if old == "" || new == "" {
 		return false
 	}
-	if new == "18.0.0.0" || new == "19.0.0.0" {
+	if new == "18.0.0.0" || new == "19.0.0.0" || new == "23.0.0.0" {
 		oldVersion := strings.Split(old, ".")
 		newVersion := strings.Split(new, ".")
 		oldVersionNumber, err := strconv.Atoi(oldVersion[0])

internal/utils/exacs_helpers.go

@@ -1,7 +1,5 @@
 package utils
 
-import "strings"
-
-func IsMultiVm(shape string, maxDataStorageInTBs *float64) bool {
-	return (strings.EqualFold(shape, "Exadata.X8M") || strings.EqualFold(shape, "Exadata.X9M")) && maxDataStorageInTBs != nil
+func IsMultiVm(activatedStorageCount *int) bool {
+	return activatedStorageCount != nil && *activatedStorageCount > 0
 }