Fix swagger specification (#6825)

Resolved #6823
cvat-ai · Sep 11, 2023 · 32647e0 · 32647e0
1 parent c87d05a
commit 32647e0
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - TDB
 
 ### Fixed
+- Invalid input validation in for `cloud_storage_id` (<https://github.com/opencv/cvat/pull/6825>)
 - Incorrect task progress report for 3rdparty users (<https://github.com/opencv/cvat/pull/6834>)
 
 ### Security

diff --git a/cvat/apps/engine/views.py b/cvat/apps/engine/views.py
@@ -303,7 +303,7 @@ def perform_create(self, serializer, **kwargs):
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.STR, required=False,
                 enum=Location.list()),
             OpenApiParameter('cloud_storage_id', description='Storage id',
-                location=OpenApiParameter.QUERY, type=OpenApiTypes.NUMBER, required=False),
+                location=OpenApiParameter.QUERY, type=OpenApiTypes.INT, required=False),
             OpenApiParameter('use_default_location', description='Use the location that was configured in project to import dataset',
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.BOOL, required=False,
                 default=True),
@@ -331,7 +331,7 @@ def perform_create(self, serializer, **kwargs):
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.STR, required=False,
                 enum=Location.list()),
             OpenApiParameter('cloud_storage_id', description='Storage id',
-                location=OpenApiParameter.QUERY, type=OpenApiTypes.NUMBER, required=False),
+                location=OpenApiParameter.QUERY, type=OpenApiTypes.INT, required=False),
             OpenApiParameter('use_default_location', description='Use the location that was configured in the project to import annotations',
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.BOOL, required=False,
                 default=True),
@@ -467,7 +467,7 @@ def upload_finished(self, request):
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.STR, required=False,
                 enum=Location.list()),
             OpenApiParameter('cloud_storage_id', description='Storage id',
-                location=OpenApiParameter.QUERY, type=OpenApiTypes.NUMBER, required=False),
+                location=OpenApiParameter.QUERY, type=OpenApiTypes.INT, required=False),
             OpenApiParameter('use_default_location', description='Use the location that was configured in project to export annotation',
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.BOOL, required=False,
                 default=True),
@@ -506,7 +506,7 @@ def annotations(self, request, pk):
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.STR, required=False,
                 enum=Location.list()),
             OpenApiParameter('cloud_storage_id', description='Storage id',
-                location=OpenApiParameter.QUERY, type=OpenApiTypes.NUMBER, required=False),
+                location=OpenApiParameter.QUERY, type=OpenApiTypes.INT, required=False),
             OpenApiParameter('use_default_location', description='Use the location that was configured in project to export backup',
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.BOOL, required=False,
                 default=True),
@@ -539,7 +539,7 @@ def export_backup(self, request, pk=None):
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.STR, required=False,
                 enum=Location.list(), default=Location.LOCAL),
             OpenApiParameter('cloud_storage_id', description='Storage id',
-                location=OpenApiParameter.QUERY, type=OpenApiTypes.NUMBER, required=False),
+                location=OpenApiParameter.QUERY, type=OpenApiTypes.INT, required=False),
             OpenApiParameter('filename', description='Backup file name',
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.STR, required=False),
             OpenApiParameter('rq_id', description='rq id',
@@ -825,7 +825,7 @@ def get_queryset(self):
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.STR, required=False,
                 enum=Location.list(), default=Location.LOCAL),
             OpenApiParameter('cloud_storage_id', description='Storage id',
-                location=OpenApiParameter.QUERY, type=OpenApiTypes.NUMBER, required=False),
+                location=OpenApiParameter.QUERY, type=OpenApiTypes.INT, required=False),
             OpenApiParameter('filename', description='Backup file name',
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.STR, required=False),
             OpenApiParameter('rq_id', description='rq id',
@@ -862,7 +862,7 @@ def append_backup_chunk(self, request, file_id):
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.STR, required=False,
                 enum=Location.list()),
             OpenApiParameter('cloud_storage_id', description='Storage id',
-                location=OpenApiParameter.QUERY, type=OpenApiTypes.NUMBER, required=False),
+                location=OpenApiParameter.QUERY, type=OpenApiTypes.INT, required=False),
             OpenApiParameter('use_default_location', description='Use the location that was configured in the task to export backup',
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.BOOL, required=False,
                 default=True),
@@ -1213,7 +1213,7 @@ def append_data_chunk(self, request, pk, file_id):
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.STR, required=False,
                 enum=Location.list()),
             OpenApiParameter('cloud_storage_id', description='Storage id',
-                location=OpenApiParameter.QUERY, type=OpenApiTypes.NUMBER, required=False),
+                location=OpenApiParameter.QUERY, type=OpenApiTypes.INT, required=False),
             OpenApiParameter('use_default_location', description='Use the location that was configured in the task to export annotation',
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.BOOL, required=False,
                 default=True),
@@ -1267,7 +1267,7 @@ def append_data_chunk(self, request, pk, file_id):
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.STR, required=False,
                 enum=Location.list()),
             OpenApiParameter('cloud_storage_id', description='Storage id',
-                location=OpenApiParameter.QUERY, type=OpenApiTypes.NUMBER, required=False),
+                location=OpenApiParameter.QUERY, type=OpenApiTypes.INT, required=False),
             OpenApiParameter('use_default_location', description='Use the location that was configured in task to import annotations',
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.BOOL, required=False,
                 default=True),
