potiuk commented on code in PR #69106:
URL: https://github.com/apache/airflow/pull/69106#discussion_r3507621583
##########
airflow-core/src/airflow/security/permissions.py:
##########
@@ -106,8 +106,10 @@ class ResourceDetails(TypedDict):
def resource_name(dag_id: str, resource: str) -> str:
"""Return the resource name for a DAG id."""
- if dag_id in RESOURCE_DETAILS_MAP.keys():
- return dag_id
+ # NB: do not short-circuit when ``dag_id`` equals a reserved resource name
Review Comment:
Done — dropped the comment. Agreed it read as if it applied to the line
below; with the short-circuit gone the function is self-explanatory.
---
Drafted-by: Claude Code (Opus 4.8); reviewed by @potiuk before posting
##########
airflow-core/tests/unit/security/test_permissions.py:
##########
@@ -0,0 +1,35 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from __future__ import annotations
+
+from airflow.security import permissions
+
+
+def test_resource_name_does_not_collide_with_reserved_resource_names():
Review Comment:
Trimmed it right down to a single assertion. I'd keep this one, though —
`dag_id="DAGs"` is a genuinely valid value that used to resolve to the global
resource, so a one-line guard is cheap insurance against the short-circuit
being reintroduced. Dropped the extra assertions and the verbose comments in
both the core and FAB copies.
---
Drafted-by: Claude Code (Opus 4.8); reviewed by @potiuk before posting
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
