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

Extend VBase clients with conflict handler endpoints #1235

Open
wants to merge 2 commits into
base: 2.x
Choose a base branch
from

Conversation

vitorflg
Copy link
Contributor

@vitorflg vitorflg commented Oct 3, 2024

What is the purpose of this pull request?

  • Extend the VBase client to have more options to handle conflicts

What problem is this solving?

Slack thread

How should this be manually tested?

  • You can test it yarn linking all dependencies(@vtex/api, this module, and the cli-plugin-workspace), and running with the alias:
    vtex-test promote After that, listing to conflicts should return an empty array.

Screenshots or example usage

Types of changes

  • Bug fix (a non-breaking change which fixes an issue)
  • New feature (a non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Requires change to documentation, which has been updated accordingly.

src/api/clients/IOClients/infra/VBase.ts Outdated Show resolved Hide resolved
Copy link
Contributor

@filafb filafb left a comment

Choose a reason for hiding this comment

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

The changed required here is just the target branch, which should be main, not 2.x.

This VBase client is very specific for managing buckets and files for pages-graphql. In the new content structure, will this client still be needed or changed in any way?

src/api/clients/IOClients/infra/VBase.ts Outdated Show resolved Hide resolved
src/api/clients/IOClients/infra/VBase.ts Show resolved Hide resolved
@vitorflg vitorflg requested a review from filafb October 10, 2024 14:25
@vitorflg vitorflg changed the base branch from 2.x to main October 10, 2024 14:26
@vitorflg vitorflg changed the base branch from main to 2.x October 10, 2024 14:26
@vitorflg
Copy link
Contributor Author

The changed required here is just the target branch, which should be main, not 2.x.

This VBase client is very specific for managing buckets and files for pages-graphql. In the new content structure, will this client still be needed or changed in any way?

It will be needed and we won't have to change it! I created another PR with main as base: #1236

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants