From 358e945e34dda2a956810cf7c072294ab14496a0 Mon Sep 17 00:00:00 2001
From: Iain Learmonth <irl@sr2.uk>
Date: Mon, 13 Mar 2023 13:46:38 +0000
Subject: [PATCH] fix(proxy): new sqla interface for binding params to
 statements

---
 app/terraform/proxy/__init__.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/terraform/proxy/__init__.py b/app/terraform/proxy/__init__.py
index b2f859c..063effd 100644
--- a/app/terraform/proxy/__init__.py
+++ b/app/terraform/proxy/__init__.py
@@ -144,13 +144,15 @@ class ProxyAutomation(TerraformAutomation):
     @classmethod
     def get_subgroups(cls) -> Dict[int, Dict[int, int]]:
         conn = db.engine.connect()
-        result = conn.execute(text("""
+        stmt = text("""
         SELECT origin.group_id, proxy.psg, COUNT(proxy.id) FROM proxy, origin
         WHERE proxy.origin_id = origin.id
             AND proxy.destroyed IS NULL
             AND proxy.provider = :provider
         GROUP BY origin.group_id, proxy.psg;
-        """), provider=cls.provider)
+        """)
+        stmt = stmt.bindparams(provider=cls.provider)
+        result = conn.execute(stmt).all()
         subgroups: Dict[int, Dict[int, int]] = defaultdict(lambda: defaultdict(lambda: 0))
         for row in result:
             subgroups[row[0]][row[1]] = row[2]
@@ -160,14 +162,16 @@ class ProxyAutomation(TerraformAutomation):
     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("""
+        stmt = text("""
         SELECT proxy.psg, COUNT(proxy.id) FROM proxy, origin
         WHERE proxy.origin_id = origin.id
             AND proxy.destroyed IS NULL
             AND origin.group_id = :group_id
             AND proxy.provider = :provider
         GROUP BY proxy.psg ORDER BY proxy.psg;
-        """), provider=provider.short_name, group_id=group_id)
+        """)
+        stmt = stmt.bindparams(provider=provider.short_name, group_id=group_id)
+        result = conn.execute(stmt).all()
         subgroups = {
             row[0]: row[1] for row in result
         }