diff --git a/CHANGELOG.md b/CHANGELOG.md index 26b0e63afb074c9fa2e21930083d629e4ea9d823..363842f8f0ef7a352906cab969171e0789c26004 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 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 32e1ef82b12cd3223d9be1e8a73e58a27219c703..01f161a6c10056bad6c8b35295278efa3a0282b7 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 3f8829352493e5c1a728fa9dabaf7ea575f30748..bdcde0e5fbfdf75d8b4f205fee8ff37081838b20 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 81a06ee8f4fc1875e00ca23e0b7605ea732a8559..5d2bb5076ca04e592671980a2f6b516f6556f59b 100644 --- a/cvat/apps/engine/serializers.py +++ b/cvat/apps/engine/serializers.py @@ -1150,8 +1150,8 @@ class CloudStorageReadSerializer(serializers.ModelSerializer): 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=[])