From 9797d8d119a43fac02ff5299de1ae356509a7504 Mon Sep 17 00:00:00 2001
From: Iain Learmonth <irl@sr2.uk>
Date: Tue, 17 May 2022 08:28:37 +0100
Subject: [PATCH] lint: remove cyclic imports

---
 app/lists/mirror_mapping.py | 4 ++--
 app/models/alarms.py        | 2 +-
 app/models/base.py          | 2 +-
 app/models/bridges.py       | 2 +-
 app/models/mirrors.py       | 2 +-
 app/portal/eotk.py          | 5 ++---
 app/portal/util.py          | 2 +-
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/lists/mirror_mapping.py b/app/lists/mirror_mapping.py
index 845f79e..606af4e 100644
--- a/app/lists/mirror_mapping.py
+++ b/app/lists/mirror_mapping.py
@@ -1,6 +1,7 @@
 import builtins
 from typing import Dict, List, Union
 
+from flask import current_app
 from pydantic import BaseModel, Field
 from tldextract import extract
 
@@ -30,7 +31,6 @@ class MirrorMapping(BaseModel):
 
 
 def mirror_mapping() -> Dict[str, Union[str, Dict[str, str]]]:
-    from app import app
     return MirrorMapping(
         version="1.1",
         mappings={
@@ -45,7 +45,7 @@ def mirror_mapping() -> Dict[str, Union[str, Dict[str, str]]]:
             ) for d in Proxy.query.all() if d.url is not None
         },
         s3_buckets=[
-            f"{app.config['GLOBAL_NAMESPACE']}-{g.group_name.lower()}-logs-cloudfront"
+            f"{current_app.config['GLOBAL_NAMESPACE']}-{g.group_name.lower()}-logs-cloudfront"
             for g in Group.query.filter(Group.destroyed.is_(None)).all()
         ]
     ).dict()
diff --git a/app/models/alarms.py b/app/models/alarms.py
index 31af1dd..b529e06 100644
--- a/app/models/alarms.py
+++ b/app/models/alarms.py
@@ -2,7 +2,7 @@ import enum
 from datetime import datetime
 from typing import List, Any
 
-from app import db
+from app.extensions import db
 
 
 class AlarmState(enum.Enum):
diff --git a/app/models/base.py b/app/models/base.py
index ef611a6..13e20b7 100644
--- a/app/models/base.py
+++ b/app/models/base.py
@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import List
 
-from app import db
+from app.extensions import db
 from app.models import AbstractConfiguration
 
 
diff --git a/app/models/bridges.py b/app/models/bridges.py
index 364a578..a2cacc4 100644
--- a/app/models/bridges.py
+++ b/app/models/bridges.py
@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import List
 
-from app import db
+from app.extensions import db
 from app.models import AbstractConfiguration, AbstractResource
 
 
diff --git a/app/models/mirrors.py b/app/models/mirrors.py
index 17d8e4d..3ea1d4d 100644
--- a/app/models/mirrors.py
+++ b/app/models/mirrors.py
@@ -2,7 +2,7 @@ from typing import Optional, List
 
 from tldextract import extract
 
-from app import db
+from app.extensions import db
 from app.models import AbstractConfiguration, AbstractResource
 from app.models.onions import Onion
 
diff --git a/app/portal/eotk.py b/app/portal/eotk.py
index 2e20464..ef2eaa8 100644
--- a/app/portal/eotk.py
+++ b/app/portal/eotk.py
@@ -1,4 +1,4 @@
-from flask import render_template, Blueprint, Response
+from flask import current_app, render_template, Blueprint, Response
 from flask.typing import ResponseReturnValue
 from sqlalchemy import desc
 
@@ -20,8 +20,7 @@ def eotk_list() -> ResponseReturnValue:
 
 @bp.route("/conf/<group_id>")
 def eotk_conf(group_id: int) -> ResponseReturnValue:
-    from app import app
     group = Group.query.filter(Group.id == group_id).first()
     return Response(render_template("sites.conf.j2",
-                                    bypass_token=app.config["BYPASS_TOKEN"],
+                                    bypass_token=current_app.config["BYPASS_TOKEN"],
                                     group=group), content_type="text/plain")
diff --git a/app/portal/util.py b/app/portal/util.py
index 2a065f0..0d40c0d 100644
--- a/app/portal/util.py
+++ b/app/portal/util.py
@@ -3,7 +3,7 @@ from flask.typing import ResponseReturnValue
 from flask_wtf import FlaskForm
 from wtforms import SubmitField
 
-from app import db
+from app.extensions import db
 from app.models import AbstractResource
 from app.models.activity import Activity