Added - Support for Datalake/Lakehouse Feature for MySQL HeatWave

Author: Terraform Team Automation

examples/mysql/heat_wave_cluster/main.tf

@@ -76,6 +76,9 @@ resource "oci_mysql_heat_wave_cluster" "test_heat_wave_cluster" {
   db_system_id = oci_mysql_mysql_db_system.test_mysql_db_system.id
   cluster_size = "2"
   shape_name   = "MySQL.HeatWave.VM.Standard.E3"
+
+  # Optional
+  is_lakehouse_enabled = true
 }
 
 data "oci_mysql_mysql_configurations" "test_mysql_configurations" {

internal/integrationtest/mysql_heat_wave_cluster_test.go

@@ -25,25 +25,25 @@ import (
 )
 
 var (
-	MysqlHeatWaveClusterRequiredOnlyResource = MysqlHeatWaveClusterResourceDependencies +
-		acctest.GenerateResourceFromRepresentationMap("oci_mysql_heat_wave_cluster", "test_heat_wave_cluster", acctest.Required, acctest.Create, MysqlHeatWaveClusterRepresentation)
+	MysqlHeatWaveClusterRequiredOnlyResource = MysqlHeatWaveWarehouseClusterResourceDependencies +
+		acctest.GenerateResourceFromRepresentationMap("oci_mysql_heat_wave_cluster", "test_heat_wave_cluster", acctest.Required, acctest.Create, MysqlHeatWaveLakehouseClusterRepresentation)
 
-	MysqlHeatWaveClusterResourceConfig = MysqlHeatWaveClusterResourceDependencies +
-		acctest.GenerateResourceFromRepresentationMap("oci_mysql_heat_wave_cluster", "test_heat_wave_cluster", acctest.Optional, acctest.Update, MysqlHeatWaveClusterRepresentation)
+	MysqlHeatWaveClusterResourceConfig = MysqlHeatWaveWarehouseClusterResourceDependencies +
+		acctest.GenerateResourceFromRepresentationMap("oci_mysql_heat_wave_cluster", "test_heat_wave_cluster", acctest.Optional, acctest.Update, MysqlHeatWaveWarehouseClusterRepresentation)
 
 	MysqlMysqlHeatWaveClusterSingularDataSourceRepresentation = map[string]interface{}{
 		"db_system_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_mysql_mysql_db_system.test_mysql_db_system.id}`},
 	}
 
-	mysqlDbSystemHeatWaveRepresentation = map[string]interface{}{
+	MysqlDbSystemHeatWaveRepresentation = map[string]interface{}{
 		"admin_password":          acctest.Representation{RepType: acctest.Required, Create: `BEstrO0ng_#11`},
 		"admin_username":          acctest.Representation{RepType: acctest.Required, Create: `adminUser`},
 		"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}`},
 		"configuration_id":        acctest.Representation{RepType: acctest.Optional, Create: `${var.MysqlConfigurationOCID[var.region]}`},
 		"shape_name":              acctest.Representation{RepType: acctest.Required, Create: `MySQL.VM.Standard.E3.1.8GB`},
 		"subnet_id":               acctest.Representation{RepType: acctest.Required, Create: `${oci_core_subnet.test_subnet.id}`},
-		"backup_policy":           acctest.RepresentationGroup{RepType: acctest.Optional, Group: MysqlMysqlDbSystemBackupPolicyRepresentation},
+		"backup_policy":           acctest.RepresentationGroup{RepType: acctest.Required, Group: MysqlDbSystemHeatWaveBackupPolicyRepresentation},
 		"data_storage_size_in_gb": acctest.Representation{RepType: acctest.Required, Create: `50`},
 		"defined_tags":            acctest.Representation{RepType: acctest.Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`},
 		"description":             acctest.Representation{RepType: acctest.Optional, Create: `MySQL Database Service`},
@@ -57,19 +57,49 @@ var (
 		"port_x":                  acctest.Representation{RepType: acctest.Optional, Create: `33306`},
 	}
 
-	MysqlHeatWaveClusterRepresentation = map[string]interface{}{
-		"db_system_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_mysql_mysql_db_system.test_mysql_db_system.id}`},
-		"cluster_size": acctest.Representation{RepType: acctest.Required, Create: `2`, Update: `3`},
-		"shape_name":   acctest.Representation{RepType: acctest.Required, Create: `MySQL.VM.Standard.E3.1.8GB`},
-		"state":        acctest.Representation{RepType: acctest.Optional, Create: `INACTIVE`, Update: `ACTIVE`}, // testing stop & start actions
+	MysqlDbSystemHeatWaveBackupPolicyRepresentation = map[string]interface{}{
+		"defined_tags":      acctest.Representation{RepType: acctest.Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`},
+		"freeform_tags":     acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"Department": "Finance"}},
+		"is_enabled":        acctest.Representation{RepType: acctest.Optional, Create: `false`},
+		"pitr_policy":       acctest.RepresentationGroup{RepType: acctest.Required, Group: MysqlDbSystemHeatWavePitrPolicyRepresentation},
+		"retention_in_days": acctest.Representation{RepType: acctest.Optional, Create: `10`},
+		"window_start_time": acctest.Representation{RepType: acctest.Optional, Create: `01:00-00:00`},
+	}
+
+	// Lakehouse tests: Create - Warehouse tests: Update
+	MysqlDbSystemHeatWavePitrPolicyRepresentation = map[string]interface{}{
+		"is_enabled": acctest.Representation{RepType: acctest.Required, Create: `false`, Update: `true`},
+	}
+
+	MysqlHeatWaveLakehouseClusterRepresentation = map[string]interface{}{
+		"db_system_id":         acctest.Representation{RepType: acctest.Required, Create: `${oci_mysql_mysql_db_system.test_mysql_db_system.id}`},
+		"cluster_size":         acctest.Representation{RepType: acctest.Required, Create: `2`},
+		"shape_name":           acctest.Representation{RepType: acctest.Required, Create: `MySQL.VM.Standard.E3.1.8GB`},
+		"state":                acctest.Representation{RepType: acctest.Required, Create: `ACTIVE`},
+		"is_lakehouse_enabled": acctest.Representation{RepType: acctest.Required, Create: `true`, Update: `false`},
 	}
 
-	MysqlHeatWaveClusterResourceDependencies = MysqlMysqlConfigurationResourceConfig +
+	MysqlHeatWaveWarehouseClusterRepresentation = map[string]interface{}{
+		"db_system_id":         acctest.Representation{RepType: acctest.Required, Create: `${oci_mysql_mysql_db_system.test_mysql_db_system.id}`},
+		"cluster_size":         acctest.Representation{RepType: acctest.Required, Create: `2`, Update: `3`},
+		"shape_name":           acctest.Representation{RepType: acctest.Required, Create: `MySQL.VM.Standard.E3.1.8GB`},
+		"state":                acctest.Representation{RepType: acctest.Required, Create: `INACTIVE`, Update: `ACTIVE`}, // testing stop & start actions
+		"is_lakehouse_enabled": acctest.Representation{RepType: acctest.Required, Create: `false`, Update: `false`},
+	}
+
+	MysqlHeatWaveClusterResourceDependenciesBase = MysqlMysqlConfigurationResourceConfig +
 		acctest.GenerateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", acctest.Required, acctest.Create, CoreSubnetRepresentation) +
 		acctest.GenerateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", acctest.Required, acctest.Create, CoreVcnRepresentation) +
 		AvailabilityDomainConfig +
-		acctest.GenerateDataSourceFromRepresentationMap("oci_mysql_shapes", "test_shapes", acctest.Required, acctest.Create, MysqlMysqlShapeDataSourceRepresentation) +
-		acctest.GenerateResourceFromRepresentationMap("oci_mysql_mysql_db_system", "test_mysql_db_system", acctest.Required, acctest.Create, mysqlDbSystemHeatWaveRepresentation)
+		acctest.GenerateDataSourceFromRepresentationMap("oci_mysql_shapes", "test_shapes", acctest.Required, acctest.Create, MysqlMysqlShapeDataSourceRepresentation)
+
+	// DbSystem with PITR disabled
+	MysqlHeatWaveLakehouseClusterResourceDependencies = MysqlHeatWaveClusterResourceDependenciesBase +
+		acctest.GenerateResourceFromRepresentationMap("oci_mysql_mysql_db_system", "test_mysql_db_system", acctest.Required, acctest.Create, MysqlDbSystemHeatWaveRepresentation)
+
+	// DbSystem with PITR enabled
+	MysqlHeatWaveWarehouseClusterResourceDependencies = MysqlHeatWaveClusterResourceDependenciesBase +
+		acctest.GenerateResourceFromRepresentationMap("oci_mysql_mysql_db_system", "test_mysql_db_system", acctest.Required, acctest.Update, MysqlDbSystemHeatWaveRepresentation)
 )
 
 // issue-routing-tag: mysql/default
@@ -91,10 +121,18 @@ func TestMysqlHeatWaveClusterResource_basic(t *testing.T) {
 	acctest.ResourceTest(t, testAccCheckMysqlHeatWaveClusterDestroy, []resource.TestStep{
 		// verify Create
 		{
-			Config: config + compartmentIdVariableStr + MysqlHeatWaveClusterResourceDependencies +
-				acctest.GenerateResourceFromRepresentationMap("oci_mysql_heat_wave_cluster", "test_heat_wave_cluster", acctest.Required, acctest.Create, MysqlHeatWaveClusterRepresentation),
+			Config: config + compartmentIdVariableStr + MysqlHeatWaveLakehouseClusterResourceDependencies +
+				acctest.GenerateResourceFromRepresentationMap("oci_mysql_heat_wave_cluster", "test_heat_wave_cluster", acctest.Required, acctest.Create, MysqlHeatWaveLakehouseClusterRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(resourceName, "cluster_nodes.#", "2"),
+				resource.TestCheckResourceAttr(resourceName, "cluster_size", "2"),
+				resource.TestCheckResourceAttr(resourceName, "shape_name", "MySQL.VM.Standard.E3.1.8GB"),
+				resource.TestCheckResourceAttr(resourceName, "state", "ACTIVE"),
+				resource.TestCheckResourceAttr(resourceName, "is_lakehouse_enabled", "true"),
+
 				resource.TestCheckResourceAttrSet(resourceName, "db_system_id"),
+				resource.TestCheckResourceAttrSet(resourceName, "time_created"),
+				resource.TestCheckResourceAttrSet(resourceName, "time_updated"),
 
 				func(s *terraform.State) (err error) {
 					resId, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -103,19 +141,49 @@ func TestMysqlHeatWaveClusterResource_basic(t *testing.T) {
 			),
 		},
 
-		// delete before next Create
+		// Verify update enable Lakehouse
+		{
+			Config: config + compartmentIdVariableStr + MysqlHeatWaveLakehouseClusterResourceDependencies +
+				acctest.GenerateResourceFromRepresentationMap("oci_mysql_heat_wave_cluster", "test_heat_wave_cluster", acctest.Required, acctest.Update, MysqlHeatWaveLakehouseClusterRepresentation),
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(resourceName, "cluster_nodes.#", "2"),
+				resource.TestCheckResourceAttr(resourceName, "cluster_size", "2"),
+				resource.TestCheckResourceAttr(resourceName, "shape_name", "MySQL.VM.Standard.E3.1.8GB"),
+				resource.TestCheckResourceAttr(resourceName, "state", "ACTIVE"),
+				resource.TestCheckResourceAttr(resourceName, "is_lakehouse_enabled", "false"),
+
+				resource.TestCheckResourceAttrSet(resourceName, "db_system_id"),
+				resource.TestCheckResourceAttrSet(resourceName, "time_created"),
+				resource.TestCheckResourceAttrSet(resourceName, "time_updated"),
+
+				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
+				},
+			),
+		},
+
+		// deleting Lakehouse cluster before creating Warehouse cluster
+		{
+			Config: config + compartmentIdVariableStr + MysqlHeatWaveLakehouseClusterResourceDependencies,
+		},
+		// Update DbSystem to enable PITR policies
 		{
-			Config: config + compartmentIdVariableStr + MysqlHeatWaveClusterResourceDependencies,
+			Config: config + compartmentIdVariableStr + MysqlHeatWaveWarehouseClusterResourceDependencies,
 		},
 		// verify Create & stop
 		{
-			Config: config + compartmentIdVariableStr + MysqlHeatWaveClusterResourceDependencies +
-				acctest.GenerateResourceFromRepresentationMap("oci_mysql_heat_wave_cluster", "test_heat_wave_cluster", acctest.Optional, acctest.Create, MysqlHeatWaveClusterRepresentation),
+			Config: config + compartmentIdVariableStr + MysqlHeatWaveWarehouseClusterResourceDependencies +
+				acctest.GenerateResourceFromRepresentationMap("oci_mysql_heat_wave_cluster", "test_heat_wave_cluster", acctest.Optional, acctest.Create, MysqlHeatWaveWarehouseClusterRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttr(resourceName, "cluster_nodes.#", "2"),
 				resource.TestCheckResourceAttr(resourceName, "cluster_size", "2"),
 				resource.TestCheckResourceAttr(resourceName, "shape_name", "MySQL.VM.Standard.E3.1.8GB"),
 				resource.TestCheckResourceAttr(resourceName, "state", "INACTIVE"),
+				resource.TestCheckResourceAttr(resourceName, "is_lakehouse_enabled", "false"),
 
 				resource.TestCheckResourceAttrSet(resourceName, "db_system_id"),
 				resource.TestCheckResourceAttrSet(resourceName, "time_created"),
@@ -135,13 +203,14 @@ func TestMysqlHeatWaveClusterResource_basic(t *testing.T) {
 
 		// verify start & updates to updatable parameters
 		{
-			Config: config + compartmentIdVariableStr + MysqlHeatWaveClusterResourceDependencies +
-				acctest.GenerateResourceFromRepresentationMap("oci_mysql_heat_wave_cluster", "test_heat_wave_cluster", acctest.Optional, acctest.Update, MysqlHeatWaveClusterRepresentation),
+			Config: config + compartmentIdVariableStr + MysqlHeatWaveWarehouseClusterResourceDependencies +
+				acctest.GenerateResourceFromRepresentationMap("oci_mysql_heat_wave_cluster", "test_heat_wave_cluster", acctest.Optional, acctest.Update, MysqlHeatWaveWarehouseClusterRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttr(resourceName, "cluster_nodes.#", "3"),
 				resource.TestCheckResourceAttr(resourceName, "cluster_size", "3"),
 				resource.TestCheckResourceAttr(resourceName, "shape_name", "MySQL.VM.Standard.E3.1.8GB"),
 				resource.TestCheckResourceAttr(resourceName, "state", "ACTIVE"),
+				resource.TestCheckResourceAttr(resourceName, "is_lakehouse_enabled", "false"),
 
 				resource.TestCheckResourceAttrSet(resourceName, "db_system_id"),
 				resource.TestCheckResourceAttrSet(resourceName, "time_created"),
@@ -167,6 +236,7 @@ func TestMysqlHeatWaveClusterResource_basic(t *testing.T) {
 
 				resource.TestCheckResourceAttr(singularDatasourceName, "cluster_nodes.#", "3"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "cluster_size", "3"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "is_lakehouse_enabled", "false"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "shape_name", "MySQL.VM.Standard.E3.1.8GB"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "state", "ACTIVE"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),

internal/service/mysql/mysql_heat_wave_cluster_data_source.go

@@ -76,6 +76,10 @@ func (s *MysqlHeatWaveClusterDataSourceCrud) SetData() error {
 		s.D.Set("cluster_size", *s.Res.ClusterSize)
 	}
 
+	if s.Res.IsLakehouseEnabled != nil {
+		s.D.Set("is_lakehouse_enabled", *s.Res.IsLakehouseEnabled)
+	}
+
 	if s.Res.LifecycleDetails != nil {
 		s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
 	}

internal/service/mysql/mysql_heat_wave_cluster_resource.go

@@ -45,6 +45,11 @@ func MysqlHeatWaveClusterResource() *schema.Resource {
 				Type:     schema.TypeInt,
 				Required: true,
 			},
+			"is_lakehouse_enabled": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Computed: true,
+			},
 			"shape_name": {
 				Type:     schema.TypeString,
 				Required: true,
@@ -252,6 +257,11 @@ func (s *MysqlHeatWaveClusterResourceCrud) Create() error {
 		request.DbSystemId = &tmp
 	}
 
+	if isLakehouseEnabled, ok := s.D.GetOkExists("is_lakehouse_enabled"); ok {
+		tmp := isLakehouseEnabled.(bool)
+		request.IsLakehouseEnabled = &tmp
+	}
+
 	if shapeName, ok := s.D.GetOkExists("shape_name"); ok {
 		tmp := shapeName.(string)
 		request.ShapeName = &tmp
@@ -307,6 +317,11 @@ func (s *MysqlHeatWaveClusterResourceCrud) Update() error {
 		request.DbSystemId = &tmp
 	}
 
+	if isLakehouseEnabled, ok := s.D.GetOkExists("is_lakehouse_enabled"); ok {
+		tmp := isLakehouseEnabled.(bool)
+		request.IsLakehouseEnabled = &tmp
+	}
+
 	if shapeName, ok := s.D.GetOkExists("shape_name"); ok {
 		tmp := shapeName.(string)
 		request.ShapeName = &tmp
@@ -359,6 +374,10 @@ func (s *MysqlHeatWaveClusterResourceCrud) SetData() error {
 		s.D.Set("db_system_id", *s.Res.DbSystemId)
 	}
 
+	if s.Res.IsLakehouseEnabled != nil {
+		s.D.Set("is_lakehouse_enabled", *s.Res.IsLakehouseEnabled)
+	}
+
 	if s.Res.LifecycleDetails != nil {
 		s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
 	}

internal/service/mysql/mysql_mysql_db_system_resource.go

@@ -645,6 +645,10 @@ func MysqlMysqlDbSystemResource() *schema.Resource {
 							Type:     schema.TypeInt,
 							Computed: true,
 						},
+						"is_lakehouse_enabled": {
+							Type:     schema.TypeBool,
+							Computed: true,
+						},
 						"shape_name": {
 							Type:     schema.TypeString,
 							Computed: true,
@@ -1806,6 +1810,10 @@ func HeatWaveClusterSummaryToMap(obj *oci_mysql.HeatWaveClusterSummary) map[stri
 		result["cluster_size"] = int(*obj.ClusterSize)
 	}
 
+	if obj.IsLakehouseEnabled != nil {
+		result["is_lakehouse_enabled"] = bool(*obj.IsLakehouseEnabled)
+	}
+
 	if obj.ShapeName != nil {
 		result["shape_name"] = string(*obj.ShapeName)
 	}

website/docs/d/mysql_heat_wave_cluster.html.markdown

@@ -39,6 +39,7 @@ The following attributes are exported:
 	* `time_updated` - The date and time the MySQL HeatWave node was updated, as described by [RFC 3339](https://tools.ietf.org/rfc/rfc3339). 
 * `cluster_size` - The number of analytics-processing compute instances, of the specified shape, in the HeatWave cluster. 
 * `db_system_id` - The OCID of the parent DB System this HeatWave cluster is attached to.
+* `is_lakehouse_enabled` - Lakehouse enabled status for the HeatWave cluster.
 * `lifecycle_details` - Additional information about the current lifecycleState.
 * `shape_name` - The shape determines resources to allocate to the HeatWave nodes - CPU cores, memory. 
 * `state` - The current state of the HeatWave cluster.

website/docs/d/mysql_mysql_db_system.html.markdown

@@ -137,6 +137,7 @@ The following attributes are exported:
 * `freeform_tags` - Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{"bar-key": "value"}` 
 * `heat_wave_cluster` - A summary of a HeatWave cluster. 
 	* `cluster_size` - The number of analytics-processing compute instances, of the specified shape, in the HeatWave cluster. 
+	* `is_lakehouse_enabled` - Lakehouse enabled status for the HeatWave cluster.
 	* `shape_name` - The shape determines resources to allocate to the HeatWave nodes - CPU cores, memory. 
 	* `state` - The current state of the MySQL HeatWave cluster.
 	* `time_created` - The date and time the HeatWave cluster was created, as described by [RFC 3339](https://tools.ietf.org/rfc/rfc3339). 

website/docs/d/mysql_mysql_db_systems.html.markdown

@@ -161,6 +161,7 @@ The following attributes are exported:
 * `freeform_tags` - Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{"bar-key": "value"}` 
 * `heat_wave_cluster` - A summary of a HeatWave cluster. 
 	* `cluster_size` - The number of analytics-processing compute instances, of the specified shape, in the HeatWave cluster. 
+	* `is_lakehouse_enabled` - Lakehouse enabled status for the HeatWave cluster.
 	* `shape_name` - The shape determines resources to allocate to the HeatWave nodes - CPU cores, memory. 
 	* `state` - The current state of the MySQL HeatWave cluster.
 	* `time_created` - The date and time the HeatWave cluster was created, as described by [RFC 3339](https://tools.ietf.org/rfc/rfc3339).