lint: remove cyclic imports

This commit is contained in:
Iain Learmonth 2022-05-17 08:28:37 +01:00
parent d7dab2e234
commit 9797d8d119
7 changed files with 9 additions and 10 deletions

View file

@ -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()