Command for moving nodes between namespaces #569
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kazauwa
changed the title
kazauwa
force-pushed
the
362-add-move-command
branch
from
e7c376f
to
62c780a
Compare
kradalby
reviewed
May 1, 2022
cmd/headscale/cli/nodes.go
Outdated
Comment on lines
50
to
60
| moveNodeCmd.Flags().Uint64P("identifier", "i", 0, "Node identifier (ID)") | ||
| err = moveNodeCmd.MarkFlagRequired("identifier") | ||
| if err != nil { | ||
| log.Fatalf(err.Error()) | ||
| } | ||
| moveNodeCmd.Flags().StringP("namespace", "n", "", "New namespace") | ||
| err = moveNodeCmd.MarkFlagRequired("namespace") | ||
| if err != nil { | ||
| log.Fatalf(err.Error()) | ||
| } | ||
| nodeCmd.AddCommand(moveNodeCmd) |
There was a problem hiding this comment.
Suggested change
| moveNodeCmd.Flags().Uint64P("identifier", "i", 0, "Node identifier (ID)") | |
| err = moveNodeCmd.MarkFlagRequired("identifier") | |
| if err != nil { | |
| log.Fatalf(err.Error()) | |
| } | |
| moveNodeCmd.Flags().StringP("namespace", "n", "", "New namespace") | |
| err = moveNodeCmd.MarkFlagRequired("namespace") | |
| if err != nil { | |
| log.Fatalf(err.Error()) | |
| } | |
| nodeCmd.AddCommand(moveNodeCmd) | |
| moveNodeCmd.Flags().Uint64P("identifier", "i", 0, "Node identifier (ID)") | |
| err = moveNodeCmd.MarkFlagRequired("identifier") | |
| if err != nil { | |
| log.Fatalf(err.Error()) | |
| } | |
| moveNodeCmd.Flags().StringP("namespace", "n", "", "New namespace") | |
| err = moveNodeCmd.MarkFlagRequired("namespace") | |
| if err != nil { | |
| log.Fatalf(err.Error()) | |
| } | |
| nodeCmd.AddCommand(moveNodeCmd) |
There was a problem hiding this comment.
Looks good, can you have a look at adding some integration senario as well?
integration_cli_test.go
On it!
|
Alright, the integration test was a lifesaver. Turns out that a machine's namespace wasn't updating properly. |
kradalby
reviewed
May 2, 2022
| err = json.Unmarshal([]byte(moveToNewNSResult), &machine) | ||
| assert.Nil(s.T(), err) | ||
|
|
||
| assert.Equal(s.T(), machine.Namespace, newNamespace) |
There was a problem hiding this comment.
Could you yank the nodes list code from one of the other tests just to verify that we can read it back correctly after move?
kradalby
approved these changes
May 2, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added command for moving nodes between namespaces (see #362)