vendor: github.com/spf13/pflag v1.0.6, remove local IPNetSliceVar fork #5817
Conversation
- Add exported functions to preserve pkg/flag compatibility - Add IPNetSlice and unit tests - Revert the local fork added in 80a2256, which was pending the upstream feature to be shipped in a release. full diff: spf13/pflag@v1.0.5...v1.0.6 Revert "Swarm init: use local IPNetSliceValue" This reverts commit 80a2256. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
added
status/2-code-review
kind/refactor
There was a problem hiding this comment.
I was hoping putting them in the same commit would make git / github show this as a lateral move, as they were mostly identical originally, but possibly som changes were made after to make them different enough to not being shown as a "move" 🤷
There was a problem hiding this comment.
Ah, probably because I used a minimal fork, and didn't include everything, that would explain
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #5817 +/- ##
==========================================
- Coverage 59.28% 59.25% -0.03%
==========================================
Files 353 352 -1
Lines 29550 29496 -54
==========================================
- Hits 17518 17479 -39
+ Misses 11052 11042 -10
+ Partials 980 975 -5 |
| @@ -57,7 +57,7 @@ func newInitCommand(dockerCli command.Cli) *cobra.Command { | |||
| flags.BoolVar(&opts.forceNewCluster, "force-new-cluster", false, "Force create a new cluster from current state") | |||
| flags.BoolVar(&opts.autolock, flagAutolock, false, "Enable manager autolocking (requiring an unlock key to start a stopped manager)") | |||
| flags.StringVar(&opts.availability, flagAvailability, "active", `Availability of the node ("active", "pause", "drain")`) | |||
| flags.Var(newIPNetSliceValue([]net.IPNet{}, &opts.defaultAddrPools), flagDefaultAddrPool, "default address pool in CIDR format") | |||
| flags.IPNetSliceVar(&opts.defaultAddrPools, flagDefaultAddrPool, []net.IPNet{}, "default address pool in CIDR format") | |||
There was a problem hiding this comment.
For future self; I wonder if nil vs []net.IPNet{} makes a difference for "default"; this was what we had before we added the fork, so I used that, but wasn't 100% sure if it made a difference.
vendor: github.com/spf13/pflag v1.0.6, remove local IPNetSliceVar fork
full diff: spf13/pflag@v1.0.5...v1.0.6
Revert "Swarm init: use local IPNetSliceValue"
This reverts commit 80a2256.
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)