Explicitily fail instead of returning null if cannot parse resource link (#41353)

* explicitly fail if collection id is None

* remove unnecessary casting

* add test

Author: tvaron3

sdk/cosmos/azure-cosmos/azure/cosmos/_base.py

@@ -346,7 +346,7 @@ def GetHeaders(  # pylint: disable=too-many-statements,too-many-branches
     return headers
 
 
-def GetResourceIdOrFullNameFromLink(resource_link: str) -> Optional[str]:
+def GetResourceIdOrFullNameFromLink(resource_link: str) -> str:
     """Gets resource id or full name from resource link.
 
     :param str resource_link:
@@ -379,7 +379,7 @@ def GetResourceIdOrFullNameFromLink(resource_link: str) -> Optional[str]:
         # request in form
         # /[resourceType]/[resourceId]/ .... /[resourceType]/[resourceId]/.
         return str(path_parts[-2])
-    return None
+    raise ValueError("Failed Parsing ResourceID from link: {0}".format(resource_link))
 
 
 def GenerateGuidId() -> str:

sdk/cosmos/azure-cosmos/azure/cosmos/_routing/aio/routing_map_provider.py

@@ -61,7 +61,7 @@ async def get_overlapping_ranges(self, collection_link, partition_key_ranges, fe
         :rtype: list
         """
         collection_id = _base.GetResourceIdOrFullNameFromLink(collection_link)
-        await self.init_collection_routing_map_if_needed(collection_link, str(collection_id), feed_options, **kwargs)
+        await self.init_collection_routing_map_if_needed(collection_link, collection_id, feed_options, **kwargs)
 
         return self._collection_routing_map_by_item[collection_id].get_overlapping_ranges(partition_key_ranges)
 
@@ -94,7 +94,7 @@ async def get_range_by_partition_key_range_id(
             **kwargs: Dict[str, Any]
     ) -> Optional[Dict[str, Any]]:
         collection_id = _base.GetResourceIdOrFullNameFromLink(collection_link)
-        await self.init_collection_routing_map_if_needed(collection_link, str(collection_id), **kwargs)
+        await self.init_collection_routing_map_if_needed(collection_link, collection_id, **kwargs)
 
         return self._collection_routing_map_by_item[collection_id].get_range_by_partition_key_range_id(
             partition_key_range_id)

sdk/cosmos/azure-cosmos/azure/cosmos/_routing/routing_map_provider.py

@@ -83,7 +83,7 @@ def get_overlapping_ranges(self, collection_link, partition_key_ranges, feed_opt
         :rtype: list
         """
         collection_id = _base.GetResourceIdOrFullNameFromLink(collection_link)
-        self.init_collection_routing_map_if_needed(collection_link, str(collection_id), feed_options, **kwargs)
+        self.init_collection_routing_map_if_needed(collection_link, collection_id, feed_options, **kwargs)
 
         return self._collection_routing_map_by_item[collection_id].get_overlapping_ranges(partition_key_ranges)
 
@@ -94,7 +94,7 @@ def get_range_by_partition_key_range_id(
             **kwargs: Dict[str, Any]
     ) -> Optional[Dict[str, Any]]:
         collection_id = _base.GetResourceIdOrFullNameFromLink(collection_link)
-        self.init_collection_routing_map_if_needed(collection_link, str(collection_id), **kwargs)
+        self.init_collection_routing_map_if_needed(collection_link, collection_id, **kwargs)
 
         return (self._collection_routing_map_by_item[collection_id]
                 .get_range_by_partition_key_range_id(partition_key_range_id))

sdk/cosmos/azure-cosmos/tests/test_base_unit.py

@@ -16,3 +16,10 @@ def test_is_name_based(self):
         # This is a database name that ran into 'Incorrect padding'
         # exception within base.IsNameBased function
         self.assertTrue(base.IsNameBased("dbs/paas_cmr"))
+
+    def test_collection_id(self):
+        # correctly formatted link
+        assert base.GetResourceIdOrFullNameFromLink("dbs/xjwmAA==/colls/1234") == "1234"
+        # incorrectly formatted link should raise ValueError
+        with pytest.raises(ValueError):
+            base.GetResourceIdOrFullNameFromLink("db/xjwmAA==/coll/")