lint

app/cli/automate.py

@@ -124,11 +124,11 @@ def run_job(job_cls: Type[BaseAutomation], *,
         trace = TracebackException.from_exception(exc)
         success = False
         logs = "\n".join(trace.format())
-    if success:
+    if job is not None and success:
         automation.state = AutomationState.IDLE
         automation.next_run = datetime.datetime.utcnow() + datetime.timedelta(
             minutes=getattr(job, "frequency", 7))
-        if 'TERRAFORM_DIRECTORY' not in app.config:
+        if 'TERRAFORM_DIRECTORY' not in app.config and working_dir is not None:
             # We used a temporary working directory
             shutil.rmtree(working_dir)
     else:

app/lists/bridgelines.py

@@ -32,7 +32,7 @@ class Bridgelines(BaseModel):
         title = "Bridgelines Version 1"
 
 
-def bridgelines(pool: Pool, *, distribution_method: Optional[str] = None) -> Dict[str, Any]:
+def bridgelines(_, *, distribution_method: Optional[str] = None) -> Dict[str, Any]:
     bridges: Iterable[Bridge] = Bridge.query.filter(
         Bridge.destroyed.is_(None),
         Bridge.deprecated.is_(None),

app/lists/mirror_mapping.py

@@ -35,7 +35,7 @@ class MirrorMapping(BaseModel):
         title = "Mirror Mapping Version 1.1"
 
 
-def mirror_mapping(ignored_pool: Pool) -> Dict[str, Union[str, Dict[str, str]]]:
+def mirror_mapping(_) -> Dict[str, Union[str, Dict[str, str]]]:
     return MirrorMapping(
         version="1.1",
         mappings={

app/lists/redirector.py

@@ -42,7 +42,7 @@ def redirector_pool(pool: Pool) -> RedirectorPool:
     )
 
 
-def redirector_data(ignored_pool: Optional[Pool]) -> Dict[str, Union[str, Dict[str, Union[Dict[str, str]]]]]:
+def redirector_data(_) -> Dict[str, Union[str, Dict[str, Union[Dict[str, str]]]]]:
     active_pools = Pool.query.filter(
         Pool.destroyed.is_(None)
     ).all()

app/models/activity.py

@@ -57,7 +57,7 @@ class Webhook(AbstractConfiguration):
             product="notify",
             provider=self.format,
             resource_type="conf",
-            resource_id=self.id
+            resource_id=str(self.id)
         )
 
     def send(self, text: str) -> None:

app/models/automation.py

@@ -51,5 +51,5 @@ class AutomationLogs(AbstractResource):
             product="core",
             provider="",
             resource_type="automationlog",
-            resource_id=self.id
+            resource_id=str(self.id)
         )

app/models/base.py

@@ -1,6 +1,7 @@
 from datetime import datetime
 from typing import List
 
+from app.brm.brn import BRN
 from app.extensions import db
 from app.models import AbstractConfiguration
 
@@ -22,6 +23,16 @@ class Group(AbstractConfiguration):
             "group_name", "eotk"
         ]
 
+    @property
+    def brn(self) -> BRN:
+        return BRN(
+            group_id=self.id,
+            product="group",
+            provider="",
+            resource_type="group",
+            resource_id=str(self.id)
+        )
+
 
 class Pool(AbstractConfiguration):
     pool_name = db.Column(db.String(80), unique=True, nullable=False)
@@ -38,6 +49,16 @@ class Pool(AbstractConfiguration):
     lists = db.relationship("MirrorList", back_populates="pool")
     groups = db.relationship("Group", secondary="pool_group", back_populates="pools")
 
+    @property
+    def brn(self) -> BRN:
+        return BRN(
+            group_id=0,
+            product="pool",
+            provider="",
+            resource_type="pool",
+            resource_id=str(self.pool_name)
+        )
+
 
 class PoolGroup(db.Model):  # type: ignore[name-defined,misc]
     pool_id = db.Column(db.Integer, db.ForeignKey("pool.id"), primary_key=True)
@@ -98,3 +119,13 @@ class MirrorList(AbstractConfiguration):
         return super().csv_header() + [
             "provider", "format", "container", "branch", "filename"
         ]
+
+    @property
+    def brn(self) -> BRN:
+        return BRN(
+            group_id=0,
+            product="list",
+            provider=self.provider,
+            resource_type="list",
+            resource_id=str(self.id)
+        )

app/models/mirrors.py

@@ -67,7 +67,7 @@ class Proxy(AbstractResource):
             product="mirror",
             provider=self.provider,
             resource_type="proxy",
-            resource_id=self.id
+            resource_id=str(self.id)
         )
 
     @classmethod

app/portal/__init__.py

@@ -95,10 +95,10 @@ def describe_brn(s: str) -> ResponseReturnValue:
 
 
 @portal.app_template_filter("pretty_json")
-def pretty_json(input: Optional[str]) -> str:
+def pretty_json(json_str: Optional[str]) -> str:
-    if not input:
+    if not json_str:
         return "None"
-    return json.dumps(json.loads(input), indent=2)
+    return json.dumps(json.loads(json_str), indent=2)
 
 
 def total_origins_blocked() -> int:

app/terraform/__init__.py

@@ -61,7 +61,6 @@ class BaseAutomation:
 
         :param filename: filename to write to
         :param template: Jinja2 template
-        :param working_dir: temporary directory for running the Terraform automation
         :param kwargs: variables for use with the template
         :return: None
         """

app/terraform/block/bridge_reachability.py

@@ -1,4 +1,5 @@
 import datetime
+from abc import ABC
 from typing import List
 
 from dateutil.parser import isoparse
@@ -6,7 +7,7 @@ from dateutil.parser import isoparse
 from app.terraform.block.bridge import BlockBridgeAutomation
 
 
-class BlockBridgeReachabilityAutomation(BlockBridgeAutomation):
+class BlockBridgeReachabilityAutomation(BlockBridgeAutomation, ABC):
 
     _lines: List[str]
 

app/terraform/list/__init__.py

@@ -67,7 +67,8 @@ class ListAutomation(TerraformAutomation):
         for pool in Pool.query.filter(Pool.destroyed.is_(None)).all():
             for key, formatter in lists.items():
                 for obfuscate in [True, False]:
-                    with open(os.path.join(self.working_dir, f"{key}.{pool.pool_name}{'.jsno' if obfuscate else '.json'}"),
+                    with open(os.path.join(
+                            self.working_dir, f"{key}.{pool.pool_name}{'.jsno' if obfuscate else '.json'}"),
                               'w', encoding="utf-8") as out:
                         out.write(json_encode(formatter(pool), obfuscate))
                     with open(os.path.join(self.working_dir, f"{key}.{pool.pool_name}{'.jso' if obfuscate else '.js'}"),

app/terraform/terraform.py

@@ -41,7 +41,6 @@ class TerraformAutomation(BaseAutomation):
         5. The :func:`tf_posthook` hook is run.
         6. The logs from the apply step are returned as a string.
 
-        :param working_dir: temporary directory used to run the automation
         :param full: include a Terraform refresh in the automation module run
         :return: success status and Terraform apply logs
         """

migrations/versions/a08ce5e7246a_adds_api_key_field_to_pool_table.py

@@ -6,7 +6,6 @@ Create Date: 2022-12-20 18:10:19.540534
 
 """
 import secrets
-from datetime import datetime
 
 from alembic import op
 import sqlalchemy as sa