Lee-W commented on code in PR #53943:
URL: https://github.com/apache/airflow/pull/53943#discussion_r2244945619
##########
airflow-core/src/airflow/ui/public/i18n/locales/en/admin.json:
##########
@@ -36,6 +36,7 @@
"extraFields": "Extra Fields",
"extraFieldsJson": "Extra Fields JSON",
"helperText": "Connection type missing? Make sure you have installed the
corresponding Airflow Providers Package.",
+ "helperTextForRedactedFields": "Redacted fields ('***') will remain
unchanged if not modified.",
Review Comment:
cc @RoyLee1224 , @guan404ming @jason810496 , we might need a translation at
a later point
##########
task-sdk/src/airflow/sdk/execution_time/secrets_masker.py:
##########
@@ -292,6 +313,83 @@ def _redact(self, item: Redactable, name: str | None,
depth: int, max_depth: int
)
return item
+ def _merge(
+ self,
+ new_item: Redacted,
+ old_item: Redactable,
+ name: str | None,
+ depth: int,
+ max_depth: int,
+ force_sensitive: bool = False,
+ ) -> Redacted:
+ """Merge a redacted item with its original unredacted counterpart."""
+ if depth > max_depth:
+ if isinstance(new_item, str) and new_item == "***":
+ return old_item
+ return new_item
+
+ try:
+ # Determine if we should treat this as sensitive
+ is_sensitive = force_sensitive or (name is not None and
should_hide_value_for_key(name))
+
+ if isinstance(new_item, dict) and isinstance(old_item, dict):
+ merged = {}
+ for key in new_item.keys():
+ if key in old_item:
+ # For dicts, pass the key as name unless we're in
sensitive mode
+ child_name = None if is_sensitive else key
+ merged[key] = self._merge(
+ new_item[key],
+ old_item[key],
+ name=child_name,
+ depth=depth + 1,
+ max_depth=max_depth,
+ force_sensitive=is_sensitive,
+ )
+ else:
+ merged[key] = new_item[key]
+ return merged
+
+ if isinstance(new_item, (list, tuple)) and type(old_item) is
type(new_item):
+ merged_list = []
+ for i in range(len(new_item)):
Review Comment:
not sure whether we could use
```suggestion
for i, item in enumerate(new_item):
```
##########
task-sdk/src/airflow/sdk/execution_time/secrets_masker.py:
##########
@@ -292,6 +313,83 @@ def _redact(self, item: Redactable, name: str | None,
depth: int, max_depth: int
)
return item
+ def _merge(
+ self,
+ new_item: Redacted,
+ old_item: Redactable,
+ name: str | None,
+ depth: int,
+ max_depth: int,
+ force_sensitive: bool = False,
+ ) -> Redacted:
+ """Merge a redacted item with its original unredacted counterpart."""
+ if depth > max_depth:
+ if isinstance(new_item, str) and new_item == "***":
+ return old_item
+ return new_item
+
+ try:
+ # Determine if we should treat this as sensitive
+ is_sensitive = force_sensitive or (name is not None and
should_hide_value_for_key(name))
+
+ if isinstance(new_item, dict) and isinstance(old_item, dict):
+ merged = {}
+ for key in new_item.keys():
+ if key in old_item:
+ # For dicts, pass the key as name unless we're in
sensitive mode
+ child_name = None if is_sensitive else key
+ merged[key] = self._merge(
+ new_item[key],
+ old_item[key],
+ name=child_name,
+ depth=depth + 1,
+ max_depth=max_depth,
+ force_sensitive=is_sensitive,
+ )
+ else:
+ merged[key] = new_item[key]
+ return merged
+
+ if isinstance(new_item, (list, tuple)) and type(old_item) is
type(new_item):
+ merged_list = []
+ for i in range(len(new_item)):
Review Comment:
```suggestion
for i, _ in enumerate(new_item):
```
--
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]
