Do not require settings environment vars to just run linting

Author: leplatrem

jbi/app.py

@@ -23,14 +23,15 @@
 
 import jbi
 import jbi.queue
-from jbi.configuration import ACTIONS
+from jbi.configuration import get_actions
 from jbi.environment import get_settings
 from jbi.log import CONFIG
 from jbi.router import router
 
 SRC_DIR = Path(__file__).parent
 APP_DIR = Path(__file__).parents[1]
 
+ACTIONS = get_actions()
 settings = get_settings()
 version_info: dict[str, str] = get_version(APP_DIR)
 VERSION: str = version_info["version"]

jbi/bugzilla/__init__.py

@@ -1,7 +0,0 @@
-from .models import (
-    Bug,
-    BugId,
-    WebhookEvent,
-    WebhookRequest,
-)
-from .service import BugzillaService, get_service

jbi/configuration.py

@@ -10,7 +10,6 @@
 from jbi import environment
 from jbi.models import Actions
 
-settings = environment.get_settings()
 logger = logging.getLogger(__name__)
 
 
@@ -30,9 +29,9 @@ def get_actions_from_file(jbi_config_file: str) -> Actions:
         raise ConfigError("Errors exist.") from exception
 
 
-def get_actions(env=settings.env):
+def get_actions(env=None):
     """Load actions from file determined by ENV name"""
+    if env is None:
+        settings = environment.get_settings()
+        env = settings.env
     return get_actions_from_file(f"config/config.{env}.yaml")
-
-
-ACTIONS = get_actions()

jbi/models.py

@@ -17,8 +17,8 @@
     field_validator,
 )
 
-from jbi import Operation, steps
-from jbi.bugzilla import Bug, BugId, WebhookEvent
+from jbi import Operation
+from jbi.bugzilla.models import Bug, BugId, WebhookEvent
 
 logger = logging.getLogger(__name__)
 
@@ -51,6 +51,7 @@ class ActionSteps(BaseModel, frozen=True):
     @classmethod
     def validate_steps(cls, function_names: list[str]):
         """Validate that all configure step functions exist in the steps module"""
+        from jbi import steps
 
         invalid_functions = [
             func_name for func_name in function_names if not hasattr(steps, func_name)

jbi/retry.py

@@ -8,7 +8,7 @@
 from dockerflow.logging import JsonLogFormatter, request_id_context
 
 import jbi.runner as runner
-from jbi.configuration import ACTIONS
+from jbi.configuration import get_actions
 from jbi.errors import IgnoreInvalidRequestError
 from jbi.queue import get_dl_queue
 
@@ -22,6 +22,8 @@
 lsh.setFormatter(JsonLogFormatter(logger_name=__name__))
 logger.addHandler(lsh)
 
+ACTIONS = get_actions()
+
 
 async def retry_failed(item_executor=runner.execute_action, queue=get_dl_queue()):
     min_event_timestamp = datetime.now(UTC) - timedelta(days=int(RETRY_TIMEOUT_DAYS))

jbi/router.py

@@ -13,14 +13,14 @@
 from fastapi.templating import Jinja2Templates
 
 from jbi import bugzilla, jira
-from jbi.configuration import ACTIONS
+from jbi.configuration import get_actions
 from jbi.environment import Settings, get_settings
 from jbi.models import Actions
 from jbi.queue import DeadLetterQueue, get_dl_queue
 from jbi.runner import execute_or_queue
 
 SettingsDep = Annotated[Settings, Depends(get_settings)]
-ActionsDep = Annotated[Actions, Depends(lambda: ACTIONS)]
+ActionsDep = Annotated[Actions, Depends(get_actions)]
 BugzillaServiceDep = Annotated[bugzilla.BugzillaService, Depends(bugzilla.get_service)]
 JiraServiceDep = Annotated[jira.JiraService, Depends(jira.get_service)]
 

jbi/steps.py

@@ -4,7 +4,7 @@
 Each step takes an `ActionContext` and a list of arbitrary parameters.
 """
 
-# This import is needed (as of Pyhon 3.11) to enable type checking with modules
+# This import is needed (as of Python 3.11) to enable type checking with modules
 # imported under `TYPE_CHECKING`
 # https://docs.python.org/3/whatsnew/3.7.html#pep-563-postponed-evaluation-of-annotations
 # https://docs.python.org/3/whatsnew/3.11.html#pep-563-may-not-be-the-future
@@ -19,8 +19,6 @@
 from jbi import Operation
 from jbi.environment import get_settings
 
-settings = get_settings()
-
 
 class StepStatus(Enum):
     """
@@ -99,6 +97,7 @@ def add_link_to_jira(
     context: ActionContext, *, bugzilla_service: BugzillaService
 ) -> StepResult:
     """Add the URL to the Jira issue in the `see_also` field on the Bugzilla ticket"""
+    settings = get_settings()
     jira_url = f"{settings.jira_base_url}browse/{context.jira.issue}"
     logger.info(
         "Link %r on Bug %s",