Skip to content

propagate env parameter to CLI Actions #65901

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

Open
ASk1 wants to merge 4 commits into
base: main
Choose a base branch
from
+13 −2
Open

propagate env parameter to CLI Actions #65901

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b1f64e
propagate env parameter to CLI Actions
ASk1 Apr 26, 2026
c32f99e
Merge branch 'main' into fix-airflowctl
ASk1 Apr 26, 2026
19affe6
Merge branch 'main' into fix-airflowctl
ASk1 Apr 27, 2026
b83ebf2
Merge branch 'main' into fix-airflowctl
ASk1 Apr 27, 2026
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
15 changes: 13 additions & 2 deletions airflow-ctl/src/airflowctl/api/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,7 @@ def plugins(self):
def get_client(
kind: Literal[ClientKind.CLI, ClientKind.AUTH, ClientKind.NO_AUTH] = ClientKind.CLI,
api_token: str | None = None,
api_environment: str | None = None,
):
"""
Get CLI API client.
Expand All @@ -487,13 +488,18 @@ def get_client(
"""
api_client = None
api_token = api_token or os.getenv("AIRFLOW_CLI_TOKEN", None)
api_environment = api_environment or "production"
Comment thread
ASk1 marked this conversation as resolved.
try:
# API URL always loaded from the config file, please save with it if you are using other than ClientKind.CLI
if kind == ClientKind.NO_AUTH:
credentials = Credentials(client_kind=kind).load()
resolved_token = None
else:
credentials = Credentials(client_kind=kind, api_token=api_token).load()
credentials = Credentials(
client_kind=kind,
api_token=api_token,
api_environment=api_environment,
).load()
resolved_token = api_token or credentials.api_token
api_client = Client(
base_url=credentials.api_url or "http://localhost:8080",
Expand Down Expand Up @@ -527,7 +533,12 @@ def decorator(func: Callable[PS, RT]) -> Callable[PS, RT]:
def wrapper(*args, **kwargs) -> RT:
if "api_client" not in kwargs:
api_token = getattr(args[0], "api_token", None) if args else None
with get_client(kind=kind, api_token=api_token) as api_client:
api_environment = getattr(args[0], "env", None) if args else None
with get_client(
kind=kind,
api_token=api_token,
api_environment=api_environment,
) as api_client:
return func(*args, api_client=api_client, **kwargs)
# The CLI API Client should be only passed for Mocking and Testing
return func(*args, **kwargs)
Expand Down
Loading