test fix

Author: adamrtalbot

seqerakit/helper.py

@@ -169,7 +169,7 @@ def parse_block(block_name, item):
     overwrite = item.pop("overwrite", None)
     on_exists_str = item.pop("on_exists", "fail")
 
-    # Convert string to enum
+    # Convert string to enum if needed
     if isinstance(on_exists_str, str):
         on_exists_str = on_exists_str.upper()
         try:
@@ -189,14 +189,8 @@ def parse_block(block_name, item):
     # Call the appropriate function and return its result along with on_exists value.
     cmd_args = parse_fn(item)
 
-    # Return both on_exists and overwrite for backward compatibility
-    result = {"cmd_args": cmd_args, "on_exists": on_exists.name.lower()}
-
-    # Set overwrite boolean for test compatibility
-    # If on_exists is 'overwrite', set overwrite to True, otherwise False
-    result["overwrite"] = on_exists == OnExists.OVERWRITE
-
-    return result
+    # Return only the string value of on_exists for test compatibility
+    return {"cmd_args": cmd_args, "on_exists": on_exists.name.lower()}
 
 
 # Parsers for certain blocks of yaml that require handling

seqerakit/overwrite.py

@@ -15,8 +15,8 @@
 import json
 from seqerakit import utils
 from seqerakit.seqeraplatform import ResourceExistsError
-import logging
 from seqerakit.on_exists import OnExists
+import logging
 
 
 class Overwrite:
@@ -49,9 +49,10 @@ def __init__(self, sp):
         sp: A SeqeraPlatform class instance.
 
         Attributes:
-        sp: A SeqeraPlatform class instance.
-        block_jsondata: A dictionary to cache JSON data for resources.
-        block_operations: A dictionary mapping resource types to their operations.
+        sp: A SeqeraPlatform class instance used to execute CLI commands.
+        cached_jsondata: A cached placeholder for JSON data. Default value is None.
+        block_jsondata: A dictionary to store JSON data for each block.
+        Key is the block name, and value is the corresponding JSON data.
         """
         self.sp = sp
         self.cached_jsondata = None
@@ -326,6 +327,7 @@ def _get_json_data(self, block, args, keys_to_get):
                 with self.sp.suppress_output():
                     self.cached_jsondata = json_method(block, "list")
 
+        self.block_jsondata[block] = self.cached_jsondata
         return self.cached_jsondata, sp_args
 
     def check_resource_exists(self, name_key, sp_args):