Merge branch 'minio' of github.com:truenas/apps into minio-enterprise

library/common/utils.py

@@ -33,35 +33,50 @@ def func_host_path_with_perms(data: dict, root: dict, perms: dict) -> str:
 
   path = ''
   if data['type'] == 'host_path':
-    if not data.get('host_path_config', {}):
-      throw_error("Host Path Configuration: [host_path_config] must be set")
-    if not data['host_path_config'].get('path', ''):
-      throw_error("Host Path Configuration: [host_path_config.path] must be set")
-    path = data['host_path_config']['path']
+    path = process_host_path(data, root, perms)
   elif data['type'] == 'ix_volume':
+    path = process_ix_volume(data, root)
+  else:
+    throw_error(f"Type [{data['type']}] is not supported")
+
+  os.makedirs(path, exist_ok=True)
+
+  # FIXME: only do such things if user agreed or if its ixVolumes
+  if perms.get('user') and perms.get('group'):
+    # Set permissions
+    os.chown(path, int(perms['user']), int(perms['group']))
+
+  return path
+
+def process_ix_volume(data: dict, root: dict) -> dict:
+    path = ''
     if not data.get('ix_volume_config', {}):
       throw_error("IX Volume Configuration: [ix_volume_config] must be set")
+
     if not data['ix_volume_config'].get('dataset_name', ''):
       throw_error("IX Volume Configuration: [ix_volume_config.dataset_name] must be set")
+
     if not root.get('ixVolumes', []):
       throw_error("IX Volume Configuration: [ixVolumes] must be set")
+
     for item in root['ixVolumes']:
       if not item.get('hostPath', ''):
         throw_error("IX Volume Configuration: [ixVolumes] item must contain [hostPath]")
+
       if item['hostPath'].split('/')[-1] == data['ix_volume_config']['dataset_name']:
         path = item['hostPath']
         break
+
     if not path:
       throw_error(f"IX Volume Configuration: [ixVolumes] does not contain dataset with name [{data['ix_volume_config']['dataset_name']}]")
-  else:
-    throw_error(f"Type [{data['type']}] is not supported")
 
+    return path
 
-  os.makedirs(path, exist_ok=True)
+def process_host_path(data: dict, root: dict, perms: dict) -> str:
+    if not data.get('host_path_config', {}):
+      throw_error("Host Path Configuration: [host_path_config] must be set")
 
-  # FIXME: only do such things if user agreed or if its ixVolumes
-  if perms.get('user') and perms.get('group'):
-    # Set permissions
-    os.chown(path, int(perms['user']), int(perms['group']))
+    if not data['host_path_config'].get('path', ''):
+      throw_error("Host Path Configuration: [host_path_config.path] must be set")
 
-  return path
+    return data['host_path_config']['path']