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

Fix multiple GCS creation when GOOGLE_APPLICATION_CREDENTIALS is used #5855

Merged
merged 6 commits into from
Mar 27, 2023
Merged

Fix multiple GCS creation when GOOGLE_APPLICATION_CREDENTIALS is used #5855

merged 6 commits into from
Mar 27, 2023

Conversation

Marishka17
Copy link
Contributor

@Marishka17 Marishka17 commented Mar 15, 2023 •
edited
Loading

Motivation and context

Fix #5800
Fix #4533

How has this been tested?

Manually

Checklist

  • I submit my changes into the develop branch
  • I have added a description of my changes into the CHANGELOG file
    - [ ] I have updated the documentation accordingly
    - [ ] I have added tests to cover my changes
  • I have linked related issues (see GitHub docs)
    - [ ] I have increased versions of npm packages if it is necessary
    (cvat-canvas,
    cvat-core,
    cvat-data and
    cvat-ui)

License

  • I submit my code changes under the same MIT License that covers the project.
    Feel free to contact the maintainers if that's a concern.

nmanovic
nmanovic approved these changes Mar 16, 2023
View reviewed changes
Copy link
Contributor

@nmanovic nmanovic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

nmanovic
nmanovic reviewed Mar 16, 2023
View reviewed changes
cvat/apps/engine/models.py Outdated
@@ -826,7 +826,17 @@ class CloudStorage(models.Model):

class Meta:
default_permissions = ()
unique_together = ('provider_type', 'resource', 'credentials')
constraints = [
models.UniqueConstraint(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need these constraints at all? Let's decide.

@Marishka17 Marishka17 changed the title Fix multiple GCS creation when GOOGLE_APPLICATION_CREDENTIALS is used [WIP] Fix multiple GCS creation when GOOGLE_APPLICATION_CREDENTIALS is used Mar 16, 2023
@Marishka17 Marishka17 removed the request for review from SpecLad March 19, 2023 13:49
@Marishka17 Marishka17 changed the title [WIP] Fix multiple GCS creation when GOOGLE_APPLICATION_CREDENTIALS is used Fix multiple GCS creation when GOOGLE_APPLICATION_CREDENTIALS is used Mar 19, 2023
@nmanovic nmanovic merged commit c60053d into develop Mar 27, 2023
@nmanovic nmanovic deleted the mk/fix_issue_5800 branch March 27, 2023 09:43
@SpecLad SpecLad mentioned this pull request Mar 27, 2023
Merged
2 tasks
nmanovic pushed a commit that referenced this pull request Mar 27, 2023
@SpecLad
Resolve migration conflict (#5939)
79c3fbc 
Merging both #4649 and #5855 broke migrations.
mikhail-treskin pushed a commit to retailnext/cvat that referenced this pull request Jul 1, 2023
@Marishka17 @mikhail-treskin
Fix multiple GCS creation when GOOGLE_APPLICATION_CREDENTIALS is used (…
c247283 
…cvat-ai#5855)

Fix cvat-ai#5800
Fix cvat-ai#4533
mikhail-treskin pushed a commit to retailnext/cvat that referenced this pull request Jul 1, 2023
@SpecLad @mikhail-treskin
Resolve migration conflict (cvat-ai#5939)
7af7dc6 
Merging both cvat-ai#4649 and cvat-ai#5855 broke migrations.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nmanovic nmanovic nmanovic approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Cannot create more than two CloudStorages when self-hosting without GCS key_file Same storage already exists
2 participants
@Marishka17 @nmanovic