Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: DMS replication endpoint MySQL settings block #35570

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

feat: DMS replication endpoint MySQL settings block #35570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b35c65b
Add mysql_settings block for DMS endpoints.
mdjward Jan 19, 2024
f9afb6b
Merge branch 'hashicorp:main' into f-add_dms_mysql_settings_block
mdjward Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 127 additions & 11 deletions internal/service/dms/endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,48 @@ func ResourceEndpoint() *schema.Resource {
},
},
},
"mysql_settings": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
DiffSuppressFunc: verify.SuppressMissingOptionalConfigurationBlock,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"after_connect_script": {
Type: schema.TypeString,
Optional: true,
},
"clean_source_metadata_on_mismatch": {
Type: schema.TypeBool,
Optional: true,
},
"events_poll_interval": {
Type: schema.TypeInt,
Optional: true,
},
"execute_timeout": {
Type: schema.TypeInt,
Optional: true,
},
"max_file_size": {
Type: schema.TypeInt,
Optional: true,
},
"parallel_load_threads": {
Type: schema.TypeInt,
Optional: true,
},
"server_timezone": {
Type: schema.TypeString,
Optional: true,
},
"target_db_type": {
Type: schema.TypeString,
Optional: true,
},
},
},
},
"password": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -806,19 +848,20 @@ func resourceEndpointCreate(ctx context.Context, d *schema.ResourceData, meta in

switch d.Get("engine_name").(string) {
case engineNameAurora, engineNameMariadb, engineNameMySQL:
settings := &dms.MySQLSettings{}
if _, ok := d.GetOk("mysql_settings"); ok {
settings = expandMySQLSettings(d.Get("mysql_settings").([]interface{})[0].(map[string]interface{}))
}

if _, ok := d.GetOk("secrets_manager_arn"); ok {
input.MySQLSettings = &dms.MySQLSettings{
SecretsManagerAccessRoleArn: aws.String(d.Get("secrets_manager_access_role_arn").(string)),
SecretsManagerSecretId: aws.String(d.Get("secrets_manager_arn").(string)),
}
settings.SecretsManagerAccessRoleArn = aws.String(d.Get("secrets_manager_access_role_arn").(string))
settings.SecretsManagerSecretId = aws.String(d.Get("secrets_manager_arn").(string))
} else {
input.MySQLSettings = &dms.MySQLSettings{
Username: aws.String(d.Get("username").(string)),
Password: aws.String(d.Get("password").(string)),
ServerName: aws.String(d.Get("server_name").(string)),
Port: aws.Int64(int64(d.Get("port").(int))),
DatabaseName: aws.String(d.Get("database_name").(string)),
}
settings.Username = aws.String(d.Get("username").(string))
settings.Password = aws.String(d.Get("password").(string))
settings.ServerName = aws.String(d.Get("server_name").(string))
settings.Port = aws.Int64(int64(d.Get("port").(int)))
settings.DatabaseName = aws.String(d.Get("database_name").(string))

// Set connection info in top-level namespace as well
expandTopLevelConnectionInfo(d, input)
Expand Down Expand Up @@ -1550,6 +1593,9 @@ func resourceEndpointSetState(d *schema.ResourceData, endpoint *dms.Endpoint) er
} else {
flattenTopLevelConnectionInfo(d, endpoint)
}
if err := d.Set("mysql_settings", flattenMySQLSettings(endpoint.MySQLSettings)); err != nil {
return fmt.Errorf("setting mysql_settings: %w", err)
}
case engineNameAuroraPostgresql, engineNamePostgres:
if endpoint.PostgreSQLSettings != nil {
d.Set("username", endpoint.PostgreSQLSettings.Username)
Expand Down Expand Up @@ -2083,6 +2129,76 @@ func flattenMongoDBSettings(settings *dms.MongoDbSettings) []map[string]interfac
return []map[string]interface{}{m}
}

func expandMySQLSettings(tfMap map[string]interface{}) *dms.MySQLSettings {
if tfMap == nil {
return nil
}

apiObject := &dms.MySQLSettings{}

if v, ok := tfMap["after_connect_script"].(string); ok && v != "" {
apiObject.AfterConnectScript = aws.String(v)
}
if v, ok := tfMap["clean_source_metadata_on_mismatch"].(bool); ok {
apiObject.CleanSourceMetadataOnMismatch = aws.Bool(v)
}
if v, ok := tfMap["events_poll_interval"].(int); ok {
apiObject.EventsPollInterval = aws.Int64(int64(v))
}
if v, ok := tfMap["execute_timeout"].(int); ok {
apiObject.ExecuteTimeout = aws.Int64(int64(v))
}
if v, ok := tfMap["max_file_size"].(int); ok {
apiObject.MaxFileSize = aws.Int64(int64(v))
}
if v, ok := tfMap["parallel_load_threads"].(int); ok {
apiObject.ParallelLoadThreads = aws.Int64(int64(v))
}
if v, ok := tfMap["server_timezone"].(string); ok && v != "" {
apiObject.ServerTimezone = aws.String(v)
}
if v, ok := tfMap["target_db_type"].(string); ok && v != "" {
apiObject.TargetDbType = aws.String(v)
}

return apiObject
}

func flattenMySQLSettings(apiObject *dms.MySQLSettings) []map[string]interface{} {
if apiObject == nil {
return nil
}

tfMap := map[string]interface{}{}

if v := apiObject.AfterConnectScript; v != nil {
tfMap["after_connect_script"] = aws.StringValue(v)
}
if v := apiObject.CleanSourceMetadataOnMismatch; v != nil {
tfMap["clean_source_metadata_on_mismatch"] = aws.BoolValue(v)
}
if v := apiObject.EventsPollInterval; v != nil {
tfMap["events_poll_interval"] = aws.Int64Value(v)
}
if v := apiObject.ExecuteTimeout; v != nil {
tfMap["execute_timeout"] = aws.Int64Value(v)
}
if v := apiObject.MaxFileSize; v != nil {
tfMap["max_file_size"] = aws.Int64Value(v)
}
if v := apiObject.ParallelLoadThreads; v != nil {
tfMap["parallel_load_threads"] = aws.Int64Value(v)
}
if v := apiObject.ServerTimezone; v != nil {
tfMap["server_timezone"] = aws.StringValue(v)
}
if v := apiObject.TargetDbType; v != nil {
tfMap["target_db_type"] = aws.StringValue(v)
}

return []map[string]interface{}{tfMap}
}

func expandRedisSettings(tfMap map[string]interface{}) *dms.RedisSettings {
if tfMap == nil {
return nil
Expand Down
40 changes: 40 additions & 0 deletions internal/service/dms/endpoint_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,46 @@ func DataSourceEndpoint() *schema.Resource {
},
},
},
"mysql_settings": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"after_connect_script": {
Type: schema.TypeString,
Optional: true,
},
"clean_source_metadata_on_mismatch": {
Type: schema.TypeBool,
Optional: true,
},
"events_poll_interval": {
Type: schema.TypeInt,
Optional: true,
},
"execute_timeout": {
Type: schema.TypeInt,
Optional: true,
},
"max_file_size": {
Type: schema.TypeInt,
Optional: true,
},
"parallel_load_threads": {
Type: schema.TypeInt,
Optional: true,
},
"server_timezone": {
Type: schema.TypeString,
Optional: true,
},
"target_db_type": {
Type: schema.TypeString,
Optional: true,
},
},
},
},
"password": {
Type: schema.TypeString,
Computed: true,
Expand Down
104 changes: 104 additions & 0 deletions internal/service/dms/endpoint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1155,6 +1155,60 @@ func TestAccDMSEndpoint_MySQL_update(t *testing.T) {
})
}

