Enhance the robustness about parse bucket (#236)

yanghua · web-flow · commit 0b563819a56c · 2024-10-24T16:59:40.000+08:00
diff --git a/tosfs/tests/test_utils.py b/tosfs/tests/test_utils.py
@@ -23,6 +23,8 @@
     [
         ("bucket/key", ("bucket", "key")),
         ("bucket/", ("bucket", "")),
+        ("tos://bucket/key", ("bucket", "key")),
+        ("tos://bucket/", ("bucket", "")),
         ("/key", ("", "key")),
         ("bucket/key/with/slashes", ("bucket", "key/with/slashes")),
         ("bucket", ("bucket", "")),
diff --git a/tosfs/utils.py b/tosfs/utils.py
@@ -72,6 +72,7 @@ def find_bucket_key(tos_path: str) -> Tuple[str, str]:
             r"^(?P<bucket>:tos-object-lambda:[a-z\-0-9]+:[0-9]{12}:"
             r"accesspoint[/:][a-zA-Z0-9\-]{1,63})[/:]?(?P<key>.*)$"
         ),
+        re.compile(r"^tos://(?P<bucket>[^/]+)/(?P<key>.*)$"),
     ]
     for bucket_format in bucket_format_list:
         match = bucket_format.match(tos_path)

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@`
`23`	`23`	`[`
`24`	`24`	`("bucket/key", ("bucket", "key")),`
`25`	`25`	`("bucket/", ("bucket", "")),`
	`26`	`+ ("tos://bucket/key", ("bucket", "key")),`
	`27`	`+ ("tos://bucket/", ("bucket", "")),`
`26`	`28`	`("/key", ("", "key")),`
`27`	`29`	`("bucket/key/with/slashes", ("bucket", "key/with/slashes")),`
`28`	`30`	`("bucket", ("bucket", "")),`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ def find_bucket_key(tos_path: str) -> Tuple[str, str]:`
`72`	`72`	`r"^(?P<bucket>:tos-object-lambda:[a-z\-0-9]+:[0-9]{12}:"`
`73`	`73`	`r"accesspoint[/:][a-zA-Z0-9\-]{1,63})[/:]?(?P<key>.*)$"`
`74`	`74`	`),`
	`75`	`+ re.compile(r"^tos://(?P<bucket>[^/]+)/(?P<key>.*)$"),`
`75`	`76`	`]`
`76`	`77`	`for bucket_format in bucket_format_list:`
`77`	`78`	`match = bucket_format.match(tos_path)`