lots of typing fixes

app/terraform/proxy/__init__.py

@@ -1,9 +1,10 @@
+from abc import abstractmethod
 from collections import defaultdict
 import datetime
 import math
 import string
 import random
-from typing import Dict
+from typing import Dict, Optional, Any, List
 
 from sqlalchemy import text
 from tldextract import tldextract
@@ -17,6 +18,22 @@ from app.terraform.terraform import TerraformAutomation
 
 class ProxyAutomation(TerraformAutomation):
     subgroup_max = math.inf
+    """
+    Maximum number of proxies to deploy per sub-group. This is required for some providers
+    where the number origins per group may exceed the number of proxies that can be configured
+    in a single "configuration block", e.g. Azure CDN's profiles.
+    """
+
+    template: str
+    """
+    Terraform configuration template using Jinja 2.
+    """
+
+    template_parameters: List[str]
+    """
+    List of parameters to be read from the application configuration for use
+    in the templating of the Terraform configuration.
+    """
 
     def get_subgroups(self) -> Dict[int, Dict[int, int]]:
         conn = db.engine.connect()
@@ -27,12 +44,12 @@ class ProxyAutomation(TerraformAutomation):
             AND proxy.provider = :provider
         GROUP BY origin.group_id, proxy.psg;
         """), provider=self.provider)
-        subgroups = defaultdict(lambda: defaultdict(lambda: 0))
+        subgroups: Dict[int, Dict[int, int]] = defaultdict(lambda: defaultdict(lambda: 0))
         for row in result:
             subgroups[row[0]][row[1]] = row[2]
         return subgroups
 
-    def create_missing_proxies(self):
+    def create_missing_proxies(self) -> None:
         groups = Group.query.all()
         subgroups = self.get_subgroups()
         for group in groups:
@@ -62,7 +79,7 @@ class ProxyAutomation(TerraformAutomation):
                     db.session.add(proxy)
         db.session.commit()
 
-    def deprecate_orphaned_proxies(self):
+    def deprecate_orphaned_proxies(self) -> None:
         proxies = Proxy.query.filter(
             Proxy.deprecated == None,
             Proxy.destroyed == None,
@@ -73,7 +90,7 @@ class ProxyAutomation(TerraformAutomation):
                 proxy.deprecate(reason="origin_destroyed")
         db.session.commit()
 
-    def destroy_expired_proxies(self):
+    def destroy_expired_proxies(self) -> None:
         cutoff = datetime.datetime.utcnow() - datetime.timedelta(days=3)
         proxies = Proxy.query.filter(
             Proxy.destroyed == None,
@@ -85,15 +102,20 @@ class ProxyAutomation(TerraformAutomation):
             proxy.updated = datetime.datetime.utcnow()
         db.session.commit()
 
-    def tf_prehook(self):
+    @abstractmethod
+    def import_state(self, state: Any) -> None:
+        raise NotImplementedError()
+
+    def tf_prehook(self) -> Optional[Any]:
         self.create_missing_proxies()
         self.deprecate_orphaned_proxies()
         self.destroy_expired_proxies()
+        return None
 
-    def tf_posthook(self, *, prehook_result):
+    def tf_posthook(self, *, prehook_result: Any = None) -> None:
         self.import_state(self.tf_show())
 
-    def tf_generate(self):
+    def tf_generate(self) -> None:
         self.tf_write(
             self.template,
             groups=Group.query.all(),

app/terraform/proxy/azure_cdn.py

@@ -1,3 +1,5 @@
+from typing import Optional, Any
+
 from app.extensions import db
 from app.models.mirrors import Proxy
 from app.terraform.proxy import ProxyAutomation
@@ -157,7 +159,7 @@ class ProxyAzureCdnAutomation(ProxyAutomation):
     {% endfor %}
     """
 
-    def import_state(self, state):
+    def import_state(self, state: Optional[Any]) -> None:
         proxies = Proxy.query.filter(
             Proxy.provider == self.provider,
             Proxy.destroyed == None

app/terraform/proxy/cloudfront.py

@@ -1,4 +1,5 @@
 import datetime
+from typing import Any
 
 from app.extensions import db
 from app.models.mirrors import Proxy
@@ -72,7 +73,11 @@ class ProxyCloudfrontAutomation(ProxyAutomation):
     {% endfor %}
     """
 
-    def import_state(self, state):
+    def import_state(self, state: Any) -> None:
+        assert(isinstance(state, dict))
+        if "child_modules" not in state['values']['root_module']:
+            # There are no CloudFront proxies deployed to import state for
+            return
         for mod in state['values']['root_module']['child_modules']:
             if mod['address'].startswith('module.cloudfront_'):
                 for res in mod['resources']:

app/terraform/proxy/fastly.py

@@ -1,3 +1,6 @@
+# type: ignore
+# TODO: This module doesn't work at all
+
 import datetime
 import os
 import string