fix(controller): fix multiple volumes mount at one dir error (#116)

Author: jianxiaoguo

rootfs/api/serializers.py

@@ -586,17 +586,23 @@ def validate_size(data):
 
     @staticmethod
     def validate_path(data):
+        logger.debug(f"mount validate_path data: {data}")
+        new_data = {}
         for key, value in data.items():
-            if value is None:  # use NoneType to unset an item
-                continue
-
             if not re.match(PROCTYPE_MATCH, key):
                 raise serializers.ValidationError(PROCTYPE_MISMATCH_MSG)
+            if value is None:  # use NoneType to unset an item
+                new_data[key] = value
+                continue
 
             if not re.match(VOLUME_PATH, str(value)):
                 raise serializers.ValidationError(
                     "Volume path format: /path")
-        return data
+            if value.endswith("/"):
+                value = value.rstrip("/")
+            new_data[key] = value
+        logger.debug(f"mount validate_path new_data: {new_data}")
+        return new_data
 
 
 class ResourceSerializer(serializers.ModelSerializer):

rootfs/api/views.py

@@ -269,7 +269,7 @@ def run(self, request, **kwargs):
             raise DryccException("command is a required field")
         volumes = request.data.get('volumes', None)
         if volumes:
-            serializers.VolumeSerializer().validate_path(volumes)
+            volumes = serializers.VolumeSerializer().validate_path(volumes)
         rc, output = app.run(self.request.user, request.data['command'], volumes)
         return Response({'exit_code': rc, 'output': str(output)})
 
@@ -717,6 +717,8 @@ def path(self, request, *args, **kwargs):
         new_path = request.data.get('path')
         if new_path is None:
             raise DryccException("path is a required field")
+        else:
+            new_path = serializers.VolumeSerializer().validate_path(new_path)
         volume = self.get_object()
         container_types = [_ for _ in new_path.keys()
                            if _ not in volume.app.types]
@@ -734,7 +736,7 @@ def path(self, request, *args, **kwargs):
                 if k not in type_paths:
                     type_paths[k] = [v]
                 else:
-                    type_paths[k].append(k)
+                    type_paths[k].append(v)
         repeat_path = [v for k, v in new_path.items() if v in type_paths.get(k, [])]  # noqa
         if repeat_path:
             raise DryccException("path {} is used by another volume".