@@ -1467,7 +1467,7 @@ def metadata(self, request, pk):
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.STR, required=False,
                 enum=Location.list()),
             OpenApiParameter('cloud_storage_id', description='Storage id',
-                location=OpenApiParameter.QUERY, type=OpenApiTypes.NUMBER, required=False),
+                location=OpenApiParameter.QUERY, type=OpenApiTypes.INT, required=False),
         ],
         responses={
             '200': OpenApiResponse(OpenApiTypes.BINARY, description='Download of file started'),
@@ -1652,7 +1652,7 @@ def upload_finished(self, request):
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.STR, required=False,
                 enum=Location.list()),
             OpenApiParameter('cloud_storage_id', description='Storage id',
-                location=OpenApiParameter.QUERY, type=OpenApiTypes.NUMBER, required=False),
+                location=OpenApiParameter.QUERY, type=OpenApiTypes.INT, required=False),
             OpenApiParameter('use_default_location', description='Use the location that was configured in the task to export annotation',
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.BOOL, required=False,
                 default=True),
@@ -1681,7 +1681,7 @@ def upload_finished(self, request):
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.STR, required=False,
                 enum=Location.list()),
             OpenApiParameter('cloud_storage_id', description='Storage id',
-                location=OpenApiParameter.QUERY, type=OpenApiTypes.NUMBER, required=False),
+                location=OpenApiParameter.QUERY, type=OpenApiTypes.INT, required=False),
             OpenApiParameter('use_default_location', description='Use the location that was configured in the task to import annotation',
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.BOOL, required=False,
                 default=True),
@@ -1711,7 +1711,7 @@ def upload_finished(self, request):
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.STR, required=False,
                 enum=Location.list()),
             OpenApiParameter('cloud_storage_id', description='Storage id',
-                location=OpenApiParameter.QUERY, type=OpenApiTypes.NUMBER, required=False),
+                location=OpenApiParameter.QUERY, type=OpenApiTypes.INT, required=False),
             OpenApiParameter('use_default_location', description='Use the location that was configured in the task to import annotation',
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.BOOL, required=False,
                 default=True),
@@ -1832,7 +1832,7 @@ def append_annotations_chunk(self, request, pk, file_id):
                 location=OpenApiParameter.QUERY, type=OpenApiTypes.STR, required=False,
                 enum=Location.list()),
             OpenApiParameter('cloud_storage_id', description='Storage id',
-                location=OpenApiParameter.QUERY, type=OpenApiTypes.NUMBER, required=False),
+                location=OpenApiParameter.QUERY, type=OpenApiTypes.INT, required=False),
         ],
         responses={
             '200': OpenApiResponse(OpenApiTypes.BINARY, description='Download of file started'),

diff --git a/cvat/schema.yml b/cvat/schema.yml
@@ -1944,7 +1944,7 @@ paths:
       - in: query
         name: cloud_storage_id
         schema:
-          type: number
+          type: integer
         description: Storage id
       - in: query
         name: filename
@@ -2013,7 +2013,7 @@ paths:
       - in: query
         name: cloud_storage_id
         schema:
-          type: number
+          type: integer
         description: Storage id
       - in: query
         name: filename
@@ -2090,7 +2090,7 @@ paths:
       - in: query
         name: cloud_storage_id
         schema:
-          type: number
+          type: integer
         description: Storage id
       - in: query
         name: filename
@@ -2335,7 +2335,7 @@ paths:
       - in: query
         name: cloud_storage_id
         schema:
-          type: number
+          type: integer
         description: Storage id
       - in: query
         name: filename
@@ -3347,7 +3347,7 @@ paths:
       - in: query
         name: cloud_storage_id
         schema:
-          type: number
+          type: integer
         description: Storage id
       - in: query
         name: filename
@@ -3422,7 +3422,7 @@ paths:
       - in: query
         name: cloud_storage_id
         schema:
-          type: number
+          type: integer
         description: Storage id
       - in: query
         name: filename
@@ -3489,7 +3489,7 @@ paths:
       - in: query
         name: cloud_storage_id
         schema:
-          type: number
+          type: integer
         description: Storage id
       - in: query
         name: filename
@@ -3564,7 +3564,7 @@ paths:
       - in: query
         name: cloud_storage_id
         schema:
-          type: number
+          type: integer
         description: Storage id
       - in: query
         name: filename
@@ -3676,7 +3676,7 @@ paths:
       - in: query
         name: cloud_storage_id
         schema:
-          type: number
+          type: integer
         description: Storage id
       - in: query
         name: filename
@@ -4631,7 +4631,7 @@ paths:
       - in: query
         name: cloud_storage_id
         schema:
-          type: number
+          type: integer
         description: Storage id
       - in: query
         name: filename
@@ -4702,7 +4702,7 @@ paths:
       - in: query
         name: cloud_storage_id
         schema:
-          type: number
+          type: integer
         description: Storage id
       - in: query
         name: filename
@@ -4896,7 +4896,7 @@ paths:
       - in: query
         name: cloud_storage_id
         schema:
-          type: number
+          type: integer
         description: Storage id
       - in: query
         name: filename
@@ -5155,7 +5155,7 @@ paths:
       - in: query
         name: cloud_storage_id
         schema:
-          type: number
+          type: integer
         description: Storage id
       - in: query
         name: filename
@@ -5291,7 +5291,7 @@ paths:
       - in: query
         name: cloud_storage_id
         schema:
-          type: number
+          type: integer
         description: Storage id
       - in: query
         name: filename