Skip to content

Handle 404 on RDS deletion #453

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

Merged
markdboyd merged 1 commit into from
Oct 15, 2025
Merged

Handle 404 on RDS deletion #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions services/rds/rds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,8 +553,7 @@ func (d *dedicatedDBAdapter) waitForDbDeleted(operation base.Operation, i *RDSIn
for !isDeleted && attempt <= int(d.settings.PollAwsMaxRetries) {
dbState, err = d.checkDBStatus(database)
if err != nil {
var exception *rdsTypes.DBInstanceNotFoundFault
if !errors.As(err, &exception) {
if !isDatabaseInstanceNotFoundError(err) {
updateErr := jobs.WriteAsyncJobMessage(d.db, i.ServiceID, i.Uuid, operation, base.InstanceNotGone, fmt.Sprintf("Could not check database status: %s", err))
if updateErr != nil {
err = fmt.Errorf("waitForDbDeleted: while handling error %w, error updating async job message %w", err, updateErr)
Expand Down Expand Up @@ -590,7 +589,12 @@ func (d *dedicatedDBAdapter) deleteDatabaseInstance(i *RDSInstance, operation ba
params := prepareDeleteDbInput(database)
_, err := d.rds.DeleteDBInstance(context.TODO(), params)
if err != nil {
return fmt.Errorf("deleteDatabaseInstance: %w", err)
if isDatabaseInstanceNotFoundError(err) {
d.logger.Debug(fmt.Sprintf("database %s was already deleted, continuing", database))
return nil
} else {
return fmt.Errorf("deleteDatabaseInstance: %w", err)
}
}

err = d.waitForDbDeleted(operation, i, database)
Expand Down Expand Up @@ -666,3 +670,8 @@ func prepareDeleteDbInput(database string) *rds.DeleteDBInstanceInput {
SkipFinalSnapshot: aws.Bool(true),
}
}

func isDatabaseInstanceNotFoundError(err error) bool {
var notFoundException *rdsTypes.DBInstanceNotFoundFault
return errors.As(err, &notFoundException)
}
51 changes: 48 additions & 3 deletions services/rds/rds_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ import (
"github.com/google/uuid"
)

var logger lager.Logger

func NewTestDedicatedDBAdapter(s *config.Settings, db *gorm.DB, rdsClient RDSClientInterface, parameterGroupClient parameterGroupClient) *dedicatedDBAdapter {
logger := lager.NewLogger("aws-rds-test")
logger.RegisterSink(lager.NewWriterSink(os.Stdout, lager.INFO))
Expand Down Expand Up @@ -1901,7 +1899,7 @@ func TestAsyncDeleteDB(t *testing.T) {
}

dbInstanceNotFoundErr := &rdsTypes.DBInstanceNotFoundFault{
Message: aws.String("operation failed"),
Message: aws.String("not found"),
}

testCases := map[string]struct {
Expand Down Expand Up @@ -2055,6 +2053,53 @@ func TestAsyncDeleteDB(t *testing.T) {
expectedState: base.InstanceInProgress,
expectedRecordCount: 1,
},
"database already deleted": {
dbAdapter: NewTestDedicatedDBAdapter(
&config.Settings{
PollAwsRetryDelaySeconds: 0,
PollAwsMaxRetries: 1,
},
brokerDB,
&mockRDSClient{
deleteDbInstancesErrs: []error{dbInstanceNotFoundErr},
},
&mockParameterGroupClient{},
),
dbInstance: &RDSInstance{
Instance: base.Instance{
Request: request.Request{
ServiceID: helpers.RandStr(10),
},
Uuid: helpers.RandStr(10),
},
Database: helpers.RandStr(10),
},
expectedState: base.InstanceGone,
},
"replica and database already deleted": {
dbAdapter: NewTestDedicatedDBAdapter(
&config.Settings{
PollAwsRetryDelaySeconds: 0,
PollAwsMaxRetries: 1,
},
brokerDB,
&mockRDSClient{
deleteDbInstancesErrs: []error{dbInstanceNotFoundErr, dbInstanceNotFoundErr},
},
&mockParameterGroupClient{},
),
dbInstance: &RDSInstance{
Instance: base.Instance{
Request: request.Request{
ServiceID: helpers.RandStr(10),
},
Uuid: helpers.RandStr(10),
},
Database: helpers.RandStr(10),
ReplicaDatabase: helpers.RandStr(10),
},
expectedState: base.InstanceGone,
},
}

for name, test := range testCases {
Expand Down