Merge pull request #73 from CanDIG/daisieh/program

DIG-1522: change cohort to program
CanDIG · Nov 25, 2024 · ee6c84c · ee6c84c
2 parents b108b13 + 2395faa
commit ee6c84c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/defaults/paths.json b/defaults/paths.json
@@ -9,8 +9,8 @@
                 "/htsget/v1/reads/?.*",
                 "/htsget/v1/samples/?.*",
                 "/ga4gh/drs/v1/objects/?.*",
-                "/ga4gh/drs/v1/cohorts/?.*",
-                "/ga4gh/drs/v1/cohorts/?.*/status",
+                "/ga4gh/drs/v1/programs/?.*",
+                "/ga4gh/drs/v1/programs/?.*/status",
                 "/beacon/v2/g_variants/?.*"
             ],
             "post": [

diff --git a/tests/test_opa_permissions.py b/tests/test_opa_permissions.py
@@ -248,7 +248,7 @@ def get_user_datasets():
     return [
         (  # site admin should be able to read all datasets
             "site_admin",
-            {"body": {"path": "/ga4gh/drs/v1/cohorts/", "method": "GET"}},
+            {"body": {"path": "/ga4gh/drs/v1/programs/", "method": "GET"}},
             ["SYNTHETIC-1", "SYNTHETIC-2", "SYNTHETIC-3", "SYNTHETIC-4"],
         ),
         (  # user1 can view the datasets it's a member of
@@ -264,7 +264,7 @@ def get_user_datasets():
         ),
         (
             "dac_user",
-            {"body": {"path": "/ga4gh/drs/v1/cohorts", "method": "GET"}},
+            {"body": {"path": "/ga4gh/drs/v1/programs", "method": "GET"}},
             ["SYNTHETIC-3"],
         ),
     ]
@@ -281,7 +281,7 @@ def get_curation_allowed():
             "site_admin",
             {
                 "body": {
-                  "path": "/ga4gh/drs/v1/cohorts/",
+                  "path": "/ga4gh/drs/v1/programs/",
                   "method": "POST"
                 }
             },
@@ -291,7 +291,7 @@ def get_curation_allowed():
             "user2",
             {
                 "body": {
-                  "path": "/ga4gh/drs/v1/cohorts/",
+                  "path": "/ga4gh/drs/v1/programs/",
                   "method": "POST",
                   "program": "SYNTHETIC-1"
                 }
@@ -302,7 +302,7 @@ def get_curation_allowed():
             "user1",
             {
                 "body": {
-                  "path": "/ga4gh/drs/v1/cohorts/",
+                  "path": "/ga4gh/drs/v1/programs/",
                   "method": "POST",
                   "program": "SYNTHETIC-1"
                 }
@@ -313,7 +313,7 @@ def get_curation_allowed():
             "user1",
             {
                 "body": {
-                  "path": "/ga4gh/drs/v1/cohorts/",
+                  "path": "/ga4gh/drs/v1/programs/",
                   "method": "DELETE",
                   "program": "SYNTHETIC-1"
                 }
@@ -324,7 +324,7 @@ def get_curation_allowed():
             "user1",
             {
                 "body": {
-                  "path": "/ga4gh/drs/v1/cohorts/",
+                  "path": "/ga4gh/drs/v1/programs/",
                   "method": "POST",
                   "program": "SYNTHETIC-2"
                 }