Added - Support for Automatic Primary Key Handling and Delayed Replication in MDS Channels

Author: Terraform Team Automation

examples/mysql/channel/main.tf

@@ -37,6 +37,18 @@ resource "oci_core_vcn" "test_vcn" {
   compartment_id = var.compartment_ocid
 }
 
+data "oci_mysql_mysql_configurations" "test_mysql_configurations" {
+  compartment_id = var.compartment_ocid
+
+  #Optional
+  state        = "ACTIVE"
+  shape_name   = "VM.Standard.E2.4"
+}
+
+data "oci_identity_availability_domains" "test_availability_domains" {
+  compartment_id = var.tenancy_ocid
+}
+
 resource "oci_mysql_mysql_db_system" "test_mysql_db_system" {
   #Required
   admin_password      = "BEstrO0ng_#11"
@@ -73,26 +85,6 @@ resource "oci_mysql_mysql_db_system" "test_mysql_db_system" {
 
 }
 
-data "oci_mysql_mysql_configurations" "test_mysql_configurations" {
-  compartment_id = var.compartment_ocid
-
-  #Optional
-  state        = "ACTIVE"
-  shape_name   = "VM.Standard.E2.4"
-}
-
-data "oci_mysql_shapes" "test_shapes" {
-  compartment_id = var.compartment_ocid
-}
-
-data "oci_identity_availability_domains" "test_availability_domains" {
-  compartment_id = var.tenancy_ocid
-}
-
-output "configuration_id" {
-  value = data.oci_mysql_mysql_configurations.test_mysql_configurations.configurations[0].id
-}
-
 resource "oci_mysql_channel" "test_channel" {
   #Required
   source {
@@ -122,6 +114,8 @@ resource "oci_mysql_channel" "test_channel" {
       type = "REPLICATE_DO_DB"
       value = "value"
     }
+    delay_in_seconds = "60"
+    tables_without_primary_key_handling = "GENERATE_IMPLICIT_PRIMARY_KEY"
   }
 }
 
@@ -139,6 +133,6 @@ data "oci_mysql_channel" "test_channel" {
   channel_id   = oci_mysql_channel.test_channel.id
 }
 
-//data "oci_mysql_mysql_db_system" "test_mysql_db_system" {
-//  db_system_id = oci_mysql_mysql_db_system.test_mysql_backup_db_system.id
-//}
+output "channel_id" {
+  value = data.oci_mysql_channel.test_channel.id
+}

internal/integrationtest/mysql_channel_test.go

@@ -184,6 +184,11 @@ func MysqlChannelResource() *schema.Resource {
 							Optional: true,
 							Computed: true,
 						},
+						"delay_in_seconds": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
 						"filters": {
 							Type:     schema.TypeList,
 							Optional: true,
@@ -206,6 +211,11 @@ func MysqlChannelResource() *schema.Resource {
 								},
 							},
 						},
+						"tables_without_primary_key_handling": {
+							Type:     schema.TypeString,
+							Optional: true,
+							Computed: true,
+						},
 
 						// Computed
 					},
@@ -879,6 +889,10 @@ func (s *MysqlChannelResourceCrud) mapToCreateChannelTargetDetails(fieldKeyForma
 			tmp := channelName.(string)
 			details.ChannelName = &tmp
 		}
+		if delayInSeconds, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "delay_in_seconds")); ok {
+			tmp := delayInSeconds.(int)
+			details.DelayInSeconds = &tmp
+		}
 		if dbSystemId, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "db_system_id")); ok {
 			tmp := dbSystemId.(string)
 			details.DbSystemId = &tmp
@@ -899,6 +913,9 @@ func (s *MysqlChannelResourceCrud) mapToCreateChannelTargetDetails(fieldKeyForma
 				details.Filters = tmp
 			}
 		}
+		if tablesWithoutPrimaryKeyHandling, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "tables_without_primary_key_handling")); ok {
+			details.TablesWithoutPrimaryKeyHandling = oci_mysql.ChannelTargetDbSystemTablesWithoutPrimaryKeyHandlingEnum(tablesWithoutPrimaryKeyHandling.(string))
+		}
 		baseObject = details
 	default:
 		return nil, fmt.Errorf("unknown target_type '%v' was specified", targetType)
@@ -927,6 +944,10 @@ func (s *MysqlChannelResourceCrud) mapToUpdateChannelTargetDetails(fieldKeyForma
 			tmp := channelName.(string)
 			details.ChannelName = &tmp
 		}
