Remove Cadwyn version change

Author: henry3260

airflow-core/src/airflow/api_fastapi/execution_api/security.py

@@ -67,7 +67,7 @@
 # Disable future annotations in this file to work around https://github.com/fastapi/fastapi/issues/13056
 # ruff: noqa: I002
 
-from typing import Any, Literal, get_args
+from typing import Any, get_args
 
 import structlog
 from fastapi import Depends, HTTPException, Request, status
@@ -79,14 +79,12 @@
 
 from airflow.api_fastapi.auth.tokens import JWTValidator
 from airflow.api_fastapi.common.db.common import AsyncSessionDep
-from airflow.api_fastapi.execution_api.datamodels.token import TIClaims, TIToken
+from airflow.api_fastapi.execution_api.datamodels.token import TIClaims, TIToken, TokenScope
 from airflow.api_fastapi.execution_api.deps import DepContainer
 
 log = structlog.get_logger(logger_name=__name__)
 
-TokenType = Literal["execution", "workload"]
-
-VALID_TOKEN_TYPES: frozenset[str] = frozenset(get_args(TokenType))
+VALID_TOKEN_TYPES: frozenset[str] = frozenset(get_args(TokenScope))
 
 _REQUEST_SCOPE_TOKEN_KEY = "ti_token"
 

airflow-core/src/airflow/api_fastapi/execution_api/versions/__init__.py

@@ -38,7 +38,6 @@
     MakeDagRunStartDateNullable,
     ModifyDeferredTaskKwargsToJsonValue,
     RemoveUpstreamMapIndexesField,
-    ValidateTaskIdentityTokenClaims,
 )
 
 bundle = VersionBundle(
@@ -49,7 +48,6 @@
         ModifyDeferredTaskKwargsToJsonValue,
         RemoveUpstreamMapIndexesField,
         AddNoteField,
-        ValidateTaskIdentityTokenClaims,
     ),
     Version("2025-12-08", MovePreviousRunEndpoint, AddDagRunDetailEndpoint),
     Version("2025-11-07", AddPartitionKeyField),

airflow-core/src/airflow/api_fastapi/execution_api/versions/v2026_03_31.py

@@ -27,15 +27,6 @@
     TIDeferredStatePayload,
     TIRunContext,
 )
-from airflow.api_fastapi.execution_api.datamodels.token import TIToken
-
-
-class ValidateTaskIdentityTokenClaims(VersionChange):
-    """Validate TIToken claims with a typed claims model instead of a raw dict."""
-
-    description = __doc__
-
-    instructions_to_migrate_to_previous_version = (schema(TIToken).field("claims").had(type=dict[str, Any]),)
 
 
 class ModifyDeferredTaskKwargsToJsonValue(VersionChange):

airflow-core/tests/unit/api_fastapi/execution_api/test_security.py

@@ -21,6 +21,7 @@
 import pytest
 from fastapi import APIRouter, FastAPI, Request, Security
 from fastapi.testclient import TestClient
+from pydantic import ValidationError
 
 from airflow.api_fastapi.execution_api.datamodels.token import TIClaims, TIToken, TokenScope
 from airflow.api_fastapi.execution_api.security import ExecutionAPIRoute, _jwt_bearer, require_auth
@@ -33,6 +34,18 @@ def test_defaults_scope_and_retains_extra(self):
         assert claims.scope == "execution"
         assert claims.team == "data"
 
+    def test_rejects_invalid_uuid(self):
+        with pytest.raises(ValidationError) as err:
+            TIClaims(sub="not-a-uuid", exp=0, iat=0, nbf=0)
+
+        assert "UUID" in str(err.value)
+
+    def test_rejects_missing_required_claims(self):
+        with pytest.raises(ValidationError) as err:
+            TIClaims(sub=UUID(int=1), iat=0, nbf=0)
+
+        assert "exp" in str(err.value)
+
 
 class TestExecutionAPIRoute:
     """Unit tests for ExecutionAPIRoute precomputing allowed_token_types from Security scopes."""