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.

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

f/resource_aws_dms_endpoint: allow configuring secrets manager secret when engine is aurora, mariadb or mysql #24846

Merged
merged 15 commits into from
Jun 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .changelog/24846.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_dms_endpoint: Add ability to use AWS Secrets Manager with the `aurora`, `mariadb` and `mysql` engines
```
63 changes: 63 additions & 0 deletions internal/service/dms/endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,28 @@ func resourceEndpointCreate(d *schema.ResourceData, meta interface{}) error {
}

switch d.Get("engine_name").(string) {
case engineNameAurora, engineNameMariadb, engineNameMySQL:
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)),
}
} 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)),
}

// Set connection info in top-level namespace as well
input.Username = aws.String(d.Get("username").(string))
input.Password = aws.String(d.Get("password").(string))
input.ServerName = aws.String(d.Get("server_name").(string))
input.Port = aws.Int64(int64(d.Get("port").(int)))
input.DatabaseName = aws.String(d.Get("database_name").(string))
}
case engineNameDynamoDB:
input.DynamoDbSettings = &dms.DynamoDbSettings{
ServiceAccessRoleArn: aws.String(d.Get("service_access_role").(string)),
Expand Down Expand Up @@ -839,6 +861,33 @@ func resourceEndpointUpdate(d *schema.ResourceData, meta interface{}) error {
}

switch engineName := d.Get("engine_name").(string); engineName {
case engineNameAurora, engineNameMariadb, engineNameMySQL:
if d.HasChanges(
"username", "password", "server_name", "port", "database_name", "secrets_manager_access_role_arn",
"secrets_manager_arn") {
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)),
}
} 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)),
}
input.EngineName = aws.String(engineName)

// Update connection info in top-level namespace as well
input.Username = aws.String(d.Get("username").(string))
input.Password = aws.String(d.Get("password").(string))
input.ServerName = aws.String(d.Get("server_name").(string))
input.Port = aws.Int64(int64(d.Get("port").(int)))
input.DatabaseName = aws.String(d.Get("database_name").(string))
}
}
case engineNameDynamoDB:
if d.HasChange("service_access_role") {
input.DynamoDbSettings = &dms.DynamoDbSettings{
Expand Down Expand Up @@ -1091,6 +1140,20 @@ func resourceEndpointSetState(d *schema.ResourceData, endpoint *dms.Endpoint) er
d.Set("extra_connection_attributes", endpoint.ExtraConnectionAttributes)

switch aws.StringValue(endpoint.EngineName) {
case engineNameAurora, engineNameMariadb, engineNameMySQL:
if endpoint.MySQLSettings != nil {
d.Set("username", endpoint.MySQLSettings.Username)
d.Set("server_name", endpoint.MySQLSettings.ServerName)
d.Set("port", endpoint.MySQLSettings.Port)
d.Set("database_name", endpoint.MySQLSettings.DatabaseName)
d.Set("secrets_manager_access_role_arn", endpoint.MySQLSettings.SecretsManagerAccessRoleArn)
d.Set("secrets_manager_arn", endpoint.MySQLSettings.SecretsManagerSecretId)
} else {
d.Set("username", endpoint.Username)
d.Set("server_name", endpoint.ServerName)
d.Set("port", endpoint.Port)
d.Set("database_name", endpoint.DatabaseName)
}
case engineNameDynamoDB:
if endpoint.DynamoDbSettings != nil {
d.Set("service_access_role", endpoint.DynamoDbSettings.ServiceAccessRoleArn)
Expand Down
Loading