func TestAccDMSEndpoint_MySQL_settings_source(t *testing.T) {
ctx := acctest.Context(t)
resourceName := "aws_dms_endpoint.test"
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(ctx, t) },
ErrorCheck: acctest.ErrorCheck(t, dms.EndpointsID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
CheckDestroy: testAccCheckEndpointDestroy(ctx),
Steps: []resource.TestStep{
{
Config: testAccEndpointConfig_mySQLSourceSettings(rName),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckEndpointExists(ctx, resourceName),
resource.TestCheckResourceAttr(resourceName, "mysql_settings.#", "1"),
resource.TestCheckResourceAttr(resourceName, "mysql_settings.0.after_connect_script", "SET character_set_connection = latin1"),
resource.TestCheckResourceAttr(resourceName, "mysql_settings.0.clean_source_metadata_on_mismatch", "true"),
resource.TestCheckResourceAttr(resourceName, "mysql_settings.0.events_poll_interval", "5"),
resource.TestCheckResourceAttr(resourceName, "mysql_settings.0.execute_timeout", "100"),
resource.TestCheckResourceAttr(resourceName, "mysql_settings.0.server_timezone", "UTC"),
),
},
},
})
}

func TestAccDMSEndpoint_MySQL_settings_target(t *testing.T) {
ctx := acctest.Context(t)
resourceName := "aws_dms_endpoint.test"
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(ctx, t) },
ErrorCheck: acctest.ErrorCheck(t, dms.EndpointsID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
CheckDestroy: testAccCheckEndpointDestroy(ctx),
Steps: []resource.TestStep{
{
Config: testAccEndpointConfig_mySQLSourceSettings(rName),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckEndpointExists(ctx, resourceName),
resource.TestCheckResourceAttr(resourceName, "mysql_settings.#", "1"),
resource.TestCheckResourceAttr(resourceName, "mysql_settings.0.after_connect_script", "SET character_set_connection = latin1"),
resource.TestCheckResourceAttr(resourceName, "mysql_settings.0.clean_source_metadata_on_mismatch", "false"),
resource.TestCheckResourceAttr(resourceName, "mysql_settings.0.max_file_size", "65536"),
resource.TestCheckResourceAttr(resourceName, "mysql_settings.0.parallel_load_threads", "3"),
resource.TestCheckResourceAttr(resourceName, "mysql_settings.0.target_db_type", "specific-database"),
),
},
},
})
}

