From 40dc2a9fde096b21fe1fb7f760192020e0aab2c8 Mon Sep 17 00:00:00 2001 From: Maria Khrustaleva Date: Tue, 9 Jan 2024 14:37:13 +0100 Subject: [PATCH] Fix updating Azure connection string && increase credentials max_length (#7336) --- ...maria_fix_issue_with_azure_connection_str.md | 4 ++++ .../cloud-storage-form.tsx | 2 +- .../0078_alter_cloudstorage_credentials.py | 17 +++++++++++++++++ cvat/apps/engine/models.py | 2 +- cvat/apps/engine/serializers.py | 4 ++-- cvat/schema.yml | 4 ++-- 6 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 changelog.d/20240109_115955_maria_fix_issue_with_azure_connection_str.md create mode 100644 cvat/apps/engine/migrations/0078_alter_cloudstorage_credentials.py diff --git a/changelog.d/20240109_115955_maria_fix_issue_with_azure_connection_str.md b/changelog.d/20240109_115955_maria_fix_issue_with_azure_connection_str.md new file mode 100644 index 00000000000..ebe4e3a6816 --- /dev/null +++ b/changelog.d/20240109_115955_maria_fix_issue_with_azure_connection_str.md @@ -0,0 +1,4 @@ +### Fixed + +- Updating cloud storage attached to CVAT using Azure connection string + () 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 0f08ba8a85f..ac70b0cd50d 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 @@ -430,7 +430,7 @@ export default function CreateCloudStorageForm(props: Props): JSX.Element { {...internalCommonProps} > setConnectionStringVisibility(true)} /> diff --git a/cvat/apps/engine/migrations/0078_alter_cloudstorage_credentials.py b/cvat/apps/engine/migrations/0078_alter_cloudstorage_credentials.py new file mode 100644 index 00000000000..8218df7b5f9 --- /dev/null +++ b/cvat/apps/engine/migrations/0078_alter_cloudstorage_credentials.py @@ -0,0 +1,17 @@ +# Generated by Django 4.2.6 on 2024-01-09 09:55 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("engine", "0077_auto_20231121_1952"), + ] + + operations = [ + migrations.AlterField( + model_name="cloudstorage", + name="credentials", + field=models.CharField(blank=True, max_length=1024, null=True), + ), + ] diff --git a/cvat/apps/engine/models.py b/cvat/apps/engine/models.py index 0ed04d442a0..53d2ed55a55 100644 --- a/cvat/apps/engine/models.py +++ b/cvat/apps/engine/models.py @@ -1092,7 +1092,7 @@ class CloudStorage(models.Model): on_delete=models.SET_NULL, related_name="cloud_storages") created_date = models.DateTimeField(auto_now_add=True) updated_date = models.DateTimeField(auto_now=True) - credentials = models.CharField(max_length=500, null=True, blank=True) + credentials = models.CharField(max_length=1024, null=True, blank=True) credentials_type = models.CharField(max_length=29, choices=CredentialsTypeChoice.choices())#auth_type specific_attributes = models.CharField(max_length=1024, blank=True) description = models.TextField(blank=True) diff --git a/cvat/apps/engine/serializers.py b/cvat/apps/engine/serializers.py index fae48a5283d..431a2c45be4 100644 --- a/cvat/apps/engine/serializers.py +++ b/cvat/apps/engine/serializers.py @@ -1765,7 +1765,7 @@ class CloudStorageWriteSerializer(serializers.ModelSerializer): key_file = serializers.FileField(required=False) account_name = serializers.CharField(max_length=24, allow_blank=True, required=False) manifests = ManifestSerializer(many=True, default=[]) - connection_string = serializers.CharField(max_length=440, allow_blank=True, required=False) + connection_string = serializers.CharField(max_length=1024, allow_blank=True, required=False) class Meta: model = models.CloudStorage @@ -1925,7 +1925,7 @@ def update(self, instance, validated_data): }) credentials_dict = {k:v for k,v in validated_data.items() if k in { 'key','secret_key', 'account_name', 'session_token', 'key_file_path', - 'credentials_type' + 'credentials_type', 'connection_string' }} key_file = validated_data.pop('key_file', None) diff --git a/cvat/schema.yml b/cvat/schema.yml index 82d361623f1..519f931865c 100644 --- a/cvat/schema.yml +++ b/cvat/schema.yml @@ -6584,7 +6584,7 @@ components: maxLength: 64 connection_string: type: string - maxLength: 440 + maxLength: 1024 key_file: type: string format: binary @@ -8570,7 +8570,7 @@ components: maxLength: 64 connection_string: type: string - maxLength: 440 + maxLength: 1024 key_file: type: string format: binary