Skip to content

[v3-0-test] Fix AIRFLOW_API_APPS constant in api_server_command (#54007) #54012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jedcunningham merged 1 commit into from
Aug 1, 2025
Merged

[v3-0-test] Fix AIRFLOW_API_APPS constant in api_server_command (#54007) #54012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions airflow-core/src/airflow/cli/commands/api_server_command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@

PS = ParamSpec("PS")
RT = TypeVar("RT")
AIRFLOW_API_APPS = "AIRFLOW_API_APPS"

log = logging.getLogger(__name__)

Expand Down Expand Up @@ -105,17 +104,17 @@ def with_api_apps_env(func: Callable[[Namespace], RT]) -> Callable[[Namespace],
@wraps(func)
def wrapper(args: Namespace) -> RT:
apps: str = args.apps
original_value = os.environ.get(AIRFLOW_API_APPS)
original_value = os.environ.get("AIRFLOW_API_APPS")
try:
log.debug("Setting AIRFLOW_API_APPS to: %s", apps)
os.environ[AIRFLOW_API_APPS] = apps
os.environ["AIRFLOW_API_APPS"] = apps
return func(args)
finally:
if original_value is not None:
os.environ[AIRFLOW_API_APPS] = original_value
os.environ["AIRFLOW_API_APPS"] = original_value
log.debug("Restored AIRFLOW_API_APPS to: %s", original_value)
else:
os.environ.pop(AIRFLOW_API_APPS, None)
os.environ.pop("AIRFLOW_API_APPS", None)
log.debug("Removed AIRFLOW_API_APPS from environment")

return wrapper
Expand Down
8 changes: 3 additions & 5 deletions airflow-core/tests/unit/cli/commands/test_api_server_command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,15 +147,13 @@ def test_api_apps_env(self, args, dev_mode, original_env):

# Verify the AIRFLOW_API_APPS was set correctly
if "--apps" in args:
expected_setitem_calls.append(
mock.call(api_server_command.AIRFLOW_API_APPS, parsed_args.apps)
)
expected_setitem_calls.append(mock.call("AIRFLOW_API_APPS", parsed_args.apps))

# Verify AIRFLOW_API_APPS was cleaned up
if original_env is not None:
expected_setitem_calls.append(mock.call(api_server_command.AIRFLOW_API_APPS, original_env))
expected_setitem_calls.append(mock.call("AIRFLOW_API_APPS", original_env))
else:
mock_environ.pop.assert_called_with(api_server_command.AIRFLOW_API_APPS, None)
mock_environ.pop.assert_called_with("AIRFLOW_API_APPS", None)

# Verify that the environment variable was set and cleaned up correctly
mock_environ.__setitem__.assert_has_calls(expected_setitem_calls)
Expand Down