Merge pull request #490 from sebasrp/master

issue #489 - Add missing RDS limits (DBInstanceRoles, DBClusterRoles, CustomEndpointsPerDBCluster and ManualClusterSnapshots)
jantman · Dec 2, 2020 · d5b2c0a · d5b2c0a
2 parents aae6b84 + 83d00ac
commit d5b2c0a
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 1 deletion.
diff --git a/awslimitchecker/services/rds.py b/awslimitchecker/services/rds.py
@@ -69,6 +69,10 @@ class _RDSService(_AwsService):
         'ReadReplicasPerMaster': 'Read replicas per master',
         'DBClusters': 'DB Clusters',
         'DBClusterParameterGroups': 'DB Cluster Parameter Groups',
+        'DBInstanceRoles': 'DB Instance Roles',
+        'DBClusterRoles': 'DB Cluster Roles',
+        'CustomEndpointsPerDBCluster': 'Custom Endpoints Per DB Cluster',
+        'ManualClusterSnapshots': 'Manual Cluster Snapshots',
     }
 
     def find_usage(self):
@@ -284,6 +288,42 @@ def get_limits(self):
             ta_limit_name='Cluster parameter groups',
             quotas_name='DB cluster parameter groups'
         )
+        limits['Manual Cluster Snapshots'] = AwsLimit(
+            'Manual Cluster Snapshots',
+            self,
+            100,
+            self.warning_threshold,
+            self.critical_threshold,
+            limit_type='AWS::RDS::DBCluster',
+            quotas_name='Manual Cluster Snapshots'
+        )
+        limits['Custom Endpoints Per DB Cluster'] = AwsLimit(
+            'Custom Endpoints Per DB Cluster',
+            self,
+            5,
+            self.warning_threshold,
+            self.critical_threshold,
+            limit_type='AWS::RDS::DBCluster',
+            quotas_name='Custom Endpoints Per DB Cluster'
+        )
+        limits['DB Instance Roles'] = AwsLimit(
+            'DB Instance Roles',
+            self,
+            5,
+            self.warning_threshold,
+            self.critical_threshold,
+            limit_type='AWS::RDS::DBInstance',
+            quotas_name='DB Instance Roles'
+        )
+        limits['DB Cluster Roles'] = AwsLimit(
+            'DB Cluster Roles',
+            self,
+            5,
+            self.warning_threshold,
+            self.critical_threshold,
+            limit_type='AWS::RDS::DBCluster',
+            quotas_name='DB Cluster Roles'
+        )
         self.limits = limits
         return limits
 

diff --git a/awslimitchecker/tests/services/result_fixtures.py b/awslimitchecker/tests/services/result_fixtures.py
@@ -1113,6 +1113,26 @@ class RDS(object):
                 'AccountQuotaName': 'DBClusterParameterGroups',
                 'Used': 6
             },
+            {
+                'Max': 11,
+                'AccountQuotaName': 'DBInstanceRoles',
+                'Used': 1
+            },
+            {
+                'Max': 12,
+                'AccountQuotaName': 'DBClusterRoles',
+                'Used': 2
+            },
+            {
+                'Max': 13,
+                'AccountQuotaName': 'CustomEndpointsPerDBCluster',
+                'Used': 3
+            },
+            {
+                'Max': 101,
+                'AccountQuotaName': 'ManualClusterSnapshots',
+                'Used': 5
+            },
             {
                 'Max': 98,
                 'AccountQuotaName': 'Foo',

diff --git a/awslimitchecker/tests/services/test_rds.py b/awslimitchecker/tests/services/test_rds.py
@@ -86,7 +86,11 @@ def test_get_limits(self):
             'Event Subscriptions',
             'Read replicas per master',
             'DB Clusters',
-            'DB Cluster Parameter Groups'
+            'DB Cluster Parameter Groups',
+            'DB Cluster Roles',
+            'DB Instance Roles',
+            'Custom Endpoints Per DB Cluster',
+            'Manual Cluster Snapshots'
         ])
         for name, limit in res.items():
             assert limit.service == cls
@@ -340,3 +344,19 @@ def test_update_limits_from_api(self):
         lim = cls.limits['DB Cluster Parameter Groups']
         assert lim.api_limit == 51
         assert lim.get_current_usage()[0].get_value() == 6
+
+        lim = cls.limits['Manual Cluster Snapshots']
+        assert lim.api_limit == 101
+        assert lim.get_current_usage()[0].get_value() == 5
+
+        lim = cls.limits['DB Instance Roles']
+        assert lim.api_limit == 11
+        assert lim.get_current_usage()[0].get_value() == 1
+
+        lim = cls.limits['DB Cluster Roles']
+        assert lim.api_limit == 12
+        assert lim.get_current_usage()[0].get_value() == 2
+
+        lim = cls.limits['Custom Endpoints Per DB Cluster']
+        assert lim.api_limit == 13
+        assert lim.get_current_usage()[0].get_value() == 3