feat: support new versioned TRS URI format

See PR: ga4gh/tool-registry-service-schemas#202
elixir-cloud-aai · Nov 11, 2021 · 2fbb0d8 · 2fbb0d8
1 parent e8ed145
commit 2fbb0d8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tests/test_client.py b/tests/test_client.py
@@ -34,7 +34,7 @@
 MOCK_ID_INVALID = "N0T VAL!D"
 MOCK_TEXT_PLAIN = "SOME TEXT"
 MOCK_TRS_URI = f"trs://{MOCK_DOMAIN}/{MOCK_ID}"
-MOCK_TRS_URI_VERSIONED = f"trs://{MOCK_DOMAIN}/{MOCK_ID}/versions/{MOCK_ID}"
+MOCK_TRS_URI_VERSIONED = f"trs://{MOCK_DOMAIN}/{MOCK_ID}/{MOCK_ID}"
 MOCK_TOKEN = "MyT0k3n"
 MOCK_DESCRIPTOR = "CWL"
 MOCK_RESPONSE_INVALID = {"not": "valid"}

diff --git a/trs_cli/client.py b/trs_cli/client.py
@@ -85,7 +85,7 @@ class TRSClient():
     )
     _RE_TRS_URI_OR_TOOL_ID = (
         rf"^(trs:\/\/{_RE_DOMAIN}\/)?(?P<tool_id>{_RE_TRS_ID})"
-        rf"(\/versions\/(?P<version_id>{_RE_TRS_ID}))?$"
+        rf"(\/(?P<version_id>{_RE_TRS_ID}))?$"
     )
 
     # class configuration variables