DS-829: fixed bugs in cyverse_getDataPath

Author: Tony Edgin

playbooks/files/irods/etc/irods/cyverse.re

@@ -268,15 +268,12 @@ cyverse_getDataId(*Path) =
 # RETURNS:
 #  It return the absolute path to the object if it exists, otherwise it returns /
 #
-# XXX: As of iRODS 4.3.1, having `KeyValPair_PI` as a return type causes issues
-#      for dynamic typing
-# cyverse_getDataInfo : forall X in {path string}, X -> `KeyValPair_PI`
-# XXX: ^^^
+cyverse_getDataPath : int -> path
 cyverse_getDataPath(*Id) =
 # XXX - As of iRODS 4.3.1, deferred rules don't propagate ticket information
-# 	let *path = '' in
+# 	let *path = / in
 # 	let *_ = foreach (*rec in SELECT COLL_NAME, DATA_NAME WHERE DATA_ID = '*Id') {
-# 			*path = *rec.COLL_NAME ++ '/' ++ *rec.DATA_NAME;
+# 			*path = /(*rec.COLL_NAME ++ '/' ++ *rec.DATA_NAME);
 # 		} in
 # 	*path
 	let *fmtArg = execCmdArg('%s/%s') in
@@ -287,11 +284,11 @@ cyverse_getDataPath(*Id) =
 		then
 			let *_ = msiGetStderrInExecCmdOut(*resp, *msg) in
 			let *_ = writeLine('serverLog', 'failed to resolve data object *Id: *err (*msg)') in
-			''
+			/
 		else
 			let *_ = msiGetStdoutInExecCmdOut(*resp, *path) in
 			let *path = trimr(*path, '\n') in
