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

Add a new client / server command to rename CIDR #310

Merged
merged 3 commits into from
Apr 22, 2024
Merged

Add a new client / server command to rename CIDR #310

merged 3 commits into from
Apr 22, 2024

Conversation

skywhale
Copy link
Member

@skywhale skywhale commented Apr 18, 2024 •
edited
Loading

Closes #309

@skywhale
Copy link
Member Author

skywhale commented Apr 18, 2024 •
edited
Loading

I'll add a docker-based test after #311 is merged

I rebased on #311 and added a docker-based test

@skywhale skywhale changed the base branch from main to reorganize-docker-tests April 18, 2024 14:12
@skywhale skywhale force-pushed the add-rename-cidr-command branch 2 times, most recently from b10347e to 4eea832 Compare April 18, 2024 14:58
strohel
strohel approved these changes Apr 18, 2024
View reviewed changes
Copy link
Member

@strohel strohel left a comment

Choose a reason for hiding this comment

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

Oh great! Adding just 2 little technicalities, but approving already.

I was about to ask about making sure that CIDR names are unique, but I see the database takes care of it (same as in peer names), which is good, as that's probably the only non-racy way to check it.

server/src/db/cidr.rs Outdated Show resolved Hide resolved
client/src/main.rs Outdated Show resolved Hide resolved
mcginty
mcginty reviewed Apr 19, 2024
View reviewed changes
Copy link
Collaborator

@mcginty mcginty left a comment

Choose a reason for hiding this comment

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

Looks good! One small copy-pasta typo fix.

shared/src/prompts.rs Show resolved Hide resolved
server/src/main.rs Outdated Show resolved Hide resolved
Base automatically changed from reorganize-docker-tests to main April 22, 2024 12:10
@skywhale @strohel @mcginty
Apply suggestions from code review
bfc575b 
Co-authored-by: Matěj Laitl <[email protected]>
Co-authored-by: Jake McGinty <[email protected]>
@skywhale
Copy link
Member Author

@strohel @mcginty thank you for your review :)

I commited the suggested changes and checked one more time that docker tests succeed for the new test case.

strohel
strohel approved these changes Apr 22, 2024
View reviewed changes
Copy link
Member

@strohel strohel left a comment

Choose a reason for hiding this comment

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

LGTM++

mcginty
mcginty approved these changes Apr 22, 2024
View reviewed changes
Copy link
Collaborator

@mcginty mcginty left a comment

Choose a reason for hiding this comment

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

🙃

@skywhale skywhale merged commit 3c69de4 into main Apr 22, 2024
9 checks passed
@skywhale skywhale deleted the add-rename-cidr-command branch April 22, 2024 21:12
bschwind
bschwind reviewed Apr 24, 2024
View reviewed changes
Copy link
Member

@bschwind bschwind left a comment

Choose a reason for hiding this comment

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

Post-merge LGTM!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bschwind bschwind bschwind left review comments

@mcginty mcginty mcginty approved these changes

@strohel strohel strohel 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.

Add innernet rename-cidr
4 participants
@skywhale @strohel @mcginty @bschwind