From fd55aa00a1d3d09843e848a13e0c04f753b6cc60 Mon Sep 17 00:00:00 2001 From: Rodrigo Berriel Date: Mon, 29 Aug 2022 10:22:29 -0300 Subject: [PATCH 1/2] Add support to OCI Buckets --- .../create-cloud-storage-page/cloud-storage-form.tsx | 2 +- cvat/apps/engine/models.py | 6 +++--- cvat/apps/engine/serializers.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cvat-ui/src/components/create-cloud-storage-page/cloud-storage-form.tsx b/cvat-ui/src/components/create-cloud-storage-page/cloud-storage-form.tsx index 32e1ef82b12c..01f161a6c100 100644 --- a/cvat-ui/src/components/create-cloud-storage-page/cloud-storage-form.tsx +++ b/cvat-ui/src/components/create-cloud-storage-page/cloud-storage-form.tsx @@ -346,7 +346,7 @@ export default function CreateCloudStorageForm(props: Props): JSX.Element { {...internalCommonProps} > setSecretKeyVisibility(true)} onFocus={() => onFocusCredentialsItem('secretKey', 'secret_key')} diff --git a/cvat/apps/engine/models.py b/cvat/apps/engine/models.py index 3f8829352493..bdcde0e5fbfd 100644 --- a/cvat/apps/engine/models.py +++ b/cvat/apps/engine/models.py @@ -743,9 +743,9 @@ class CloudStorage(models.Model): # restrictions: # AWS bucket name, Azure container name - 63, Google bucket name - 63 without dots and 222 with dots # https://cloud.google.com/storage/docs/naming-buckets#requirements - # AWS access key id - 20 - # AWS secret access key - 40 - # AWS temporary session tocken - None + # AWS access key id - 20, Oracle OCI access key id - 40 + # AWS secret access key - 40, Oracle OCI secret key id - 44 + # AWS temporary session token - None # The size of the security token that AWS STS API operations return is not fixed. # We strongly recommend that you make no assumptions about the maximum size. # The typical token size is less than 4096 bytes, but that can vary. diff --git a/cvat/apps/engine/serializers.py b/cvat/apps/engine/serializers.py index 81a06ee8f4fc..5d2bb5076ca0 100644 --- a/cvat/apps/engine/serializers.py +++ b/cvat/apps/engine/serializers.py @@ -1150,8 +1150,8 @@ class Meta: class CloudStorageWriteSerializer(serializers.ModelSerializer): owner = BasicUserSerializer(required=False) session_token = serializers.CharField(max_length=440, allow_blank=True, required=False) - key = serializers.CharField(max_length=20, allow_blank=True, required=False) - secret_key = serializers.CharField(max_length=40, allow_blank=True, required=False) + key = serializers.CharField(max_length=40, allow_blank=True, required=False) + secret_key = serializers.CharField(max_length=44, allow_blank=True, required=False) key_file = serializers.FileField(required=False) account_name = serializers.CharField(max_length=24, allow_blank=True, required=False) manifests = ManifestSerializer(many=True, default=[]) From 0c349342467efc3a51e8d75a6fa7395eefcca4a6 Mon Sep 17 00:00:00 2001 From: Rodrigo Berriel Date: Mon, 29 Aug 2022 10:46:07 -0300 Subject: [PATCH 2/2] Modify CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26b0e63afb07..363842f8f0ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ Skeleton (), () - Added confirmation when remove a track () - [COCO Keypoints](https://cocodataset.org/#keypoints-2020) format support () +- Support for Oracle OCI Buckets () ### Changed - Bumped nuclio version to 1.8.14