+		if delayInSeconds, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "delay_in_seconds")); ok {
+			tmp := delayInSeconds.(int)
+			details.DelayInSeconds = &tmp
+		}
 		if filters, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "filters")); ok {
 			interfaces := filters.([]interface{})
 			tmp := make([]oci_mysql.ChannelFilter, len(interfaces))
@@ -943,6 +964,9 @@ func (s *MysqlChannelResourceCrud) mapToUpdateChannelTargetDetails(fieldKeyForma
 				details.Filters = tmp
 			}
 		}
+		if tablesWithoutPrimaryKeyHandling, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "tables_without_primary_key_handling")); ok {
+			details.TablesWithoutPrimaryKeyHandling = oci_mysql.ChannelTargetDbSystemTablesWithoutPrimaryKeyHandlingEnum(tablesWithoutPrimaryKeyHandling.(string))
+		}
 		baseObject = details
 	default:
 		return nil, fmt.Errorf("unknown target_type '%v' was specified", targetType)

internal/service/mysql/mysql_channel_resource.go

@@ -519,6 +519,10 @@ func MysqlMysqlDbSystemResource() *schema.Resource {
 										Type:     schema.TypeString,
 										Computed: true,
 									},
+									"delay_in_seconds": {
+										Type:     schema.TypeInt,
+										Computed: true,
+									},
 									"filters": {
 										Type:     schema.TypeList,
 										Computed: true,
@@ -540,6 +544,10 @@ func MysqlMysqlDbSystemResource() *schema.Resource {
 											},
 										},
 									},
