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

Jump to bottom

r/aws_db_instance: Fix resource leak on error during creation. #38252

Merged
merged 4 commits into from
Jul 9, 2024
Merged

r/aws_db_instance: Fix resource leak on error during creation. #38252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ddd8d36
r/aws_db_instance: Fix resource leak on error during creation.
mergenci Jul 2, 2024
64f5446
Merge branch 'main' into HEAD
ewbankkit Jul 9, 2024
9f91fc3
Tweak CHANGELOG entry.
ewbankkit Jul 9, 2024
dd562ad
r/aws_db_instance: Ensure that resource ID (d.Id()) is always set imm…
ewbankkit Jul 9, 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
3 changes: 3 additions & 0 deletions .changelog/38252.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_db_instance: Correctly mark incomplete instances as [tainted](https://developer.hashicorp.com/terraform/cli/state/taint#the-tainted-status) during creation
```
39 changes: 25 additions & 14 deletions internal/service/rds/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,6 +878,7 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, meta in
output := outputRaw.(*rds.CreateDBInstanceReadReplicaOutput)

resourceID = aws.StringValue(output.DBInstance.DbiResourceId)
d.SetId(resourceID)

if v, ok := d.GetOk(names.AttrAllowMajorVersionUpgrade); ok {
// Having allowing_major_version_upgrade by itself should not trigger ModifyDBInstance
Expand Down Expand Up @@ -1106,10 +1107,10 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, meta in
return sdkdiag.AppendErrorf(diags, "creating RDS DB Instance (restore from S3) (%s): %s", identifier, err)
}

if outputRaw != nil {
output := outputRaw.(*rds.RestoreDBInstanceFromS3Output)
resourceID = aws.StringValue(output.DBInstance.DbiResourceId)
}
output := outputRaw.(*rds.RestoreDBInstanceFromS3Output)

resourceID = aws.StringValue(output.DBInstance.DbiResourceId)
d.SetId(resourceID)
} else if v, ok := d.GetOk("snapshot_identifier"); ok {
input := &rds.RestoreDBInstanceFromDBSnapshotInput{
AutoMinorVersionUpgrade: aws.Bool(d.Get(names.AttrAutoMinorVersionUpgrade).(bool)),
Expand Down Expand Up @@ -1339,6 +1340,12 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, meta in
},
)

var output *rds.RestoreDBInstanceFromDBSnapshotOutput

if err == nil {
output = outputRaw.(*rds.RestoreDBInstanceFromDBSnapshotOutput)
}

// When using SQL Server engine with MultiAZ enabled, its not
// possible to immediately enable mirroring since
// BackupRetentionPeriod is not available as a parameter to
Expand All @@ -1351,17 +1358,15 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, meta in
input.MultiAZ = aws.Bool(false)
modifyDbInstanceInput.MultiAZ = aws.Bool(true)
requiresModifyDbInstance = true
_, err = conn.RestoreDBInstanceFromDBSnapshotWithContext(ctx, input)
output, err = conn.RestoreDBInstanceFromDBSnapshotWithContext(ctx, input)
}

if err != nil {
return sdkdiag.AppendErrorf(diags, "creating RDS DB Instance (restore from snapshot) (%s): %s", identifier, err)
}

if outputRaw != nil {
output := outputRaw.(*rds.RestoreDBInstanceFromDBSnapshotOutput)
resourceID = aws.StringValue(output.DBInstance.DbiResourceId)
}
resourceID = aws.StringValue(output.DBInstance.DbiResourceId)
d.SetId(resourceID)
} else if v, ok := d.GetOk("restore_to_point_in_time"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
tfMap := v.([]interface{})[0].(map[string]interface{})
input := &rds.RestoreDBInstanceToPointInTimeInput{
Expand Down Expand Up @@ -1541,14 +1546,15 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, meta in
return false, err
},
)

if err != nil {
return sdkdiag.AppendErrorf(diags, "creating RDS DB Instance (restore to point-in-time) (%s): %s", identifier, err)
}

if outputRaw != nil {
output := outputRaw.(*rds.RestoreDBInstanceToPointInTimeOutput)
resourceID = aws.StringValue(output.DBInstance.DbiResourceId)
}
output := outputRaw.(*rds.RestoreDBInstanceToPointInTimeOutput)

resourceID = aws.StringValue(output.DBInstance.DbiResourceId)
d.SetId(resourceID)
} else {
if _, ok := d.GetOk(names.AttrAllocatedStorage); !ok {
diags = sdkdiag.AppendErrorf(diags, `"allocated_storage": required field is not set`)
Expand Down Expand Up @@ -1751,12 +1757,15 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, meta in
return false, err
},
)

if err != nil {
return sdkdiag.AppendErrorf(diags, "creating RDS DB Instance (%s): %s", identifier, err)
}

output := outputRaw.(*rds.CreateDBInstanceOutput)

resourceID = aws.StringValue(output.DBInstance.DbiResourceId)
d.SetId(resourceID)

// This is added here to avoid unnecessary modification when ca_cert_identifier is the default one
if v, ok := d.GetOk("ca_cert_identifier"); ok && v.(string) != aws.StringValue(output.DBInstance.CACertificateIdentifier) {
Expand All @@ -1775,7 +1784,9 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, meta in
resourceID = aws.StringValue(instance.DbiResourceId)
}

d.SetId(resourceID)
if d.Id() == "" {
d.SetId(resourceID)
}

if requiresModifyDbInstance {
modifyDbInstanceInput.DBInstanceIdentifier = aws.String(identifier)
Expand Down
Loading