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 Azure Blob Storage connection string authentication #4649

Merged
merged 21 commits into from
Mar 21, 2023
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
18e4fd2
Add support for Azure Blob Storage connection string authentication
suzusuzu May 20, 2022
9f26d73
Add Connection string document for Azure Blob Authorization type
suzusuzu May 20, 2022
d685623
modify CHANGELOG
suzusuzu May 20, 2022
0647d22
Merge branch 'develop' of https://github.com/openvinotoolkit/cvat int…
suzusuzu Aug 22, 2022
95e852f
Merge branch 'develop' of github.com:opencv/cvat into feature/blob_co…
suzusuzu Aug 30, 2022
10fcd96
Merge branch 'develop' into feature/blob_connection_string
bsekachev Sep 12, 2022
b9dcd85
Merge branch 'develop' of https://github.com/openvinotoolkit/cvat int…
suzusuzu Oct 13, 2022
6986367
Merge branch 'develop' into feature/blob_connection_string
suzusuzu Oct 19, 2022
ccfba07
Merge branch 'develop' into feature/blob_connection_string
nmanovic Nov 17, 2022
dcdeeb3
Merge branch 'develop' into feature/blob_connection_string
nmanovic Dec 10, 2022
a4f2857
Merge branch 'develop' into feature/blob_connection_string
Marishka17 Jan 17, 2023
80abf0e
Merge branch 'develop' into feature/blob_connection_string
nmanovic Jan 18, 2023
e628894
Resolve conflicts
Marishka17 Mar 13, 2023
8923d8c
Fix typo
Marishka17 Mar 13, 2023
a6d2b34
Add migration
Marishka17 Mar 13, 2023
70bfdbc
Apply comments
Marishka17 Mar 13, 2023
e1cd5fd
Merge branch 'develop' into feature/blob_connection_string
Marishka17 Mar 13, 2023
a39212e
Merge branch 'develop' into feature/blob_connection_string
nmanovic Mar 15, 2023
62ad57c
Merge branch 'develop' into feature/blob_connection_string
nmanovic Mar 18, 2023
5cac3d4
Update server schema
Marishka17 Mar 19, 2023
e94ecef
Fix schema
Marishka17 Mar 19, 2023
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
Prev Previous commit
Next Next commit
Update server schema
  • Loading branch information
Marishka17 committed Mar 19, 2023
commit 5cac3d4185cc7320736baaf44208b85e0ec51a7c
40 changes: 9 additions & 31 deletions cvat/schema.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
openapi: 3.0.3
info:
title: CVAT REST API
version: '2.5'
version: 2.5.dev20230318195403
description: REST API for Computer Vision Annotation Tool (CVAT)
termsOfService: https://www.google.com/policies/terms/
contact:
Expand Down Expand Up @@ -417,6 +417,7 @@ paths:
- ACCOUNT_NAME_TOKEN_PAIR
- KEY_FILE_PATH
- ANONYMOUS_ACCESS
- CONNECTION_STRING
- name: filter
required: false
in: query
Expand Down Expand Up @@ -7186,6 +7187,9 @@ components:
secret_key:
type: string
maxLength: 44
connection_string:
type: string
maxLength: 440
key_file:
type: string
format: binary
Expand Down Expand Up @@ -7256,6 +7260,7 @@ components:
- ACCOUNT_NAME_TOKEN_PAIR
- KEY_FILE_PATH
- ANONYMOUS_ACCESS
- CONNECTION_STRING
type: string
DataMetaRead:
type: object
Expand Down Expand Up @@ -7298,25 +7303,17 @@ components:
properties:
chunk_size:
type: integer
maximum: 2147483647
minimum: 0
nullable: true
size:
type: integer
maximum: 2147483647
minimum: 0
image_quality:
type: integer
maximum: 100
minimum: 0
start_frame:
type: integer
maximum: 2147483647
minimum: 0
stop_frame:
type: integer
maximum: 2147483647
minimum: 0
frame_filter:
type: string
maxLength: 256
Expand Down Expand Up @@ -7725,8 +7722,6 @@ components:
properties:
frame:
type: integer
maximum: 2147483647
minimum: 0
position:
type: array
items:
Expand Down Expand Up @@ -7809,18 +7804,12 @@ components:
readOnly: true
start_frame:
type: integer
maximum: 2147483647
minimum: -2147483648
readOnly: true
stop_frame:
type: integer
maximum: 2147483647
minimum: -2147483648
readOnly: true
data_chunk_size:
type: integer
maximum: 2147483647
minimum: 0
nullable: true
readOnly: true
data_compressed_chunk_type:
Expand Down Expand Up @@ -8651,6 +8640,9 @@ components:
secret_key:
type: string
maxLength: 44
connection_string:
type: string
maxLength: 440
key_file:
type: string
format: binary
Expand Down Expand Up @@ -9188,8 +9180,6 @@ components:
$ref: '#/components/schemas/LocationEnum'
cloud_storage_id:
type: integer
maximum: 2147483647
minimum: -2147483648
nullable: true
StorageMethod:
enum:
Expand All @@ -9203,8 +9193,6 @@ components:
$ref: '#/components/schemas/LocationEnum'
cloud_storage_id:
type: integer
maximum: 2147483647
minimum: -2147483648
nullable: true
StorageType:
enum:
Expand Down Expand Up @@ -9497,8 +9485,6 @@ components:
readOnly: true
data_chunk_size:
type: integer
maximum: 2147483647
minimum: 0
nullable: true
readOnly: true
data_compressed_chunk_type:
Expand All @@ -9511,13 +9497,9 @@ components:
readOnly: true
size:
type: integer
maximum: 2147483647
minimum: 0
readOnly: true
image_quality:
type: integer
maximum: 32767
minimum: 0
readOnly: true
data:
type: integer
Expand Down Expand Up @@ -9569,13 +9551,9 @@ components:
maxLength: 2000
overlap:
type: integer
maximum: 2147483647
minimum: 0
nullable: true
segment_size:
type: integer
maximum: 2147483647
minimum: 0
labels:
type: array
items:
Expand Down