Added - Support for HeatWave MySQL Service: Extra Configuration Parameters, System Tags

Author: cdomond-at-oracle

examples/mysql/configuration/main.tf

@@ -0,0 +1,90 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+
+variable "tenancy_ocid" {
+}
+
+variable "user_ocid" {
+}
+
+variable "fingerprint" {
+}
+
+variable "private_key_path" {
+}
+
+variable "region" {
+  // Define the region where destination backup will be created.
+}
+
+variable "compartment_ocid" {
+}
+
+provider "oci" {
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+  region           = var.region
+}
+
+resource "oci_mysql_mysql_configuration" "test_mysql_configuration" {
+  #Required
+  compartment_id = var.compartment_ocid
+  shape_name = "MySQL.VM.Standard.E3.1.8GB"
+
+  #Optional
+  description = "test configuration created by terraform"
+  display_name = "terraform test configuration"
+  parent_configuration_id = data.oci_mysql_mysql_configurations.test_mysql_configurations.configurations[0].id
+  variables {
+    #Optional
+    block_encryption_mode                   = "aes-128-ecb"
+    binlog_group_commit_sync_delay          = 10
+    binlog_group_commit_sync_no_delay_count = 10
+    replica_net_timeout                     = 60
+    require_secure_transport                = false
+    local_infile                            = true
+    thread_pool_query_threads_per_group     = 10
+    thread_pool_transaction_delay           = 10
+    innodb_redo_log_capacity                = 104857600
+    explain_format                          = "TRADITIONAL"
+    explicit_defaults_for_timestamp         = true
+    sql_generate_invisible_primary_key      = false
+    temptable_max_ram                       = 1073741824
+    innodb_change_buffering                 = "NONE"
+    innodb_adaptive_hash_index              = true
+    innodb_undo_log_truncate                = true
+    table_definition_cache                  = 400
+    table_open_cache                        = 4000
+    relay_log_space_limit                   = 10
+    optimizer_switch                        = "batched_key_access=off"
+    replica_type_conversions                = "ALL_LOSSY"
+    replica_parallel_workers                = 10
+    auto_increment_increment                = 10
+    auto_increment_offset                   = 10
+    skip_name_resolve                       = false
+    max_user_connections                    = 10
+    join_buffer_size                        = 262144
+    max_seeks_for_key                       = 10
+    range_optimizer_max_mem_size            = 8388608
+    innodb_autoinc_lock_mode                = 2
+    innodb_rollback_on_timeout              = false
+    innodb_online_alter_log_max_size        = 134217728
+    innodb_sort_buffer_size                 = 1048576
+    thread_pool_size                        = 16
+    innodb_numa_interleave                  = false
+    long_query_time                         = 10
+  }
+}
+
+data "oci_mysql_mysql_configurations" "test_mysql_configurations" {
+  compartment_id = var.compartment_ocid
+
+  #Optional
+  state        = "ACTIVE"
+  shape_name   = "MySQL.VM.Standard.E3.1.8GB"
+}
+
+data "oci_identity_availability_domains" "test_availability_domains" {
+  compartment_id = var.tenancy_ocid
+}

internal/integrationtest/mysql_channel_test.go

@@ -261,7 +261,6 @@ func TestMysqlChannelResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(datasourceName, "db_system_id"),
 				resource.TestCheckResourceAttr(datasourceName, "display_name", "displayName2"),
 				resource.TestCheckResourceAttr(datasourceName, "is_enabled", "false"),
-
 				resource.TestCheckResourceAttr(datasourceName, "channels.#", "1"),
 				resource.TestCheckResourceAttr(datasourceName, "channels.0.compartment_id", compartmentId),
 				resource.TestCheckResourceAttr(datasourceName, "channels.0.display_name", "displayName2"),
@@ -300,7 +299,6 @@ func TestMysqlChannelResource_basic(t *testing.T) {
 				compartmentIdVariableStr + ChannelUpdateResource,
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "channel_id"),
-
 				resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
 				resource.TestCheckResourceAttr(singularDatasourceName, "description", "description2"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "display_name", "displayName2"),

internal/integrationtest/mysql_mysql_configuration_test.go

@@ -320,7 +320,6 @@ func TestMysqlMysqlDbSystemResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(datasourceName, "is_heat_wave_cluster_attached", "false"),
 				resource.TestCheckResourceAttr(datasourceName, "is_up_to_date", "false"),
 				resource.TestCheckResourceAttr(datasourceName, "state", "ACTIVE"),
