mypy: fix up typing

app/portal/__init__.py

@@ -72,7 +72,7 @@ def describe_brn(s: str) -> ResponseReturnValue:
             ).first()
             if not proxy:
                 return s
-            return markupsafe.Markup(  # type: ignore[no-untyped-call]
+            return markupsafe.Markup(
                 f"Proxy: {proxy.url}<br>({proxy.origin.group.group_name}: {proxy.origin.domain_name})")
         if parts[5].startswith("quota/"):
             if parts[4] == "cloudfront":

app/portal/origin.py

@@ -37,7 +37,7 @@ class EditOriginForm(FlaskForm):  # type: ignore
     submit = SubmitField('Save Changes')
 
 
-def final_domain_name(domain_name) -> str:
+def final_domain_name(domain_name: str) -> str:
     session = requests.Session()
     r = session.get(f"https://{domain_name}/", allow_redirects=True, timeout=10)
     return urllib.parse.urlparse(r.url).netloc

app/terraform/block/bridge.py

@@ -1,7 +1,7 @@
 from datetime import datetime, timedelta
 import logging
 from abc import abstractmethod
-from typing import Tuple, List, Callable
+from typing import Tuple, List, Callable, Optional
 
 from app.extensions import db
 from app.models.activity import Activity
@@ -10,6 +10,9 @@ from app.terraform import BaseAutomation
 
 
 class BlockBridgeAutomation(BaseAutomation):
+    ips: List[str]
+    fingerprints: List[str]
+    hashed_fingerprints: List[str]
     patterns: List[str]
 
     def __init__(self) -> None:
@@ -21,7 +24,7 @@ class BlockBridgeAutomation(BaseAutomation):
         self.hashed_fingerprints = []
         super().__init__()
 
-    def perform_deprecations(self, ids: List[str], bridge_select_func: Callable[[str], Bridge]
+    def perform_deprecations(self, ids: List[str], bridge_select_func: Callable[[str], Optional[Bridge]]
                              ) -> List[Tuple[str, str]]:
         rotated = []
         for id_ in ids:
@@ -80,7 +83,7 @@ class BlockBridgeAutomation(BaseAutomation):
         """
 
 
-def get_bridge_by_ip(ip: str) -> Bridge:
+def get_bridge_by_ip(ip: str) -> Optional[Bridge]:
     return Bridge.query.filter(  # type: ignore[no-any-return]
         Bridge.deprecated.is_(None),
         Bridge.destroyed.is_(None),
@@ -88,7 +91,7 @@ def get_bridge_by_ip(ip: str) -> Bridge:
     ).first()
 
 
-def get_bridge_by_fingerprint(fingerprint: str) -> Bridge:
+def get_bridge_by_fingerprint(fingerprint: str) -> Optional[Bridge]:
     return Bridge.query.filter(  # type: ignore[no-any-return]
         Bridge.deprecated.is_(None),
         Bridge.destroyed.is_(None),
@@ -96,7 +99,7 @@ def get_bridge_by_fingerprint(fingerprint: str) -> Bridge:
     ).first()
 
 
-def get_bridge_by_hashed_fingerprint(hashed_fingerprint: str) -> Bridge:
+def get_bridge_by_hashed_fingerprint(hashed_fingerprint: str) -> Optional[Bridge]:
     return Bridge.query.filter(  # type: ignore[no-any-return]
         Bridge.deprecated.is_(None),
         Bridge.destroyed.is_(None),

app/terraform/block/bridge_dnsc.py

@@ -17,7 +17,7 @@ class BlockBridgeDnscAutomation(BlockBridgeAutomation):
 
     _content: BinaryIO
 
-    def fetch(self):
+    def fetch(self) -> None:
         response = requests.get(DOWNLOAD_URL,
                                 headers={"User-Agent": "Mozilla/5.0 (Windows NT x.y; Win64; x64; rv:10.0) "
                                                        "Gecko/20100101 Firefox/10.0"})

app/terraform/block/bridge_reachability.py

@@ -10,7 +10,7 @@ class BlockBridgeReachabilityAutomation(BlockBridgeAutomation):
 
     _lines: List[str]
 
-    def parse(self):
+    def parse(self) -> None:
         for line in self._lines:
             parts = line.split("\t")
             if isoparse(parts[2]) < (datetime.datetime.now(datetime.timezone.utc)

app/terraform/proxy/__init__.py

@@ -159,7 +159,7 @@ class ProxyAutomation(TerraformAutomation):
             for group in groups:
                 self.sp_config(group)
 
-    def sp_trusted_prefixes(self):
+    def sp_trusted_prefixes(self) -> str:
         return "\n".join([f"geoip2_proxy {p};" for p in all_cdn_prefixes()])
 
     def sp_config(self, group: Group) -> None: