From e813709003494f4ccd8ae3da56deecd72ddc7564 Mon Sep 17 00:00:00 2001 From: Rob Pickerill Date: Thu, 22 Apr 2021 20:55:59 +0100 Subject: [PATCH] only query sgs owned by the account --- awslimitchecker/services/ec2.py | 4 +++- awslimitchecker/tests/services/test_ec2.py | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/awslimitchecker/services/ec2.py b/awslimitchecker/services/ec2.py index 58b57094..e5f87053 100644 --- a/awslimitchecker/services/ec2.py +++ b/awslimitchecker/services/ec2.py @@ -642,7 +642,9 @@ def _find_usage_networking_sgs(self): logger.debug("Getting usage for EC2 VPC resources") sg_count = 0 rules_per_sg = defaultdict(int) - for sg in self.resource_conn.security_groups.all(): + for sg in self.resource_conn.security_groups.filter( + owner_id=self.current_account_id + ): if sg.vpc_id is None: continue sg_count += 1 diff --git a/awslimitchecker/tests/services/test_ec2.py b/awslimitchecker/tests/services/test_ec2.py index a79e1517..1de5c362 100644 --- a/awslimitchecker/tests/services/test_ec2.py +++ b/awslimitchecker/tests/services/test_ec2.py @@ -767,9 +767,10 @@ def test_simple(self): mocks = fixtures.test_find_usage_networking_sgs mock_conn = Mock() - mock_conn.security_groups.all.return_value = mocks + mock_conn.security_groups.filter.return_value = mocks cls = _Ec2Service(21, 43, {}, None) + cls._current_account_id = "1234567890" cls.resource_conn = mock_conn with patch('awslimitchecker.services.ec2.logger') as mock_logger: @@ -802,7 +803,7 @@ def test_simple(self): # egress: IPv4 = 22; IPv6 = 29 assert sorted_usage[2].get_value() == 29 assert mock_conn.mock_calls == [ - call.security_groups.all() + call.security_groups.filter(owner_id='1234567890') ]