bug fix for get_resource_id

src/scvmm/azext_scvmm/scvmm_utils.py

@@ -57,13 +57,14 @@ def get_resource_id(
     if name is None and not kwargs:
         return None
 
-    removed_keys_from_parsed_resource_id = [
-        "last_child_num",
-        "resource_parent",
-        "resource_namespace",
-        "resource_type",
-        "resource_name",
-    ]
+    selected_keys = {
+        "subscription", "resource_group", "namespace", "type", "name"
+    }
+    selected_key_prefixes = {
+        "child_type_",
+        "child_name_",
+        "child_namespace_",
+    }
 
     def process_resource_name(
         rid_parts: dict[str, str],
@@ -84,8 +85,13 @@ def process_resource_name(
             rid_parts[resource_name_key] = resource_name
             return
         child_rid_parts = parse_resource_id(resource_name)
-        for key in removed_keys_from_parsed_resource_id:
-            child_rid_parts.pop(key, None)
+        child_rid_parts_keys = list(child_rid_parts.keys())
+        for key in child_rid_parts_keys:
+            if key in selected_keys:
+                continue
+            if any([key.startswith(prefix) for prefix in selected_key_prefixes]):
+                continue
+            child_rid_parts.pop(key)
         child_set = {
             k.lower(): v.lower() for k, v in child_rid_parts.items() if v is not None
         }

src/scvmm/azext_scvmm/scvmm_utils_test.py

@@ -111,6 +111,33 @@ def test_get_resource_id_with_intermediate_id_and_diff_sub_id(self):
         assert result is not None
         self.assertEqual(result.lower(), expected_result.lower())
 
+    def test_get_resource_id_with_multiple_id(self):
+        cmd = self._get_test_cmd()
+
+        inter_res_id = (
+            "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contoso-rg"
+            "/providers/Microsoft.HybridCompute/Machines/contoso-machine"
+            "/providers/Microsoft.ConnectedVMwarevSphere/VirtualMachineInstances/default"
+        )
+
+        res_id = f"{inter_res_id}/guestagents/default"
+
+        result = get_resource_id(
+            cmd,
+            "contoso-rg",
+            "Microsoft.HybridCompute",
+            "Machines",
+            None,
+            child_type_1="VirtualMachineInstances",
+            child_name_1=inter_res_id,
+            child_type_2="guestagents",
+            child_name_2=res_id,
+        )
+
+        expected_result = res_id
+        assert result is not None
+        self.assertEqual(result.lower(), expected_result.lower())
+
     def test_get_resource_id_with_invalid_child_type(self):
         cmd = self._get_test_cmd()