diff --git a/CHANGES.rst b/CHANGES.rst index 43d69e87..aaa02ac7 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,11 @@ Changelog Pre-release (develop branch) ---------------------------- +0.1.2 (2015-08-13) +------------------ + +* `#62 `_ - For 'RDS/DB snapshots per user' limit, only count manual snapshots. (fix bug in fix for `#54 `_) + 0.1.1 (2015-08-13) ------------------ diff --git a/awslimitchecker/services/rds.py b/awslimitchecker/services/rds.py index 6cdff8f4..11e361e7 100644 --- a/awslimitchecker/services/rds.py +++ b/awslimitchecker/services/rds.py @@ -124,7 +124,7 @@ def _find_usage_snapshots(self): "DBSnapshots"] num_manual_snaps = 0 for snap in snaps: - if snap['SnapshotType'] == 'automated': + if snap['SnapshotType'] == 'manual': num_manual_snaps += 1 self.limits['DB snapshots per user']._add_current_usage( num_manual_snaps, diff --git a/awslimitchecker/tests/services/test_rds.py b/awslimitchecker/tests/services/test_rds.py index d896bb07..a04f06de 100644 --- a/awslimitchecker/tests/services/test_rds.py +++ b/awslimitchecker/tests/services/test_rds.py @@ -391,27 +391,6 @@ def test_find_usage_snapshots(self): "DescribeDBSnapshotsResponse": { "DescribeDBSnapshotsResult": { "DBSnapshots": [ - { - "AllocatedStorage": 50, - "AvailabilityZone": "us-east-1a", - "DBInstanceIdentifier": "bd1c1ub84tcj0cv", - "DBSnapshotIdentifier": - "dbsnap-1", - "Engine": "mysql", - "EngineVersion": "5.6.22", - "InstanceCreateTime": 1429902229.795, - "Iops": None, - "LicenseModel": "general-public-license", - "MasterUsername": "myuser", - "OptionGroupName": "default:mysql-5-6", - "PercentProgress": 100, - "Port": 3306, - "SnapshotCreateTime": 1429903945.169, - "SnapshotType": "manual", - "SourceRegion": None, - "Status": "available", - "VpcId": "vpc-1ee8937b" - }, { "AllocatedStorage": 100, "AvailabilityZone": "us-east-1a", @@ -499,7 +478,7 @@ def test_find_usage_snapshots(self): usage = sorted(cls.limits['DB snapshots per user'].get_current_usage()) assert len(usage) == 1 - assert usage[0].get_value() == 2 + assert usage[0].get_value() == 1 assert usage[0].aws_type == 'AWS::RDS::DBSnapshot' def test_find_usage_param_groups(self): diff --git a/awslimitchecker/version.py b/awslimitchecker/version.py index ae6a090a..365e7560 100644 --- a/awslimitchecker/version.py +++ b/awslimitchecker/version.py @@ -42,7 +42,7 @@ import logging logger = logging.getLogger(__name__) -_VERSION = '0.1.1' +_VERSION = '0.1.2' _PROJECT_URL = 'https://github.com/jantman/awslimitchecker'