+									"tables_without_primary_key_handling": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
 									"target_type": {
 										Type:     schema.TypeString,
 										Computed: true,
@@ -1590,11 +1598,17 @@ func ChannelTargetToMap(obj *oci_mysql.ChannelTarget) map[string]interface{} {
 			result["db_system_id"] = string(*v.DbSystemId)
 		}
 
+		if v.DelayInSeconds != nil {
+			result["delay_in_seconds"] = int(*v.DelayInSeconds)
+		}
+
 		filters := []interface{}{}
 		for _, item := range v.Filters {
 			filters = append(filters, ChannelFilterToMap(item))
 		}
 		result["filters"] = filters
+
+		result["tables_without_primary_key_handling"] = string(v.TablesWithoutPrimaryKeyHandling)
 	default:
 		log.Printf("[WARN] Received 'target_type' of unknown type %v", *obj)
 		return nil

internal/service/mysql/mysql_mysql_db_system_resource.go

@@ -61,11 +61,13 @@ The following attributes are exported:
 	* `applier_username` - The username for the replication applier of the target MySQL DB System.
 	* `channel_name` - The case-insensitive name that identifies the replication channel. Channel names must follow the rules defined for [MySQL identifiers](https://dev.mysql.com/doc/refman/8.0/en/identifiers.html). The names of non-Deleted Channels must be unique for each DB System. 
 	* `db_system_id` - The OCID of the source DB System.
+	* `delay_in_seconds` - Specifies the amount of time, in seconds, that the channel waits before  applying a transaction received from the source. 
 	* `filters` - Replication filter rules to be applied at the DB System Channel target. 
 		* `type` - The type of the filter rule.
 
 			For details on each type, see [Replication Filtering Rules](https://dev.mysql.com/doc/refman/8.0/en/replication-rules.html) 
 		* `value` - The body of the filter rule. This can represent a database, a table, or a database pair (represented as "db1->db2"). For more information, see [Replication Filtering Rules](https://dev.mysql.com/doc/refman/8.0/en/replication-rules.html). 
+	* `tables_without_primary_key_handling` - Specifies how a replication channel handles the creation and alteration of tables  that do not have a primary key. 
 	* `target_type` - The specific target identifier.
 * `time_created` - The date and time the Channel was created, as described by [RFC 3339](https://tools.ietf.org/rfc/rfc3339). 
 * `time_updated` - The time the Channel was last updated, as described by [RFC 3339](https://tools.ietf.org/rfc/rfc3339). 

website/docs/d/mysql_channel.html.markdown

@@ -77,11 +77,13 @@ The following attributes are exported:
 	* `applier_username` - The username for the replication applier of the target MySQL DB System.
 	* `channel_name` - The case-insensitive name that identifies the replication channel. Channel names must follow the rules defined for [MySQL identifiers](https://dev.mysql.com/doc/refman/8.0/en/identifiers.html). The names of non-Deleted Channels must be unique for each DB System. 
 	* `db_system_id` - The OCID of the source DB System.
+	* `delay_in_seconds` - Specifies the amount of time, in seconds, that the channel waits before  applying a transaction received from the source. 
 	* `filters` - Replication filter rules to be applied at the DB System Channel target. 
 		* `type` - The type of the filter rule.
 
 			For details on each type, see [Replication Filtering Rules](https://dev.mysql.com/doc/refman/8.0/en/replication-rules.html) 
 		* `value` - The body of the filter rule. This can represent a database, a table, or a database pair (represented as "db1->db2"). For more information, see [Replication Filtering Rules](https://dev.mysql.com/doc/refman/8.0/en/replication-rules.html). 
+	* `tables_without_primary_key_handling` - Specifies how a replication channel handles the creation and alteration of tables  that do not have a primary key. 
 	* `target_type` - The specific target identifier.
 * `time_created` - The date and time the Channel was created, as described by [RFC 3339](https://tools.ietf.org/rfc/rfc3339). 
 * `time_updated` - The time the Channel was last updated, as described by [RFC 3339](https://tools.ietf.org/rfc/rfc3339). 

website/docs/d/mysql_channels.html.markdown

@@ -97,11 +97,13 @@ The following attributes are exported:
 		* `applier_username` - The username for the replication applier of the target MySQL DB System.
 		* `channel_name` - The case-insensitive name that identifies the replication channel. Channel names must follow the rules defined for [MySQL identifiers](https://dev.mysql.com/doc/refman/8.0/en/identifiers.html). The names of non-Deleted Channels must be unique for each DB System. 
 		* `db_system_id` - The OCID of the source DB System.
+		* `delay_in_seconds` - Specifies the amount of time, in seconds, that the channel waits before  applying a transaction received from the source. 
 		* `filters` - Replication filter rules to be applied at the DB System Channel target. 
 			* `type` - The type of the filter rule.
 
 				For details on each type, see [Replication Filtering Rules](https://dev.mysql.com/doc/refman/8.0/en/replication-rules.html) 
 			* `value` - The body of the filter rule. This can represent a database, a table, or a database pair (represented as "db1->db2"). For more information, see [Replication Filtering Rules](https://dev.mysql.com/doc/refman/8.0/en/replication-rules.html). 
+		* `tables_without_primary_key_handling` - Specifies how a replication channel handles the creation and alteration of tables  that do not have a primary key. 
 		* `target_type` - The specific target identifier.
 	* `time_created` - The date and time the Channel was created, as described by [RFC 3339](https://tools.ietf.org/rfc/rfc3339). 
 	* `time_updated` - The time the Channel was last updated, as described by [RFC 3339](https://tools.ietf.org/rfc/rfc3339). 

website/docs/d/mysql_mysql_db_system.html.markdown

@@ -121,11 +121,13 @@ The following attributes are exported:
 		* `applier_username` - The username for the replication applier of the target MySQL DB System.
 		* `channel_name` - The case-insensitive name that identifies the replication channel. Channel names must follow the rules defined for [MySQL identifiers](https://dev.mysql.com/doc/refman/8.0/en/identifiers.html). The names of non-Deleted Channels must be unique for each DB System. 
 		* `db_system_id` - The OCID of the source DB System.
+		* `delay_in_seconds` - Specifies the amount of time, in seconds, that the channel waits before  applying a transaction received from the source. 
 		* `filters` - Replication filter rules to be applied at the DB System Channel target. 
 			* `type` - The type of the filter rule.
 
 				For details on each type, see [Replication Filtering Rules](https://dev.mysql.com/doc/refman/8.0/en/replication-rules.html) 
 			* `value` - The body of the filter rule. This can represent a database, a table, or a database pair (represented as "db1->db2"). For more information, see [Replication Filtering Rules](https://dev.mysql.com/doc/refman/8.0/en/replication-rules.html). 
+		* `tables_without_primary_key_handling` - Specifies how a replication channel handles the creation and alteration of tables  that do not have a primary key. 
 		* `target_type` - The specific target identifier.
 	* `time_created` - The date and time the Channel was created, as described by [RFC 3339](https://tools.ietf.org/rfc/rfc3339). 
 	* `time_updated` - The time the Channel was last updated, as described by [RFC 3339](https://tools.ietf.org/rfc/rfc3339). 

website/docs/d/mysql_mysql_db_systems.html.markdown

@@ -51,11 +51,13 @@ resource "oci_mysql_channel" "test_channel" {
 		#Optional
 		applier_username = var.channel_target_applier_username
 		channel_name = oci_mysql_channel.test_channel.name
+		delay_in_seconds = var.channel_target_delay_in_seconds
 		filters {
 			#Required
 			type = var.channel_target_filters_type
 			value = var.channel_target_filters_value
 		}
+		tables_without_primary_key_handling = var.channel_target_tables_without_primary_key_handling
 	}
 
 	#Optional
@@ -97,11 +99,13 @@ The following arguments are supported:
 	* `applier_username` - (Optional) (Updatable) The username for the replication applier of the target MySQL DB System.
 	* `channel_name` - (Optional) (Updatable) The case-insensitive name that identifies the replication channel. Channel names must follow the rules defined for [MySQL identifiers](https://dev.mysql.com/doc/refman/8.0/en/identifiers.html). The names of non-Deleted Channels must be unique for each DB System. 
 	* `db_system_id` - (Required) The OCID of the target DB System.
+	* `delay_in_seconds` - (Optional) (Updatable) Specifies the amount of time, in seconds, that the channel waits before  applying a transaction received from the source. 
 	* `filters` - (Optional) (Updatable) Replication filter rules to be applied at the DB System Channel target. 
 		* `type` - (Required) (Updatable) The type of the filter rule.
 
 			For details on each type, see [Replication Filtering Rules](https://dev.mysql.com/doc/refman/8.0/en/replication-rules.html) 
 		* `value` - (Required) (Updatable) The body of the filter rule. This can represent a database, a table, or a database pair (represented as "db1->db2"). For more information, see [Replication Filtering Rules](https://dev.mysql.com/doc/refman/8.0/en/replication-rules.html). 
+	* `tables_without_primary_key_handling` - (Optional) (Updatable) Specifies how a replication channel handles the creation and alteration of tables  that do not have a primary key. The default value is set to ALLOW. 
 	* `target_type` - (Required) (Updatable) The specific target identifier.
 
 
@@ -138,11 +142,13 @@ The following attributes are exported:
 	* `applier_username` - The username for the replication applier of the target MySQL DB System.
 	* `channel_name` - The case-insensitive name that identifies the replication channel. Channel names must follow the rules defined for [MySQL identifiers](https://dev.mysql.com/doc/refman/8.0/en/identifiers.html). The names of non-Deleted Channels must be unique for each DB System. 
 	* `db_system_id` - The OCID of the source DB System.
+	* `delay_in_seconds` - Specifies the amount of time, in seconds, that the channel waits before  applying a transaction received from the source. 
 	* `filters` - Replication filter rules to be applied at the DB System Channel target. 
 		* `type` - The type of the filter rule.
 
 			For details on each type, see [Replication Filtering Rules](https://dev.mysql.com/doc/refman/8.0/en/replication-rules.html) 
 		* `value` - The body of the filter rule. This can represent a database, a table, or a database pair (represented as "db1->db2"). For more information, see [Replication Filtering Rules](https://dev.mysql.com/doc/refman/8.0/en/replication-rules.html). 
+	* `tables_without_primary_key_handling` - Specifies how a replication channel handles the creation and alteration of tables  that do not have a primary key. 
 	* `target_type` - The specific target identifier.
 * `time_created` - The date and time the Channel was created, as described by [RFC 3339](https://tools.ietf.org/rfc/rfc3339). 
 * `time_updated` - The time the Channel was last updated, as described by [RFC 3339](https://tools.ietf.org/rfc/rfc3339). 

website/docs/r/mysql_channel.html.markdown

@@ -228,11 +228,13 @@ The following attributes are exported:
 		* `applier_username` - The username for the replication applier of the target MySQL DB System.
 		* `channel_name` - The case-insensitive name that identifies the replication channel. Channel names must follow the rules defined for [MySQL identifiers](https://dev.mysql.com/doc/refman/8.0/en/identifiers.html). The names of non-Deleted Channels must be unique for each DB System. 
 		* `db_system_id` - The OCID of the source DB System.
+		* `delay_in_seconds` - Specifies the amount of time, in seconds, that the channel waits before  applying a transaction received from the source. 
 		* `filters` - Replication filter rules to be applied at the DB System Channel target. 
 			* `type` - The type of the filter rule.
 
 				For details on each type, see [Replication Filtering Rules](https://dev.mysql.com/doc/refman/8.0/en/replication-rules.html) 
 			* `value` - The body of the filter rule. This can represent a database, a table, or a database pair (represented as "db1->db2"). For more information, see [Replication Filtering Rules](https://dev.mysql.com/doc/refman/8.0/en/replication-rules.html). 
+		* `tables_without_primary_key_handling` - Specifies how a replication channel handles the creation and alteration of tables  that do not have a primary key. 
 		* `target_type` - The specific target identifier.
 	* `time_created` - The date and time the Channel was created, as described by [RFC 3339](https://tools.ietf.org/rfc/rfc3339). 
 	* `time_updated` - The time the Channel was last updated, as described by [RFC 3339](https://tools.ietf.org/rfc/rfc3339).