-			*path
+			/*path
 # XXX - ^^^
 
 
@@ -306,7 +303,10 @@ cyverse_getDataPath(*Id) =
 #  'ownerZone' holds the authentication zone for the owner. If the data object
 #  doesn't exist, all values are left empty.
 #
-cyverse_getDataInfo : forall X in {path string}, X -> `KeyValPair_PI`
+# XXX: As of iRODS 4.3.1, having `KeyValPair_PI` as a return type causes issues
+#      for dynamic typing
+# cyverse_getDataInfo : forall X in {path string}, X -> `KeyValPair_PI`
+# XXX: ^^^
 cyverse_getDataInfo(*Path) =
 	let *info.'size' = '' in
 	let *info.'type' = '' in

playbooks/files/irods/etc/irods/cyverse_core.re

@@ -1222,7 +1222,7 @@ pep_database_close_finally(*Instance, *Context, *OUT) {
 pep_database_mod_data_obj_meta_post(*Instance, *Context, *OUT, *DataObjInfo, *RegParam) {
 	*handled = false;
 	*logicalPath = if *DataObjInfo.logical_path != ''
-		then *DataObjInfo.logical_path
+		then /*DataObjInfo.logical_path
 		else cyverse_getDataPath(int(*DataObjInfo.data_id));
 # XXX - Because of https://github.com/irods/irods/issues/5540,
 # _cyverse_core_dataObjCreated needs to be called here when not created through file

playbooks/files/irods/etc/irods/cyverse_repl.re

@@ -42,9 +42,9 @@
 _repl_replicate(*Object, *RescName) {
   _repl_logMsg('replicating data object *Object to *RescName');
 
-  *objPath = cyverse_getDataPath(*Object);
+  *objPath = str(cyverse_getDataPath(*Object));
 
-  if (*objPath == '') {
+  if (*objPath == '/') {
     _repl_logMsg('data object *Object no longer exists');
   } else {
     temporaryStorage.cyverse_repl_replicate = 'REPL_FORCED_REPL_RESC';
@@ -89,7 +89,7 @@ _repl_mvReplicas(*Object, *IngestName, *ReplName) {
 
   *dataPath = cyverse_getDataPath(*Object);
 
-  if (*dataPath != '') {
+  if (*dataPath != /) {
     *replFail = false;
 
     if (_repl_replicate(*Object, *IngestName) < 0) {
@@ -112,7 +112,7 @@ _repl_mvReplicas(*Object, *IngestName, *ReplName) {
       *replNum = *rec.DATA_REPL_NUM;
 
       if (!(*rescHier like regex '^(*IngestName|*ReplName)(;.*)?$')) {
-        if (errorcode(msiDataObjTrim(*dataPath, 'null', *replNum, '1', 'null', *status)) < 0) {
+        if (errorcode(msiDataObjTrim(str(*dataPath), 'null', *replNum, '1', 'null', *status)) < 0) {
           _repl_logMsg('failed to trim replica of *Object on *rescHier (*status)');
           *replFail = true;
         }
@@ -132,9 +132,9 @@ _repl_mvReplicas(*Object, *IngestName, *ReplName) {
 _repl_syncReplicas(*Object) {
   _repl_logMsg('syncing replicas of data object *Object');
 
-  *dataPath = cyverse_getDataPath(*Object);
+  *dataPath = str(cyverse_getDataPath(*Object));
 
-  if (*dataPath == '') {
+  if (*dataPath == '/') {
     _repl_logMsg('data object *Object no longer exists');
   } else {
 # XXX - As of iRODS 4.3.1, ticket information doesn't get sent to deferred rules.

playbooks/tests/rules/cyverse.py

@@ -243,13 +243,45 @@ def test_write_only_append_create(self):
         """Verify cyverse_OPEN_FLAG_A_CREATE"""
         self.fn_test('cyverse_OPEN_FLAG_A_CREATE', [], IrodsVal.string('65'))
 
-    @unittest.skip("not implemented")
     def test_read_write_append_create(self):
         """Verify cyverse_OPEN_FLAG_AP_CREATE"""
+        self.fn_test('cyverse_OPEN_FLAG_AP_CREATE', [], IrodsVal.string('66'))
+
+    @unittest.skip("not implemented")
+    def test_repltruncated_openflagr(self):
+        """Test cyverse_replTruncated handling of cyverse_OPEN_FLAG_R"""
+
+    @unittest.skip("not implemented")
+    def test_repltruncated_openflagrp(self):
+        """Test cyverse_replTruncated handling of cyverse_OPEN_FLAG_RP"""
+
+    @unittest.skip("not implemented")
+    def test_repltruncated_openflagw(self):
+        """Test cyverse_replTruncated handling of cyverse_OPEN_FLAG_W"""
+
+    @unittest.skip("not implemented")
+    def test_repltruncated_openflagwcreate(self):
+        """Test cyverse_replTruncated handling of cyverse_OPEN_FLAG_W_CREATE"""
+
+    @unittest.skip("not implemented")
+    def test_repltruncated_openflagwp(self):
+        """Test cyverse_replTruncated handling of cyverse_OPEN_FLAG_WP"""
+
+    @unittest.skip("not implemented")
+    def test_repltruncated_openflagwpcreate(self):
+        """Test cyverse_replTruncated handling of cyverse_OPEN_FLAG_WP_CREATE"""
+
+    @unittest.skip("not implemented")
+    def test_repltruncated_openflaga(self):
+        """Test cyverse_replTruncated handling of cyverse_OPEN_FLAG_A"""
+
+    @unittest.skip("not implemented")
+    def test_repltruncated_openflagacreate(self):
+        """Test cyverse_replTruncated handling of cyverse_OPEN_FLAG_A_CREATE"""
 
     @unittest.skip("not implemented")
-    def test_repltruncated(self):
-        """Test cyverse_replTruncated"""
+    def test_repltruncated_openflagapcreate(self):
+        """Test cyverse_replTruncated handling of cyverse_OPEN_FLAG_AP_CREATE"""
 
 
 class CyverseIscoll(CyverseTestCase):

playbooks/tests/rules/cyverse_core.py

@@ -73,7 +73,7 @@ def verify_msg_logged(self, msg_frag) -> bool:
 
 
 class CyverseCoreMkdataobjsessvarTest(CyverseCoreTestCase):
-    """Tests of  _cyverse_core_mkDataObjSessVar"""
+    """Tests of _cyverse_core_mkDataObjSessVar"""
 
     def test(self):
         """Test it"""
@@ -292,9 +292,13 @@ def test_trash_coll(self):
 class Acdatadeletepolicy(CyverseCoreTestCase):
     """Tests of acDataDeletePolicy"""
 
-    @unittest.skip("not implemented")
     def test_cyverselogic_called(self):
         """Verify that the cyverse_logic.re is called"""
+        objPath = iRODSPath(self.irods.zone, 'home', self.irods.username, 'obj')
+        obj = self.irods.data_objects.create(objPath)
+        obj.unlink(force=True)
+        if not self.verify_msg_logged(f"cyverse_logic_acDataDeletePolicy({objPath})"):
+            self.fail("cyverse_logic_acDataDeletePolicy not called")
 
 
 class Acsetrescschemeforcreate(CyverseCoreTestCase):
@@ -650,10 +654,6 @@ class PepApiStructFileExtAndRegPre(CyverseCoreTestCase):
 class CyverseCorePublicTest(CyverseCoreTestCase):
     """Test the public entities cyverse_core.re rule-base"""
 
-    @unittest.skip("not implemented")
-    def test_acdeletecollbyadmin(self):
-        """Test acDeleteCollByAdmin"""
-
     @unittest.skip("not implemented")
     def test_acdeleteobjbyadminifpresent(self):
         """Test acDeleteObjByAdminIfPresent"""