Skip to content

Commit dcb63a4

Browse files
authored
Rename Legacy{Foo} to TeamUnaware{Foo} where appropriate (#72044)
"Legacy" only makes sense if you know the context and what it is comparing to. The counterpart doubles in these files were already named TeamAware{Foo} (_TeamAwareConnValueBackend, _TeamAwareRaisingBackend), so this makes the pair readable without a docstring explaining which change "legacy" refers to.
1 parent 8e14c29 commit dcb63a4

3 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎airflow-core/tests/unit/always/test_secrets.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ def test_variable_env_var_do_not_access_team_specific(self):
230230
assert Variable.get_variable_from_secrets(key="_team___myvar") is None
231231

232232

233-
class _LegacyGetConnectionBackend(BaseSecretsBackend):
233+
class _TeamUnawareGetConnectionBackend(BaseSecretsBackend):
234234
"""Backend overriding ``get_connection`` with the pre-3.2 ``(self, conn_id)`` signature (e.g. Vault)."""
235235

236236
def __init__(self, conns: dict[str, Connection]):
@@ -240,7 +240,7 @@ def get_connection(self, conn_id):
240240
return self._conns.get(conn_id)
241241

242242

243-
class _LegacyGetVariableBackend(BaseSecretsBackend):
243+
class _TeamUnawareGetVariableBackend(BaseSecretsBackend):
244244
"""Backend overriding ``get_variable`` with the pre-3.2 ``(self, key)`` signature."""
245245

246246
def __init__(self, variables: dict[str, str]):
@@ -251,7 +251,7 @@ def get_variable(self, key):
251251

252252

253253
@skip_if_force_lowest_dependencies_marker
254-
class TestLegacyBackendSignatureCompat:
254+
class TestTeamUnawareBackendSignatureCompat:
255255
"""Backends whose overrides predate the ``team_name`` keyword must keep working (issue #1333)."""
256256

257257
def setup_method(self) -> None:
@@ -260,21 +260,21 @@ def setup_method(self) -> None:
260260
@pytest.mark.parametrize("team_name", [None, "team_a"])
261261
@conf_vars({("core", "multi_team"): "True"})
262262
@mock.patch.dict("sys.modules", {"airflow.sdk.execution_time.task_runner": None})
263-
def test_get_connection_with_legacy_get_connection_override(self, team_name):
264-
backend = _LegacyGetConnectionBackend(
265-
{"legacy_conn": Connection(conn_id="legacy_conn", conn_type="mysql", host="h")}
263+
def test_get_connection_with_team_unaware_override(self, team_name):
264+
backend = _TeamUnawareGetConnectionBackend(
265+
{"team_unaware_conn": Connection(conn_id="team_unaware_conn", conn_type="mysql", host="h")}
266266
)
267267
with mock.patch("airflow.configuration.ensure_secrets_loaded", return_value=[backend]):
268-
conn = Connection.get_connection_from_secrets("legacy_conn", team_name=team_name)
268+
conn = Connection.get_connection_from_secrets("team_unaware_conn", team_name=team_name)
269269

270-
assert conn.conn_id == "legacy_conn"
270+
assert conn.conn_id == "team_unaware_conn"
271271
assert conn.conn_type == "mysql"
272272

273273
@pytest.mark.parametrize("team_name", [None, "team_a"])
274-
def test_get_variable_with_legacy_get_variable_override(self, team_name):
275-
backend = _LegacyGetVariableBackend({"legacy_var": "secret_value"})
274+
def test_get_variable_with_team_unaware_override(self, team_name):
275+
backend = _TeamUnawareGetVariableBackend({"team_unaware_var": "secret_value"})
276276
with mock.patch("airflow.models.variable.ensure_secrets_loaded", return_value=[backend]):
277-
value = Variable.get_variable_from_secrets("legacy_var", team_name=team_name)
277+
value = Variable.get_variable_from_secrets("team_unaware_var", team_name=team_name)
278278

279279
assert value == "secret_value"
280280

‎airflow-core/tests/unit/api_fastapi/auth/managers/test_base_auth_manager.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,15 +175,15 @@ def test_authorize_view_passes_team_name_to_team_aware_manager(
175175
access_view=AccessView.DOCS, user=None, team_name="team_a"
176176
)
177177

178-
def test_authorize_view_drops_team_name_and_warns_for_legacy_manager(self):
178+
def test_authorize_view_drops_team_name_and_warns_for_team_unaware_manager(self):
179179
# A manager whose is_authorized_view predates team_name (out-of-tree, or a provider
180180
# released before the argument existed) must keep working: authorize_view falls back
181181
# to a global check and warns that some views are not team-restricted.
182-
class LegacyAuthManager(EmptyAuthManager):
182+
class TeamUnawareAuthManager(EmptyAuthManager):
183183
def is_authorized_view(self, *, access_view, user=None): # old signature, no team_name
184184
return True
185185

186-
manager = LegacyAuthManager()
186+
manager = TeamUnawareAuthManager()
187187

188188
with pytest.warns(RemovedInAirflow4Warning, match="not team-aware"):
189189
result = manager.authorize_view(access_view=AccessView.DOCS, user=None, team_name="team_a")

‎shared/secrets_backend/tests/secrets_backend/test_base.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def test_deserialize_connection_uri(self, sample_conn_uri):
150150
assert conn.uri == sample_conn_uri
151151

152152

153-
class _LegacyConnValueBackend(BaseSecretsBackend):
153+
class _TeamUnawareConnValueBackend(BaseSecretsBackend):
154154
"""Backend overriding ``get_conn_value`` with the pre-3.2 ``(self, conn_id)`` signature."""
155155

156156
def __init__(self, conn_values: dict[str, str]):
@@ -203,8 +203,8 @@ class TestTeamNameBackwardCompat:
203203
"""``get_connection`` must not forward ``team_name`` to overrides that predate it (issue #1333)."""
204204

205205
@pytest.mark.parametrize("team_name", [None, "team_a"])
206-
def test_legacy_get_conn_value_signature_does_not_break(self, sample_conn_uri, team_name):
207-
backend = _LegacyConnValueBackend(conn_values={"test_conn": sample_conn_uri})
206+
def test_team_unaware_get_conn_value_signature_does_not_break(self, sample_conn_uri, team_name):
207+
backend = _TeamUnawareConnValueBackend(conn_values={"test_conn": sample_conn_uri})
208208

209209
conn = backend.get_connection(conn_id="test_conn", team_name=team_name)
210210

@@ -239,7 +239,7 @@ def test_team_aware_backend_typeerror_not_masked(self):
239239
assert backend.call_count == 1
240240

241241
@pytest.mark.parametrize("team_name", [None, "team_a"])
242-
def test_legacy_backend_missing_conn_returns_none(self, team_name):
243-
backend = _LegacyConnValueBackend(conn_values={})
242+
def test_team_unaware_backend_missing_conn_returns_none(self, team_name):
243+
backend = _TeamUnawareConnValueBackend(conn_values={})
244244

245245
assert backend.get_connection(conn_id="missing", team_name=team_name) is None

0 commit comments

Comments
 (0)