Edit command #1564
Edit command #1564
Conversation
robbrockbank
force-pushed
the
edit-command
branch
2 times, most recently
from
dfb0916 to
19af050
Compare
|
This was a prototype - that I don't think needs a whole lot to get it production ready. I'm leaving here for now so that if someone wants to take it on they can. There is a TODO list in the edit.go file. |
mgleung
force-pushed
the
edit-command
branch
3 times, most recently
from
cae6614 to
06f3f54
Compare
calicoctl/commands/resources.go
Outdated
| @@ -102,6 +102,18 @@ func convertToSliceOfResources(loaded interface{}) []unversioned.Resource { | |||
| return r | |||
| } | |||
|
|
|||
| func convertToSliceOfResourceObjects(resources []unversioned.Resource) ([]unversioned.ResourceObject, error) { | |||
There was a problem hiding this comment.
I think the method convertToSliceOfResources should actually be convertToSliceOfResourceObjects ... I think that was it's intention - so shouldn't need this separate function.
calicoctl/commands/edit.go
Outdated
| // Assume that that the resources are kept in the same order | ||
| for i, _ := range original { | ||
| if original[i].String() != changed[i].String() { | ||
| return fmt.Errorf("Cannot change metadata fields: %s should match %s", changed[i].String(), original[i].String()) |
There was a problem hiding this comment.
not quite true - you are allowed to change the labels which are a metadata field.
calicoctl/commands/edit.go
Outdated
| @@ -174,9 +169,20 @@ Description: | |||
|
|
|||
| // Convert the file into a set of resources. If this succeeds | |||
| // then it passes validation, so exit this loop. | |||
| var editedObjs []unversioned.ResourceObject | |||
| var prevObjs []unversioned.ResourceObject | |||
| resources, err = resourcemgr.CreateResourcesFromBytes(b) | |||
| if err == nil { | |||
There was a problem hiding this comment.
I think it would be easier to invert this logic to reduce the nesting.
Better I think now to check if err != nil to log a specific log and then continue the loop, eg.
if resources, err = resourcemgr.CreateResourcesFromBytes(b); err != nil {
log
continue
} else if editedObjs, err = convertToSliceOfResourceObjects(resources); err != nil {
log
continue
} else ...
}
break
2af24ce to
186f974
Compare
|
TODO:
|
mgleung
force-pushed
the
edit-command
branch
3 times, most recently
from
b6b26a3 to
6dc39cc
Compare
|
This PR has gotten pretty out of date, and is quite old. I'd love to see this feature added, but for now I'm going to close this. Shout if you'd like to pick it back up! |
Allows for
calicoctl edit X, which opens resource X in an editor and applies changes on-save to the datastore.