From 04d1623952e1d060c5b9b95cd9edf3fc487aa549 Mon Sep 17 00:00:00 2001 From: Iain Learmonth Date: Sun, 5 Mar 2023 14:14:13 +0000 Subject: [PATCH] fix(proxy): use values set by provider constructor for next_subgroup --- app/terraform/proxy/__init__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/terraform/proxy/__init__.py b/app/terraform/proxy/__init__.py index fefe7e1..b2f859c 100644 --- a/app/terraform/proxy/__init__.py +++ b/app/terraform/proxy/__init__.py @@ -158,6 +158,7 @@ class ProxyAutomation(TerraformAutomation): @classmethod def next_subgroup(cls, group_id: int) -> Optional[int]: + provider = cls() # Some attributes are set by constructor conn = db.engine.connect() result = conn.execute(text(""" SELECT proxy.psg, COUNT(proxy.id) FROM proxy, origin @@ -166,11 +167,11 @@ class ProxyAutomation(TerraformAutomation): AND origin.group_id = :group_id AND proxy.provider = :provider GROUP BY proxy.psg ORDER BY proxy.psg; - """), provider=cls.short_name, group_id=group_id) + """), provider=provider.short_name, group_id=group_id) subgroups = { row[0]: row[1] for row in result } - for subgroup in range(0, cls.subgroup_count_max): - if subgroups.get(subgroup, 0) < cls.subgroup_members_max: + for subgroup in range(0, provider.subgroup_count_max): + if subgroups.get(subgroup, 0) < provider.subgroup_members_max: return subgroup return None