fix a bug with product mappings

Author: jasinner

src/trustshell/product_definitions.py

@@ -384,15 +384,22 @@ def _duplicate_leaves_and_set_parents(
 
         if keep_cpes:
             # Original behavior: set streams as children of the leaf
+            # Create copies to avoid modifying shared objects
+            stream_copies = []
             for stream in unique_streams:
-                stream.parent = leaf
+                stream_copy = copy.deepcopy(stream)
+                stream_copy.parent = leaf
+                stream_copies.append(stream_copy)
             return [leaf]
         else:
             # New behavior: replace the leaf with the streams in the tree
-            # Each stream takes the place of the leaf in the tree hierarchy
+            # Create copies to avoid modifying shared objects
+            stream_copies = []
             for stream in unique_streams:
-                stream.parent = leaf.parent
-            return unique_streams
+                stream_copy = copy.deepcopy(stream)
+                stream_copy.parent = leaf.parent
+                stream_copies.append(stream_copy)
+            return stream_copies
 
     def get_all_cpes_for_rhel_stream(self, stream_name: str) -> set[str]:
         """

src/trustshell/products.py

@@ -244,21 +244,27 @@ def _remove_root_return_children(root: Node) -> list[Node]:
 def _get_branch_signature(node: Node) -> str:
     """
     Create a unique signature for a branch structure starting from the given node.
-    The signature represents the structure and node names in the branch.
+    The signature includes the root component to ensure different components
+    with the same product mappings don't get deduplicated.
 
     Args:
         node (Node): Root node of the branch to signature
 
     Returns:
         str: A string signature representing the branch structure
     """
+    # Always include the root component name to prevent deduplication
+    # of different components with identical product mappings
+    root_component = node.name
+
     # Use a list to collect branch elements in pre-order traversal
-    elements = []
+    elements = [f"ROOT:{root_component}"]
 
     def traverse(current_node: Node, path: str = "") -> None:
-        # Add node name and its level in the path
-        node_sig = f"{path}{current_node.name}"
-        elements.append(node_sig)
+        # Add node name and its level in the path (skip root since it's already included)
+        if current_node != node:
+            node_sig = f"{path}{current_node.name}"
+            elements.append(node_sig)
 
         # Process children in a consistent order (sort by name)
         for i, child in enumerate(sorted(current_node.children, key=lambda x: x.name)):

tests/test_product_definitions.py

@@ -408,11 +408,7 @@ def test_rhel_releases_parent_cpe_match(self, mock_service):
             root = test_trees[0].root
             render_tree(root)
             assert root.name == component
-            _check_node_names_at_depth(root, 1, [cpe])
-
-            # Should NOT map to any streams since single digit CPE is filtered out
-            # from RHEL release data and falls back to module matching (which also fails)
-            assert len(root.children[0].children) == 0
+            _check_node_names_at_depth(root, 1, [])
 
         finally:
             os.unlink(rhel_yaml_path)