Address PR comments

Author: pierrejeambrun

airflow-core/src/airflow/api_fastapi/core_api/services/public/connections.py

@@ -61,10 +61,9 @@ def update_orm_from_pydantic(
     ):
         if pydantic_conn.password is None:
             orm_conn.set_password(pydantic_conn.password)
-            return
-
-        merged_password = merge(pydantic_conn.password, orm_conn.password, "password")
-        orm_conn.set_password(merged_password)
+        else:
+            merged_password = merge(pydantic_conn.password, orm_conn.password, "password")
+            orm_conn.set_password(merged_password)
     if (not update_mask and "extra" in pydantic_conn.model_fields_set) or (
         update_mask and "extra" in update_mask
     ):

task-sdk/src/airflow/sdk/execution_time/secrets_masker.py

@@ -350,7 +350,7 @@ def _merge(
                         merged[key] = new_item[key]
                 return merged
 
-            if isinstance(new_item, (list, tuple)) and isinstance(old_item, (list, tuple)):
+            if isinstance(new_item, (list, tuple)) and type(old_item) is type(new_item):
                 merged_list = []
                 for i in range(len(new_item)):
                     if i < len(old_item):

task-sdk/tests/task_sdk/definitions/test_secrets_masker.py

@@ -893,31 +893,6 @@ def test_merge_nested_dictionaries(self):
                 "normal_tuple",
                 {"***", "new_value2", "***"},
             ),
-            # Mixed collections
-            (
-                ["original_item1", "original_item2", "original_item3"],
-                ("new_item1", "new_item2"),
-                None,
-                ("new_item1", "new_item2"),
-            ),
-            (
-                ("original_item1", "original_item2"),
-                ["new_item1", "new_item2", "new_item3", "new_item4"],
-                None,
-                ["new_item1", "new_item2", "new_item3", "new_item4"],
-            ),
-            (
-                ["secret1", "secret2", "secret3"],
-                ("***", "new_secret2", "***"),
-                "password",
-                ("secret1", "new_secret2", "secret3"),
-            ),
-            (
-                ("value1", "value2", "value3"),
-                ["***", "new_value2", "***"],
-                "normal_tuple",
-                ["***", "new_value2", "***"],
-            ),
         ],
     )
     def test_merge_collections(self, old_data, new_data, name, expected):