Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for Oracle OCI Buckets #4876

Merged
merged 2 commits into from
Sep 5, 2022
Merged

Add support for Oracle OCI Buckets #4876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd55aa0
Add support to OCI Buckets
rodrigoberriel Aug 29, 2022
0c34934
Modify CHANGELOG
rodrigoberriel Aug 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Skeleton (<https://github.com/cvat-ai/cvat/pull/1>), (<https://github.com/opencv
- Added helm chart support for serverless functions and analytics (<https://github.com/cvat-ai/cvat/pull/110>)
- Added confirmation when remove a track (<https://github.com/opencv/cvat/pull/4846>)
- [COCO Keypoints](https://cocodataset.org/#keypoints-2020) format support (<https://github.com/opencv/cvat/pull/4821>)
- Support for Oracle OCI Buckets (<https://github.com/opencv/cvat/pull/4876>)

### Changed
- Bumped nuclio version to 1.8.14
Expand Down
2 changes: 1 addition & 1 deletion cvat-ui/src/components/create-cloud-storage-page/cloud-storage-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ export default function CreateCloudStorageForm(props: Props): JSX.Element {
{...internalCommonProps}
>
<Input.Password
maxLength={40}
maxLength={44}
visibilityToggle={secretKeyVisibility}
onChange={() => setSecretKeyVisibility(true)}
onFocus={() => onFocusCredentialsItem('secretKey', 'secret_key')}
Expand Down
6 changes: 3 additions & 3 deletions cvat/apps/engine/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cvat/apps/engine/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=[])
Expand Down