misc: translate legacy imports (bug 1878767)

- landoapi imports
- landui imports
- current_app
- remaining models

src/lando/api/legacy/api/diff_warnings.py

@@ -13,9 +13,9 @@
 
 from connexion import problem
 
-from landoapi.decorators import require_phabricator_api_key
-from landoapi.models.revisions import DiffWarning, DiffWarningStatus
-from landoapi.storage import db
+from lando.api.legacy.decorators import require_phabricator_api_key
+from lando.main.models.revision import DiffWarning, DiffWarningStatus
+from lando.api.legacy.storage import db
 
 logger = logging.getLogger(__name__)
 

src/lando/api/legacy/api/landing_jobs.py

@@ -6,9 +6,9 @@
 from connexion import ProblemException
 from flask import g
 
-from landoapi import auth
-from landoapi.models.landing_job import LandingJob, LandingJobAction, LandingJobStatus
-from landoapi.storage import db
+from lando.api import auth
+from lando.main.models.landing_job import LandingJob, LandingJobAction, LandingJobStatus
+from lando.api.legacy.storage import db
 
 logger = logging.getLogger(__name__)
 

src/lando/api/legacy/api/stacks.py

@@ -5,26 +5,26 @@
 import urllib.parse
 
 from connexion import problem
-from flask import current_app
+from lando import settings
 
