Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
"warn_deployment_exposure",
"default_wrap",
"require_confirmation_dag_change",
"enable_swagger_ui",
"instance_name_has_markup",
]

Expand All @@ -54,6 +53,7 @@ def get_configs() -> ConfigResponse:
"instance_name": conf.get("webserver", "instance_name", fallback="Airflow"),
"audit_view_included_events": conf.get("webserver", "audit_view_included_events", fallback=""),
"audit_view_excluded_events": conf.get("webserver", "audit_view_excluded_events", fallback=""),
"enable_swagger_ui": conf.get("api", "enable_swagger_ui"),
"test_connection": conf.get("core", "test_connection", fallback="Disabled"),
"dashboard_alert": DASHBOARD_UIALERTS,
}
Expand Down
4 changes: 4 additions & 0 deletions airflow-core/src/airflow/cli/commands/config_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,10 @@ def message(self) -> str | None:
config=ConfigParameter("webserver", "access_logfile"),
renamed_to=ConfigParameter("api", "access_logfile"),
),
ConfigChange(
config=ConfigParameter("webserver", "enable_swagger_ui"),
renamed_to=ConfigParameter("api", "enable_swagger_ui"),
),
ConfigChange(
config=ConfigParameter("webserver", "error_logfile"),
was_deprecated=False,
Expand Down
14 changes: 7 additions & 7 deletions airflow-core/src/airflow/config_templates/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1318,6 +1318,13 @@ secrets:
api:
description: ~
options:
enable_swagger_ui:
description: |
Boolean for running SwaggerUI in the webserver.
version_added: 2.6.0
type: boolean
example: ~
default: "True"
secret_key:
description: |
Secret key used to run your api server. It should be as random as possible. However, when running
Expand Down Expand Up @@ -1825,13 +1832,6 @@ webserver:
type: string
example: "dagrun_cleared,failed"
default: ~
enable_swagger_ui:
description: |
Boolean for running SwaggerUI in the webserver.
version_added: 2.6.0
type: boolean
example: ~
default: "True"
require_confirmation_dag_change:
description: |
Require confirmation when changing a DAG in the web UI. This is to prevent accidental changes
Expand Down
1 change: 1 addition & 0 deletions airflow-core/src/airflow/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ def sensitive_config_values(self) -> set[tuple[str, str]]:
("fab", "navbar_hover_color"): ("webserver", "navbar_hover_color", "3.0.2"),
("fab", "navbar_text_hover_color"): ("webserver", "navbar_text_hover_color", "3.0.2"),
("api", "secret_key"): ("webserver", "secret_key", "3.0.2"),
("api", "enable_swagger_ui"): ("webserver", "enable_swagger_ui", "3.0.2"),
}

# A mapping of new section -> (old section, since_version).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def mock_config_data():
("webserver", "hide_paused_dags_by_default"): "false",
("webserver", "instance_name"): "Airflow",
("webserver", "instance_name_has_markup"): "false",
("webserver", "enable_swagger_ui"): "true",
("api", "enable_swagger_ui"): "true",
("webserver", "require_confirmation_dag_change"): "false",
("webserver", "default_wrap"): "false",
("webserver", "audit_view_excluded_events"): "",
Expand Down
2 changes: 1 addition & 1 deletion providers/fab/src/airflow/providers/fab/www/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@
# There is a difference with configuring Swagger in Connexion 2.x and Connexion 3.x
# Connexion 2: https://connexion.readthedocs.io/en/2.14.2/quickstart.html#the-swagger-ui-console
# Connexion 3: https://connexion.readthedocs.io/en/stable/swagger_ui.html#configuring-the-swagger-ui
SWAGGER_ENABLED = conf.getboolean("webserver", "enable_swagger_ui", fallback=True)
SWAGGER_ENABLED = conf.getboolean("api", "enable_swagger_ui", fallback=True)
SWAGGER_BUNDLE = WWW.joinpath("static", "dist", "swagger-ui")
2 changes: 1 addition & 1 deletion providers/fab/www-hash.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dcce95d1f3f0f8e01c1e94c3915367e3acc00c022f76ebb8efad935cafe36d03
99f91c091b6b4111598d007b2cd771a35383bbd19a69f13652d44cce3d26bf99