Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rds.describe_db_snapshots bugs

Browse Source 
* Correctly return all snapshots for a given DBInstanceIdentifier.
* If an invalid DBInstanceIdentifier is passed in, return an empty array
  instead of raising a ClientError (which is what AWS actually does).

Fixes #1569
This commit is contained in:
Brian Pandola 2018-04-19 20:21:27 -07:00
parent ba3c9db8a7
commit 37d6388640
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
moto/rds2/models.py
View File

@ -722,10 +722,11 @@ class RDS2Backend(BaseBackend):
def describe_snapshots(self, db_instance_identifier, db_snapshot_identifier): def describe_snapshots(self, db_instance_identifier, db_snapshot_identifier):
if db_instance_identifier: if db_instance_identifier:
db_instance_snapshots = []
for snapshot in self.snapshots.values(): for snapshot in self.snapshots.values():
if snapshot.database.db_instance_identifier == db_instance_identifier: if snapshot.database.db_instance_identifier == db_instance_identifier:
return [snapshot] db_instance_snapshots.append(snapshot)
raise DBSnapshotNotFoundError() return db_instance_snapshots
if db_snapshot_identifier: if db_snapshot_identifier:
if db_snapshot_identifier in self.snapshots: if db_snapshot_identifier in self.snapshots:

7
tests/test_rds2/test_rds2.py
View File

@ -350,8 +350,6 @@ def test_describe_db_snapshots():
MasterUserPassword='hunter2', MasterUserPassword='hunter2',
Port=1234, Port=1234,
DBSecurityGroups=["my_sg"]) DBSecurityGroups=["my_sg"])
conn.describe_db_snapshots.when.called_with(
DBInstanceIdentifier="db-primary-1").should.throw(ClientError)
created = conn.create_db_snapshot(DBInstanceIdentifier='db-primary-1', created = conn.create_db_snapshot(DBInstanceIdentifier='db-primary-1',
DBSnapshotIdentifier='snapshot-1').get('DBSnapshot') DBSnapshotIdentifier='snapshot-1').get('DBSnapshot')
@ -366,6 +364,11 @@ def test_describe_db_snapshots():
snapshot.should.equal(created) snapshot.should.equal(created)
snapshot.get('Engine').should.equal('postgres') snapshot.get('Engine').should.equal('postgres')
conn.create_db_snapshot(DBInstanceIdentifier='db-primary-1',
DBSnapshotIdentifier='snapshot-2')
snapshots = conn.describe_db_snapshots(DBInstanceIdentifier='db-primary-1').get('DBSnapshots')
snapshots.should.have.length_of(2)
@mock_rds2 @mock_rds2
def test_delete_db_snapshot(): def test_delete_db_snapshot():