fix irods 4.3 incompatibilities (wip) (#1592)

bihealth · Oct 11, 2023 · e443d0c · e443d0c
1 parent 3183ea7
commit e443d0c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -34,7 +34,8 @@ jobs:
         ports:
           - 6379:6379
       irods:
-        image: ghcr.io/bihealth/irods-docker:4.2.11-1
+        # TODO: Add tests for both 4.2 and 4.3
+        image: ghcr.io/bihealth/irods-docker:4.3.0-1
         env:
           IRODS_AUTHENTICATION_SCHEME: native
           IRODS_DEFAULT_HASH_SCHEME: MD5

diff --git a/taskflowbackend/tasks/irods_tasks.py b/taskflowbackend/tasks/irods_tasks.py
@@ -22,12 +22,12 @@
 
 
 # NOTE: Yes, we really need this for the python irods client
-# TODO: Come up with a more elegant solution..
+# TODO: Update to work with both 4.2 and >=4.3
 ACCESS_CONVERSION = {
-    'read': 'read object',
-    'read object': 'read',
-    'write': 'modify object',
-    'modify object': 'write',
+    'read': 'read_object',  # Changed in iRODS 4.3
+    'read_object': 'read',  # Changed in iRODS 4.3
+    'write': 'modify_object',  # Changed in iRODS 4.3
+    'modify_object': 'write',  # Changed in iRODS 4.3
     'null': 'null',
     'own': 'own',
 }

diff --git a/taskflowbackend/tests/base.py b/taskflowbackend/tests/base.py
@@ -57,9 +57,9 @@
 APP_SETTING_SCOPE_PROJECT = SODAR_CONSTANTS['APP_SETTING_SCOPE_PROJECT']
 
 # Local constants
-IRODS_ACCESS_READ = 'read object'
+IRODS_ACCESS_READ = 'read_object'  # Changed in iRODS 4.3
 IRODS_ACCESS_OWN = 'own'
-IRODS_ACCESS_WRITE = 'modify object'
+IRODS_ACCESS_WRITE = 'modify_object'  # Changed in iRODS 4.3
 IRODS_ACCESS_NULL = 'null'
 IRODS_GROUP_PUBLIC = 'public'
 TICKET_STR = 'ei8iomuDoazeiD2z'

diff --git a/taskflowbackend/tests/test_tasks.py b/taskflowbackend/tests/test_tasks.py
@@ -46,9 +46,9 @@
 
 # NOTE: Yes, we really need this for the python irods client
 TEST_ACCESS_READ_IN = 'read'
-TEST_ACCESS_READ_OUT = 'read object'
+TEST_ACCESS_READ_OUT = 'read_object'  # Changed in iRODS 4.3
 TEST_ACCESS_WRITE_IN = 'write'
-TEST_ACCESS_WRITE_OUT = 'modify object'
+TEST_ACCESS_WRITE_OUT = 'modify_object'  # Changed in iRODS 4.3
 TEST_ACCESS_NULL = 'null'
 
 BATCH_SRC_NAME = 'batch_src'