-
 				resource.TestCheckResourceAttr(datasourceName, "db_systems.#", "1"),
 				resource.TestCheckResourceAttr(datasourceName, "db_systems.0.access_mode", "UNRESTRICTED"),
 				resource.TestCheckResourceAttrSet(datasourceName, "db_systems.0.availability_domain"),
@@ -361,7 +360,6 @@ func TestMysqlMysqlDbSystemResource_basic(t *testing.T) {
 				acctest.GenerateResourceFromRepresentationMap("oci_mysql_channel", "test_channel", acctest.Required, acctest.Create, MysqlChannelRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "db_system_id"),
-
 				resource.TestCheckResourceAttr(singularDatasourceName, "access_mode", "UNRESTRICTED"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "availability_domain"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "backup_policy.#", "1"),

internal/integrationtest/mysql_mysql_db_system_test.go

@@ -104,6 +104,10 @@ func (s *MysqlChannelDataSourceCrud) SetData() error {
 
 	s.D.Set("state", s.Res.LifecycleState)
 
+	if s.Res.SystemTags != nil {
+		s.D.Set("system_tags", tfresource.SystemTagsToMap(s.Res.SystemTags))
+	}
+
 	if s.Res.Target != nil {
 		targetArray := []interface{}{}
 		if targetMap := ChannelTargetToMap(&s.Res.Target); targetMap != nil {

internal/service/mysql/mysql_channel_data_source.go

@@ -267,6 +267,11 @@ func MysqlChannelResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"system_tags": {
+				Type:     schema.TypeMap,
+				Computed: true,
+				Elem:     schema.TypeString,
+			},
 			"time_created": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -568,6 +573,10 @@ func (s *MysqlChannelResourceCrud) SetData() error {
 
 	s.D.Set("state", s.Res.LifecycleState)
 
+	if s.Res.SystemTags != nil {
+		s.D.Set("system_tags", tfresource.SystemTagsToMap(s.Res.SystemTags))
+	}
+
 	if s.Res.Target != nil {
 		targetArray := []interface{}{}
 		if targetMap := ChannelTargetToMap(&s.Res.Target); targetMap != nil {

internal/service/mysql/mysql_channel_resource.go

@@ -171,6 +171,10 @@ func (s *MysqlChannelsDataSourceCrud) SetData() error {
 
 		mysqlChannel["state"] = r.LifecycleState
 
+		if r.SystemTags != nil {
+			mysqlChannel["system_tags"] = tfresource.SystemTagsToMap(r.SystemTags)
+		}
+
 		if r.Target != nil {
 			targetArray := []interface{}{}
 			if targetMap := ChannelTargetToMap(&r.Target); targetMap != nil {

internal/service/mysql/mysql_channels_data_source.go

@@ -132,6 +132,10 @@ func (s *MysqlMysqlBackupDataSourceCrud) SetData() error {
 
 	s.D.Set("state", s.Res.LifecycleState)
 
+	if s.Res.SystemTags != nil {
+		s.D.Set("system_tags", tfresource.SystemTagsToMap(s.Res.SystemTags))
+	}
+
 	if s.Res.TimeCopyCreated != nil {
 		s.D.Set("time_copy_created", s.Res.TimeCopyCreated.String())
 	}

internal/service/mysql/mysql_mysql_backup_data_source.go

@@ -501,6 +501,11 @@ func MysqlMysqlBackupResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"system_tags": {
+				Type:     schema.TypeMap,
+				Computed: true,
+				Elem:     schema.TypeString,
+			},
 			"time_copy_created": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -877,6 +882,10 @@ func (s *MysqlMysqlBackupResourceCrud) SetData() error {
 
 	s.D.Set("state", s.Res.LifecycleState)
 
+	if s.Res.SystemTags != nil {
+		s.D.Set("system_tags", tfresource.SystemTagsToMap(s.Res.SystemTags))
+	}
+
 	if s.Res.TimeCopyCreated != nil {
 		s.D.Set("time_copy_created", s.Res.TimeCopyCreated.String())
 	}

internal/service/mysql/mysql_mysql_backup_resource.go

@@ -198,6 +198,10 @@ func (s *MysqlMysqlBackupsDataSourceCrud) SetData() error {
 
 		mysqlBackup["state"] = r.LifecycleState
 
+		if r.SystemTags != nil {
+			mysqlBackup["system_tags"] = tfresource.SystemTagsToMap(r.SystemTags)
+		}
+
 		if r.TimeCopyCreated != nil {
 			mysqlBackup["time_copy_created"] = r.TimeCopyCreated.String()
 		}