Added - Support for Database In-Memory support for Autonomous Database | ADB-D and ADB on ExaC@C

Terraform Team Automation · Khalid-Chaudhry · commit 2e857c64979a · 2023-08-18T09:52:50.000-07:00
diff --git a/examples/database/atp-d/exadata.tf b/examples/database/atp-d/exadata.tf
@@ -77,7 +77,7 @@ resource "oci_database_cloud_autonomous_vm_cluster" "test_cloud_autonomous_vm_cl
 #  total_container_databases             = 12
   compute_model                   = "ECPU"
 
-  //To ignore changes to autonomous_data_storage_size_in_tbs
+  //To ignore changes to autonomous_data_storage_size_in_tbs and db_servers
   lifecycle {
     ignore_changes = [
       autonomous_data_storage_size_in_tbs,
diff --git a/examples/database/atp-d/main.tf b/examples/database/atp-d/main.tf
@@ -14,7 +14,7 @@ resource "oci_database_autonomous_container_database" "test_autonomous_container
   cloud_autonomous_vm_cluster_id       = oci_database_cloud_autonomous_vm_cluster.test_cloud_autonomous_vm_cluster.id
   display_name                         = "example-container-database"
   patch_model                          = "RELEASE_UPDATES"
-  db_version                           = "19.18.0.1.0"
+  db_version                           = "19.20.0.1.0"
   db_name                              = "ACDNAME"
 
   #Optional
@@ -74,7 +74,7 @@ resource "oci_database_autonomous_database" "test_autonomous_database" {
   #Required
   admin_password           = random_string.autonomous_database_admin_password.result
   compartment_id           = var.compartment_ocid
-  compute_count            = "1"
+  compute_count            = 8
   data_storage_size_in_tbs = "1"
   db_name                  = "atpdb1"
 
@@ -85,6 +85,7 @@ resource "oci_database_autonomous_database" "test_autonomous_database" {
   freeform_tags                    = var.autonomous_database_freeform_tags
   is_dedicated                     = "true"
   rotate_key_trigger               = "true"
+  in_memory_percentage             = 50
   compute_model                    = "ECPU"
 }
 
diff --git a/examples/database/exadata_cc/adbd/acd.tf b/examples/database/exadata_cc/adbd/acd.tf
@@ -6,7 +6,7 @@ resource "random_string" "db_unique_name" {
 
 resource "oci_database_autonomous_container_database" "autonomous_container_database" {
   autonomous_vm_cluster_id = oci_database_autonomous_vm_cluster.test_autonomous_vm_cluster.id
-  db_version = "19.18.0.1.0"
+  db_version = "19.20.0.1.0"
   backup_config {
     backup_destination_details {
       type = "LOCAL"
diff --git a/examples/database/exadata_cc/adbd/adb.tf b/examples/database/exadata_cc/adbd/adb.tf
@@ -10,7 +10,7 @@ resource "oci_database_autonomous_database" "test_autonomous_database" {
   #Required
   admin_password           = random_string.autonomous_database_admin_password.result
   compartment_id           = var.compartment_ocid
-  ocpu_count           = "2"
+  compute_count            = 8
   data_storage_size_in_tbs = "1"
   db_name                  = "atpdb1"
 
diff --git a/internal/integrationtest/database_autonomous_container_database_resource_test.go b/internal/integrationtest/database_autonomous_container_database_resource_test.go
@@ -46,7 +46,7 @@ var (
 		"maintenance_window_details":   acctest.RepresentationGroup{RepType: acctest.Optional, Group: DatabaseAutonomousContainerDatabaseMaintenanceWindowDetailsRepresentation},
 		"service_level_agreement_type": acctest.Representation{RepType: acctest.Optional, Create: `STANDARD`},
 		"db_name":                      acctest.Representation{RepType: acctest.Optional, Create: `DBNAME`},
-		"db_version":                   acctest.Representation{RepType: acctest.Required, Create: `19.18.0.1.0`},
+		"db_version":                   acctest.Representation{RepType: acctest.Required, Create: `19.20.0.1.0`},
 	}
 
 	ACDatabaseBackupConfigRepresentation = map[string]interface{}{
diff --git a/internal/integrationtest/database_autonomous_container_database_test.go b/internal/integrationtest/database_autonomous_container_database_test.go
@@ -54,7 +54,7 @@ var (
 		"version_preference":             acctest.Representation{RepType: acctest.Optional, Create: `LATEST_RELEASE_UPDATE`, Update: `NEXT_RELEASE_UPDATE`},
 		"display_name":                   acctest.Representation{RepType: acctest.Required, Create: `containerDatabase2`, Update: `displayName2`},
 		"patch_model":                    acctest.Representation{RepType: acctest.Required, Create: `RELEASE_UPDATES`, Update: `RELEASE_UPDATE_REVISIONS`},
-		"db_version":                     acctest.Representation{RepType: acctest.Required, Create: `19.18.0.1.0`},
+		"db_version":                     acctest.Representation{RepType: acctest.Required, Create: `19.20.0.1.0`},
 		"cloud_autonomous_vm_cluster_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_database_cloud_autonomous_vm_cluster.test_cloud_autonomous_vm_cluster.id}`},
 		"backup_config":                  acctest.RepresentationGroup{RepType: acctest.Optional, Group: ACDatabaseBackupConfigRepresentation},
 		"compartment_id":                 acctest.Representation{RepType: acctest.Optional, Create: `${var.compartment_id}`},
diff --git a/internal/integrationtest/database_autonomous_database_resource_test.go b/internal/integrationtest/database_autonomous_database_resource_test.go
diff --git a/internal/integrationtest/database_vm_cluster_network_test.go b/internal/integrationtest/database_vm_cluster_network_test.go
@@ -78,16 +78,16 @@ var (
 		"hostname":                   acctest.Representation{RepType: acctest.Required, Create: `myprefix1-ivmmj-scan`, Update: `myprefix2-ivmmj-scan`},
 		"ips":                        acctest.Representation{RepType: acctest.Required, Create: []string{`192.168.19.7`, `192.168.19.6`, `192.168.19.8`}, Update: []string{`192.168.19.7`, `192.168.19.8`, `192.168.19.9`}},
 		"port":                       acctest.Representation{RepType: acctest.Required, Create: `1521`, Update: `1522`},
-		"scan_listener_port_tcp":     acctest.Representation{RepType: acctest.Optional, Create: `1521`, Update: `1522`},
-		"scan_listener_port_tcp_ssl": acctest.Representation{RepType: acctest.Optional, Create: `2484`, Update: `2484`},
+		"scan_listener_port_tcp":     acctest.Representation{RepType: acctest.Required, Create: `1521`, Update: `1522`},
+		"scan_listener_port_tcp_ssl": acctest.Representation{RepType: acctest.Required, Create: `2484`, Update: `2484`},
 	}
 
 	DatabaseVmClusterNetwork2ScansRepresentation = map[string]interface{}{
 		"hostname":                   acctest.Representation{RepType: acctest.Required, Create: `myprefix4-ivmmj-scan`, Update: `myprefix3-ivmmj-scan`},
 		"ips":                        acctest.Representation{RepType: acctest.Required, Create: []string{`192.168.19.26`, `192.168.19.27`, `192.168.19.28`}, Update: []string{`192.168.19.27`, `192.168.19.28`, `192.168.19.29`}},
 		"port":                       acctest.Representation{RepType: acctest.Required, Create: `1521`, Update: `1522`},
-		"scan_listener_port_tcp":     acctest.Representation{RepType: acctest.Optional, Create: `1521`, Update: `1522`},
-		"scan_listener_port_tcp_ssl": acctest.Representation{RepType: acctest.Optional, Create: `2484`, Update: `2484`},
+		"scan_listener_port_tcp":     acctest.Representation{RepType: acctest.Required, Create: `1521`, Update: `1522`},
+		"scan_listener_port_tcp_ssl": acctest.Representation{RepType: acctest.Required, Create: `2484`, Update: `2484`},
 	}
 
 	DatabaseVmClusterNetworkBackupVmNetworkRepresentation = map[string]interface{}{
diff --git a/internal/service/database/database_autonomous_database_data_source.go b/internal/service/database/database_autonomous_database_data_source.go
@@ -180,6 +180,14 @@ func (s *DatabaseAutonomousDatabaseDataSourceCrud) SetData() error {
 
 	s.D.Set("freeform_tags", s.Res.FreeformTags)
 
+	if s.Res.InMemoryAreaInGBs != nil {
+		s.D.Set("in_memory_area_in_gbs", *s.Res.InMemoryAreaInGBs)
+	}
+
+	if s.Res.InMemoryPercentage != nil {
+		s.D.Set("in_memory_percentage", *s.Res.InMemoryPercentage)
+	}
+
 	s.D.Set("infrastructure_type", s.Res.InfrastructureType)
 
 	if s.Res.IsAccessControlEnabled != nil {
diff --git a/internal/service/database/database_autonomous_database_resource.go b/internal/service/database/database_autonomous_database_resource.go
@@ -188,6 +188,11 @@ func DatabaseAutonomousDatabaseResource() *schema.Resource {
 				Computed: true,
 				Elem:     schema.TypeString,
 			},
+			"in_memory_percentage": {
+				Type:     schema.TypeInt,
+				Optional: true,
+				Computed: true,
+			},
 			"is_access_control_enabled": {
 				Type:     schema.TypeBool,
 				Optional: true,
@@ -624,6 +629,10 @@ func DatabaseAutonomousDatabaseResource() *schema.Resource {
 				Type:     schema.TypeInt,
 				Computed: true,
 			},
+			"in_memory_area_in_gbs": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
 			"infrastructure_type": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -1430,7 +1439,12 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) Update() error {
 		request.FreeformTags = tfresource.ObjectMapToStringMap(freeformTags.(map[string]interface{}))
 	}
 
-	if isAccessControlEnabled, ok := s.D.GetOkExists("is_access_control_enabled"); ok {
+	if inMemoryPercentage, ok := s.D.GetOkExists("in_memory_percentage"); ok {
+		tmp := inMemoryPercentage.(int)
+		request.InMemoryPercentage = &tmp
+	}
+
+	if isAccessControlEnabled, ok := s.D.GetOkExists("is_access_control_enabled"); ok && s.D.HasChange("is_access_control_enabled") {
 		tmp := isAccessControlEnabled.(bool)
 		request.IsAccessControlEnabled = &tmp
 	}
@@ -1752,6 +1766,14 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) SetData() error {
 
 	s.D.Set("freeform_tags", s.Res.FreeformTags)
 
+	if s.Res.InMemoryAreaInGBs != nil {
+		s.D.Set("in_memory_area_in_gbs", *s.Res.InMemoryAreaInGBs)
+	}
+
+	if s.Res.InMemoryPercentage != nil {
+		s.D.Set("in_memory_percentage", *s.Res.InMemoryPercentage)
+	}
+
 	s.D.Set("infrastructure_type", s.Res.InfrastructureType)
 
 	if s.Res.IsAccessControlEnabled != nil {
@@ -2413,6 +2435,10 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
 		if freeformTags, ok := s.D.GetOkExists("freeform_tags"); ok {
 			details.FreeformTags = tfresource.ObjectMapToStringMap(freeformTags.(map[string]interface{}))
 		}
+		if inMemoryPercentage, ok := s.D.GetOkExists("in_memory_percentage"); ok {
+			tmp := inMemoryPercentage.(int)
+			details.InMemoryPercentage = &tmp
+		}
 		if isAutoScalingEnabled, ok := s.D.GetOkExists("is_auto_scaling_enabled"); ok {
 			tmp := isAutoScalingEnabled.(bool)
 			details.IsAutoScalingEnabled = &tmp
@@ -2652,6 +2678,10 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
 		if freeformTags, ok := s.D.GetOkExists("freeform_tags"); ok {
 			details.FreeformTags = tfresource.ObjectMapToStringMap(freeformTags.(map[string]interface{}))
 		}
+		if inMemoryPercentage, ok := s.D.GetOkExists("in_memory_percentage"); ok {
+			tmp := inMemoryPercentage.(int)
+			details.InMemoryPercentage = &tmp
+		}
 		if isAutoScalingEnabled, ok := s.D.GetOkExists("is_auto_scaling_enabled"); ok {
 			tmp := isAutoScalingEnabled.(bool)
 			details.IsAutoScalingEnabled = &tmp
@@ -2880,6 +2910,10 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
 		if freeformTags, ok := s.D.GetOkExists("freeform_tags"); ok {
 			details.FreeformTags = tfresource.ObjectMapToStringMap(freeformTags.(map[string]interface{}))
 		}
+		if inMemoryPercentage, ok := s.D.GetOkExists("in_memory_percentage"); ok {
+			tmp := inMemoryPercentage.(int)
+			details.InMemoryPercentage = &tmp
+		}
 		if isAutoScalingEnabled, ok := s.D.GetOkExists("is_auto_scaling_enabled"); ok {
 			tmp := isAutoScalingEnabled.(bool)
 			details.IsAutoScalingEnabled = &tmp
@@ -3101,6 +3135,10 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
 		if freeformTags, ok := s.D.GetOkExists("freeform_tags"); ok {
 			details.FreeformTags = tfresource.ObjectMapToStringMap(freeformTags.(map[string]interface{}))
 		}
+		if inMemoryPercentage, ok := s.D.GetOkExists("in_memory_percentage"); ok {
+			tmp := inMemoryPercentage.(int)
+			details.InMemoryPercentage = &tmp
+		}
 		if isAccessControlEnabled, ok := s.D.GetOkExists("is_access_control_enabled"); ok {
 			tmp := isAccessControlEnabled.(bool)
 			details.IsAccessControlEnabled = &tmp
@@ -3309,6 +3347,10 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
 		if freeformTags, ok := s.D.GetOkExists("freeform_tags"); ok {
 			details.FreeformTags = tfresource.ObjectMapToStringMap(freeformTags.(map[string]interface{}))
 		}
+		if inMemoryPercentage, ok := s.D.GetOkExists("in_memory_percentage"); ok {
+			tmp := inMemoryPercentage.(int)
+			details.InMemoryPercentage = &tmp
+		}
 		if isAccessControlEnabled, ok := s.D.GetOkExists("is_access_control_enabled"); ok {
 			tmp := isAccessControlEnabled.(bool)
 			details.IsAccessControlEnabled = &tmp
@@ -3528,6 +3570,10 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
 		if freeformTags, ok := s.D.GetOkExists("freeform_tags"); ok {
 			details.FreeformTags = tfresource.ObjectMapToStringMap(freeformTags.(map[string]interface{}))
 		}
+		if inMemoryPercentage, ok := s.D.GetOkExists("in_memory_percentage"); ok {
+			tmp := inMemoryPercentage.(int)
+			details.InMemoryPercentage = &tmp
+		}
 		if isAccessControlEnabled, ok := s.D.GetOkExists("is_access_control_enabled"); ok {
 			tmp := isAccessControlEnabled.(bool)
 			details.IsAccessControlEnabled = &tmp
@@ -3751,6 +3797,10 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
 		if freeformTags, ok := s.D.GetOkExists("freeform_tags"); ok {
 			details.FreeformTags = tfresource.ObjectMapToStringMap(freeformTags.(map[string]interface{}))
 		}
+		if inMemoryPercentage, ok := s.D.GetOkExists("in_memory_percentage"); ok {
+			tmp := inMemoryPercentage.(int)
+			details.InMemoryPercentage = &tmp
+		}
 		if isAccessControlEnabled, ok := s.D.GetOkExists("is_access_control_enabled"); ok {
 			tmp := isAccessControlEnabled.(bool)
 			details.IsAccessControlEnabled = &tmp
diff --git a/internal/service/database/database_autonomous_databases_clones_data_source.go b/internal/service/database/database_autonomous_databases_clones_data_source.go
@@ -328,6 +328,14 @@ func DatabaseAutonomousDatabasesClonesDataSource() *schema.Resource {
 							Type:     schema.TypeString,
 							Computed: true,
 						},
+						"in_memory_area_in_gbs": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"in_memory_percentage": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
 						"infrastructure_type": {
 							Type:     schema.TypeString,
 							Computed: true,
@@ -979,6 +987,14 @@ func (s *DatabaseAutonomousDatabasesClonesDataSourceCrud) SetData() error {
 			autonomousDatabasesClone["id"] = *r.Id
 		}
 
+		if r.InMemoryAreaInGBs != nil {
+			autonomousDatabasesClone["in_memory_area_in_gbs"] = *r.InMemoryAreaInGBs
+		}
+
+		if r.InMemoryPercentage != nil {
+			autonomousDatabasesClone["in_memory_percentage"] = *r.InMemoryPercentage
+		}
+
 		autonomousDatabasesClone["infrastructure_type"] = r.InfrastructureType
 
 		if r.IsAccessControlEnabled != nil {
diff --git a/internal/service/database/database_autonomous_databases_data_source.go b/internal/service/database/database_autonomous_databases_data_source.go
@@ -284,6 +284,14 @@ func (s *DatabaseAutonomousDatabasesDataSourceCrud) SetData() error {
 			autonomousDatabase["id"] = *r.Id
 		}
 
+		if r.InMemoryAreaInGBs != nil {
+			autonomousDatabase["in_memory_area_in_gbs"] = *r.InMemoryAreaInGBs
+		}
+
+		if r.InMemoryPercentage != nil {
+			autonomousDatabase["in_memory_percentage"] = *r.InMemoryPercentage
+		}
+
 		autonomousDatabase["infrastructure_type"] = r.InfrastructureType
 
 		if r.IsAccessControlEnabled != nil {
diff --git a/website/docs/d/database_autonomous_database.html.markdown b/website/docs/d/database_autonomous_database.html.markdown
@@ -100,6 +100,8 @@ The following attributes are exported:
 * `failed_data_recovery_in_seconds` - Indicates the number of seconds of data loss for a Data Guard failover.
 * `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](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Autonomous Database.
+* `in_memory_area_in_gbs` - The area assigned to In-Memory tables in Autonomous Database.
+* `in_memory_percentage` - The percentage of the System Global Area(SGA) assigned to In-Memory tables in Autonomous Database.
 * `infrastructure_type` - The infrastructure type this resource belongs to.
 * `is_access_control_enabled` - Indicates if the database-level access control is enabled. If disabled, database access is defined by the network security rules. If enabled, database access is restricted to the IP addresses defined by the rules specified with the `whitelistedIps` property. While specifying `whitelistedIps` rules is optional, if database-level access control is enabled and no rules are specified, the database will become inaccessible. The rules can be added later using the `UpdateAutonomousDatabase` API operation or edit option in console. When creating a database clone, the desired access control setting should be specified. By default, database-level access control will be disabled for the clone.
 
diff --git a/website/docs/d/database_autonomous_databases.html.markdown b/website/docs/d/database_autonomous_databases.html.markdown
@@ -126,6 +126,8 @@ The following attributes are exported:
 * `failed_data_recovery_in_seconds` - Indicates the number of seconds of data loss for a Data Guard failover.
 * `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](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Autonomous Database.
+* `in_memory_area_in_gbs` - The area assigned to In-Memory tables in Autonomous Database.
+* `in_memory_percentage` - The percentage of the System Global Area(SGA) assigned to In-Memory tables in Autonomous Database.
 * `infrastructure_type` - The infrastructure type this resource belongs to.
 * `is_access_control_enabled` - Indicates if the database-level access control is enabled. If disabled, database access is defined by the network security rules. If enabled, database access is restricted to the IP addresses defined by the rules specified with the `whitelistedIps` property. While specifying `whitelistedIps` rules is optional, if database-level access control is enabled and no rules are specified, the database will become inaccessible. The rules can be added later using the `UpdateAutonomousDatabase` API operation or edit option in console. When creating a database clone, the desired access control setting should be specified. By default, database-level access control will be disabled for the clone.
 
diff --git a/website/docs/d/database_autonomous_databases_clones.html.markdown b/website/docs/d/database_autonomous_databases_clones.html.markdown
@@ -116,6 +116,8 @@ The following attributes are exported:
 * `failed_data_recovery_in_seconds` - Indicates the number of seconds of data loss for a Data Guard failover.
 * `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](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Autonomous Database.
+* `in_memory_area_in_gbs` - The area assigned to In-Memory tables in Autonomous Database.
+* `in_memory_percentage` - The percentage of the System Global Area(SGA) assigned to In-Memory tables in Autonomous Database.
 * `infrastructure_type` - The infrastructure type this resource belongs to.
 * `is_access_control_enabled` - Indicates if the database-level access control is enabled. If disabled, database access is defined by the network security rules. If enabled, database access is restricted to the IP addresses defined by the rules specified with the `whitelistedIps` property. While specifying `whitelistedIps` rules is optional, if database-level access control is enabled and no rules are specified, the database will become inaccessible. The rules can be added later using the `UpdateAutonomousDatabase` API operation or edit option in console. When creating a database clone, the desired access control setting should be specified. By default, database-level access control will be disabled for the clone.
 
diff --git a/website/docs/r/database_autonomous_database.html.markdown b/website/docs/r/database_autonomous_database.html.markdown

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ var (`
`46`	`46`	`"maintenance_window_details": acctest.RepresentationGroup{RepType: acctest.Optional, Group: DatabaseAutonomousContainerDatabaseMaintenanceWindowDetailsRepresentation},`
`47`	`47`	"service_level_agreement_type": acctest.Representation{RepType: acctest.Optional, Create: `STANDARD`},
`48`	`48`	"db_name": acctest.Representation{RepType: acctest.Optional, Create: `DBNAME`},
`49`		- "db_version": acctest.Representation{RepType: acctest.Required, Create: `19.18.0.1.0`},
	`49`	+ "db_version": acctest.Representation{RepType: acctest.Required, Create: `19.20.0.1.0`},
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`ACDatabaseBackupConfigRepresentation = map[string]interface{}{`