-from landoapi.commit_message import format_commit_message
-from landoapi.decorators import require_phabricator_api_key
-from landoapi.models.revisions import Revision
-from landoapi.phabricator import PhabricatorClient
-from landoapi.projects import (
+from lando.api.legacy.commit_message import format_commit_message
+from lando.api.legacy.decorators import require_phabricator_api_key
+from lando.main.models.revision import Revision
+from lando.api.legacy.phabricator import PhabricatorClient
+from lando.api.legacy.projects import (
     get_release_managers,
     get_sec_approval_project_phid,
     get_secure_project_phid,
     project_search,
 )
-from landoapi.repos import get_repos_for_env
-from landoapi.reviews import (
+from lando.api.legacy.repos import get_repos_for_env
+from lando.api.legacy.reviews import (
     approvals_for_commit_message,
     get_collated_reviewers,
     reviewers_for_commit_message,
     serialize_reviewers,
 )
-from landoapi.revisions import (
+from lando.api.legacy.revisions import (
     find_title_and_summary_for_display,
     gather_involved_phids,
     get_bugzilla_bug,
@@ -33,15 +33,15 @@
     serialize_diff,
     serialize_status,
 )
-from landoapi.stacks import (
+from lando.api.legacy.stacks import (
     build_stack_graph,
     calculate_landable_subgraphs,
     get_landable_repos_for_revision_data,
     request_extended_revision_data,
 )
-from landoapi.transplants import get_blocker_checks
-from landoapi.users import user_search
-from landoapi.validation import revision_id_to_int
+from lando.api.legacy.transplants import get_blocker_checks
+from lando.api.legacy.users import user_search
+from lando.api.legacy.validation import revision_id_to_int
 
 logger = logging.getLogger(__name__)
 
@@ -75,7 +75,7 @@ def get(phab: PhabricatorClient, revision_id: str):
     except ValueError:
         return not_found_problem
 
-    supported_repos = get_repos_for_env(current_app.config.get("ENVIRONMENT"))
+    supported_repos = get_repos_for_env(settings.ENVIRONMENT)
     landable_repos = get_landable_repos_for_revision_data(stack_data, supported_repos)
 
     release_managers = get_release_managers(phab)
@@ -129,7 +129,7 @@ def get(phab: PhabricatorClient, revision_id: str):
         diff = stack_data.diffs[diff_phid]
         human_revision_id = "D{}".format(PhabricatorClient.expect(phab_revision, "id"))
         revision_url = urllib.parse.urljoin(
-            current_app.config["PHABRICATOR_URL"], human_revision_id
+            settings.PHABRICATOR_URL, human_revision_id
         )
         secure = revision_is_secure(phab_revision, secure_project_phid)
         commit_description = find_title_and_summary_for_display(
@@ -208,7 +208,7 @@ def get(phab: PhabricatorClient, revision_id: str):
         url = (
             repo.url
             if landing_supported
-            else f"{current_app.config['PHABRICATOR_URL']}/source/{short_name}"
+            else f"{settings.PHABRICATOR_URL}/source/{short_name}"
         )
 
         repositories.append(

src/lando/api/legacy/api/transplants.py

@@ -8,19 +8,20 @@
 
 import kombu
 from connexion import ProblemException, problem
-from flask import current_app, g
+from lando import settings
+from flask import g
 
-from landoapi import auth
-from landoapi.commit_message import format_commit_message
-from landoapi.decorators import require_phabricator_api_key
-from landoapi.models.landing_job import (
+from lando.api import auth
+from lando.api.legacy.commit_message import format_commit_message
+from lando.api.legacy.decorators import require_phabricator_api_key
+from lando.main.models.landing_job import (
     LandingJob,
     LandingJobStatus,
     add_revisions_to_job,
 )
-from landoapi.models.revisions import Revision
-from landoapi.phabricator import PhabricatorClient
-from landoapi.projects import (
+from lando.main.models.revision import Revision
+from lando.api.legacy.phabricator import PhabricatorClient
+from lando.api.legacy.projects import (
     CHECKIN_PROJ_SLUG,
     get_checkin_project_phid,
     get_release_managers,
@@ -30,41 +31,41 @@
     get_testing_tag_project_phids,
     project_search,
 )
-from landoapi.repos import (
+from lando.api.legacy.repos import (
     Repo,
     get_repos_for_env,
 )
-from landoapi.reviews import (
+from lando.api.legacy.reviews import (
     approvals_for_commit_message,
     get_approved_by_ids,
     get_collated_reviewers,
     reviewers_for_commit_message,
 )
-from landoapi.revisions import (
+from lando.api.legacy.revisions import (
     find_title_and_summary_for_landing,
     gather_involved_phids,
     get_bugzilla_bug,
     revision_is_secure,
     select_diff_author,
 )
-from landoapi.stacks import (
+from lando.api.legacy.stacks import (
     RevisionData,
     build_stack_graph,
     calculate_landable_subgraphs,
     get_landable_repos_for_revision_data,
     request_extended_revision_data,
 )
-from landoapi.storage import db
-from landoapi.tasks import admin_remove_phab_project
-from landoapi.transplants import (
+from lando.api.legacy.storage import db
+from lando.api.legacy.tasks import admin_remove_phab_project
+from lando.api.legacy.transplants import (
     TransplantAssessment,
     check_landing_blockers,
     check_landing_warnings,
     convert_path_id_to_phid,
     get_blocker_checks,
 )
-from landoapi.users import user_search
-from landoapi.validation import (
+from lando.api.legacy.users import user_search
+from lando.api.legacy.validation import (
     parse_landing_path,
     revision_id_to_int,
 )
@@ -145,7 +146,7 @@ def _assess_transplant_request(
     stack_data = request_extended_revision_data(phab, list(nodes))
     landing_path_phid = convert_path_id_to_phid(landing_path, stack_data)
 
-    supported_repos = get_repos_for_env(current_app.config.get("ENVIRONMENT"))
+    supported_repos = get_repos_for_env(settings.ENVIRONMENT)
     landable_repos = get_landable_repos_for_revision_data(stack_data, supported_repos)
 
     other_checks = get_blocker_checks(
@@ -339,7 +340,7 @@ def post(phab: PhabricatorClient, data: dict):
             approval_reviewers,
             commit_description.summary,
             urllib.parse.urljoin(
-                current_app.config["PHABRICATOR_URL"], "D{}".format(revision["id"])
+                settings.PHABRICATOR_URL, "D{}".format(revision["id"])
             ),
             flags,
         )[1]

src/lando/api/legacy/api/try_push.py

@@ -14,18 +14,18 @@
     g,
 )
 
-from landoapi import auth
-from landoapi.hgexports import (
+from lando.api import auth
+from lando.api.legacy.hgexports import (
     GitPatchHelper,
     HgPatchHelper,
     PatchHelper,
 )
-from landoapi.models.landing_job import (
+from lando.main.models.landing_job import (
     LandingJobStatus,
     add_job_with_revisions,
 )
-from landoapi.models.revisions import Revision
-from landoapi.repos import (
+from lando.main.models.revision import Revision
+from lando.api.legacy.repos import (
     get_repos_for_env,
 )
 

src/lando/api/legacy/api/uplift.py

@@ -5,19 +5,19 @@
 import logging
 
 from connexion import problem
-from flask import current_app
+from lando import settings
 
-from landoapi import auth
-from landoapi.decorators import require_phabricator_api_key
-from landoapi.phabricator import PhabricatorClient
-from landoapi.repos import get_repos_for_env
-from landoapi.uplift import (
+from lando.api import auth
+from lando.api.legacy.decorators import require_phabricator_api_key
+from lando.api.legacy.phabricator import PhabricatorClient
+from lando.api.legacy.repos import get_repos_for_env
+from lando.api.legacy.uplift import (
     create_uplift_revision,
     get_local_uplift_repo,
     get_uplift_conduit_state,
     get_uplift_repositories,
 )
-from landoapi.validation import revision_id_to_int
+from lando.api.legacy.validation import revision_id_to_int
 
 logger = logging.getLogger(__name__)
 
@@ -41,7 +41,7 @@ def create(phab: PhabricatorClient, data: dict):
     revision_id = revision_id_to_int(data["revision_id"])
 
     # Validate repository.
-    all_repos = get_repos_for_env(current_app.config.get("ENVIRONMENT"))
+    all_repos = get_repos_for_env(settings.ENVIRONMENT)
     repository = all_repos.get(repo_name)
     if repository is None:
         return problem(

src/lando/api/legacy/app.py

@@ -10,21 +10,21 @@
 from connexion.resolver import RestyResolver
 
 import landoapi.models  # noqa, makes sure alembic knows about the models.
-from landoapi.auth import auth0_subsystem
-from landoapi.cache import cache_subsystem
-from landoapi.celery import celery_subsystem
-from landoapi.dockerflow import dockerflow
-from landoapi.hooks import initialize_hooks
-from landoapi.logging import logging_subsystem
-from landoapi.phabricator import phabricator_subsystem
-from landoapi.repos import repo_clone_subsystem
-from landoapi.sentry import sentry_subsystem
-from landoapi.smtp import smtp_subsystem
-from landoapi.storage import db_subsystem
-from landoapi.systems import Subsystem
-from landoapi.treestatus import treestatus_subsystem
-from landoapi.ui import lando_ui_subsystem
-from landoapi.version import version
+from lando.api.legacy.auth import auth0_subsystem
+from lando.api.legacy.cache import cache_subsystem
+from lando.api.legacy.celery import celery_subsystem
+from lando.api.legacy.dockerflow import dockerflow
+from lando.api.legacy.hooks import initialize_hooks
+from lando.api.legacy.logging import logging_subsystem
+from lando.api.legacy.phabricator import phabricator_subsystem
+from lando.api.legacy.repos import repo_clone_subsystem
+from lando.api.legacy.sentry import sentry_subsystem
+from lando.api.legacy.smtp import smtp_subsystem
+from lando.api.legacy.storage import db_subsystem
+from lando.api.legacy.systems import Subsystem
+from lando.api.legacy.treestatus import treestatus_subsystem
+from lando.api.legacy.ui import lando_ui_subsystem
+from lando.api.legacy.version import version
 
 logger = logging.getLogger(__name__)
 

src/lando/api/legacy/auth.py

@@ -16,13 +16,14 @@
 
 import requests
 from connexion import ProblemException, request
-from flask import current_app, g
+from lando import settings
+from flask import  g
 from jose import jwt
 
-from landoapi.cache import cache
-from landoapi.mocks.auth import MockAuth0
-from landoapi.repos import AccessGroup
-from landoapi.systems import Subsystem
+from django.core.cache import cache
+from lando.api.legacy.mocks.auth import MockAuth0
+from lando.api.legacy.repos import AccessGroup
+from lando.api.legacy.systems import Subsystem
 
 logger = logging.getLogger(__name__)
 
@@ -96,7 +97,7 @@ def jwks_cache_key(url: str) -> str:
 def get_jwks() -> dict:
     """Return the auth0 jwks."""
     jwks_url = "https://{oidc_domain}/.well-known/jwks.json".format(
-        oidc_domain=current_app.config["OIDC_DOMAIN"]
+        oidc_domain=settings.OIDC_DOMAIN
     )
     cache_key = jwks_cache_key(jwks_url)
 
@@ -163,7 +164,7 @@ def userinfo_cache_key(access_token: str, user_sub: str) -> str:
 
 
 def get_userinfo_url() -> str:
-    return "https://{}/userinfo".format(current_app.config["OIDC_DOMAIN"])
+    return "https://{}/userinfo".format(settings.OIDC_DOMAIN)
 
 
 def fetch_auth0_userinfo(access_token: str) -> requests.Response:
@@ -442,15 +443,15 @@ def wrapped(*args, **kwargs):
                 )
 
             issuer = "https://{oidc_domain}/".format(
-                oidc_domain=current_app.config["OIDC_DOMAIN"]
+                oidc_domain=settings.OIDC_DOMAIN
             )
 
             try:
                 payload = jwt.decode(
                     token,
                     key,
                     algorithms=ALGORITHMS,
-                    audience=current_app.config["OIDC_IDENTIFIER"],
+                    audience=settings.OIDC_IDENTIFIER,
                     issuer=issuer,
                 )
             except jwt.ExpiredSignatureError:

src/lando/api/legacy/bmo.py

@@ -3,19 +3,19 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import requests
-from flask import current_app
+from lando import settings
 
 
 def bmo_uplift_endpoint() -> str:
     """Returns the BMO uplift endpoint url for bugs."""
-    return f"{current_app.config['BUGZILLA_URL']}/rest/lando/uplift"
+    return f"{settings.BUGZILLA_URL}/rest/lando/uplift"
 
 
 def bmo_default_headers() -> dict[str, str]:
     """Returns a `dict` containing the default REST API headers."""
     return {
         "User-Agent": "Lando-API",
-        "X-Bugzilla-API-Key": current_app.config["BUGZILLA_API_KEY"],
+        "X-Bugzilla-API-Key": settings.BUGZILLA_API_KEY,
     }
 
 

src/lando/api/legacy/cache.py

@@ -10,8 +10,8 @@
 from flask_caching.backends.rediscache import RedisCache
 from redis import RedisError
 
-from landoapi.redis import SuppressRedisFailure
-from landoapi.systems import Subsystem
+from lando.api.legacy.redis import SuppressRedisFailure
+from lando.api.legacy.systems import Subsystem
 
 # 60s * 60m * 24h
 DEFAULT_CACHE_KEY_TIMEOUT_SECONDS = 60 * 60 * 24