func TestAccDMSEndpoint_Oracle_basic(t *testing.T) {
ctx := acctest.Context(t)
resourceName := "aws_dms_endpoint.test"
Expand Down Expand Up @@ -3776,6 +3830,56 @@ resource "aws_dms_endpoint" "test" {
`, rName)
}

func testAccEndpointConfig_mySQLSourceSettings(rName string) string {
return fmt.Sprintf(`
resource "aws_dms_endpoint" "test" {
endpoint_id = %[1]q
endpoint_type = "source"
engine_name = "mysql"
server_name = "tftest-new-server_name"
port = 3307
username = "tftest-new-username"
password = "tftest-new-password"
database_name = "tftest-new-database_name"
ssl_mode = "none"
extra_connection_attributes = ""

mysql_settings {
after_connect_script = "SET character_set_connection = latin1"
clean_source_metadata_on_mismatch = true
events_poll_interval = 5
execute_timeout = 100
server_timezone = "UTC"
}
}
`, rName)
}

func testAccEndpointConfig_mySQLTargetSettings(rName string) string {
return fmt.Sprintf(`
resource "aws_dms_endpoint" "test" {
endpoint_id = %[1]q
endpoint_type = "target"
engine_name = "postgres"
server_name = "tftest"
port = 5432
username = "tftest"
password = "tftest"
database_name = "tftest"
ssl_mode = "require"
extra_connection_attributes = ""

mysql_settings {
after_connect_script = "SET character_set_connection = latin1"
clean_source_metadata_on_mismatch = false
max_file_size = 65536
parallel_load_threads = 3
target_db_type = "specific-database"
}
}
`, rName)
}

func testAccEndpointConfig_oracle(rName string) string {
return fmt.Sprintf(`
resource "aws_dms_endpoint" "test" {
Expand Down
Loading