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.

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

Add support for Cloudflare R2 Buckets #6701

Merged
merged 18 commits into from
Oct 16, 2023
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
### Changed

- Increased max length of secret access key to 64
(<https://github.com/opencv/cvat/pull/6701>)
nmanovic marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ export default function CreateCloudStorageForm(props: Props): JSX.Element {
{...internalCommonProps}
>
<Input.Password
maxLength={44}
maxLength={64}
visibilityToggle={secretKeyVisibility}
onChange={() => setSecretKeyVisibility(true)}
onFocus={() => onFocusCredentialsItem('secretKey', 'secret_key')}
Expand Down
2 changes: 1 addition & 1 deletion cvat/apps/engine/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -1083,7 +1083,7 @@ class CloudStorage(models.Model):
# 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, Oracle OCI access key id - 40
# AWS secret access key - 40, Oracle OCI secret key id - 44
# AWS secret access key - 40, Oracle OCI secret access key - 44, Cloudflare R2 secret access key - 64
# 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.
Expand Down
2 changes: 1 addition & 1 deletion cvat/apps/engine/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -1720,7 +1720,7 @@ 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=40, allow_blank=True, required=False)
secret_key = serializers.CharField(max_length=44, allow_blank=True, required=False)
secret_key = serializers.CharField(max_length=64, 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
4 changes: 2 additions & 2 deletions cvat/schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6546,7 +6546,7 @@ components:
maxLength: 40
secret_key:
type: string
maxLength: 44
maxLength: 64
connection_string:
type: string
maxLength: 440
Expand Down Expand Up @@ -8500,7 +8500,7 @@ components:
maxLength: 40
secret_key:
type: string
maxLength: 44
maxLength: 64
connection_string:
type: string
maxLength: 440
Expand Down
Loading