diff --git a/lib/fog/aws/requests/rds/create_db_snapshot.rb b/lib/fog/aws/requests/rds/create_db_snapshot.rb index 244774782..1bb014808 100644 --- a/lib/fog/aws/requests/rds/create_db_snapshot.rb +++ b/lib/fog/aws/requests/rds/create_db_snapshot.rb @@ -26,7 +26,7 @@ module Fog def create_db_snapshot(identifier, name) response = Excon::Response.new if data[:snapshots][name] - raise Fog::AWS::RDS::IndentifierTaken.new + raise Fog::AWS::RDS::IdentifierTaken.new end server_data = data[:servers][identifier] diff --git a/lib/fog/aws/requests/rds/delete_db_instance.rb b/lib/fog/aws/requests/rds/delete_db_instance.rb index f98f267b8..ac9af09b6 100644 --- a/lib/fog/aws/requests/rds/delete_db_instance.rb +++ b/lib/fog/aws/requests/rds/delete_db_instance.rb @@ -37,8 +37,10 @@ module Fog unless skip_snapshot if server_set["ReadReplicaSourceDBInstanceIdentifier"] raise Fog::AWS::RDS::Error.new("InvalidParameterCombination => FinalDBSnapshotIdentifier can not be specified when deleting a replica instance") - elsif server_set["DBClusterIdentifier"] + elsif server_set["DBClusterIdentifier"] && snapshot_identifier # for cluster instances, you must pass in skip_snapshot = false, but not specify a snapshot identifier raise Fog::AWS::RDS::Error.new("InvalidParameterCombination => FinalDBSnapshotIdentifier can not be specified when deleting a cluster instance") + elsif server_set["DBClusterIdentifier"] && !snapshot_identifier && !skip_snapshot + #no-op else create_db_snapshot(identifier, snapshot_identifier) end