lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cli: Allow multiples of these args

Browse Source 
We forgot the flag that lets the CLI parser actually let us use
multiples.
This commit is contained in:
James Shubin
2025-06-06 23:53:42 -04:00
parent 1df28c1d00
commit 25263fe9ea
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/deploy.go
View File

@@ -63,7 +63,7 @@ type DeployArgs struct {
// setup for things to work. // setup for things to work.
SSHURL string `arg:"--ssh-url" help:"transport the etcd client connection over SSH to this server"` SSHURL string `arg:"--ssh-url" help:"transport the etcd client connection over SSH to this server"`
Seeds []string `arg:"--seeds,env:MGMT_SEEDS" help:"default etcd client endpoints"` Seeds []string `arg:"--seeds,separate,env:MGMT_SEEDS" help:"default etcd client endpoints"`
Noop bool `arg:"--noop" help:"globally force all resources into no-op mode"` Noop bool `arg:"--noop" help:"globally force all resources into no-op mode"`
Sema int `arg:"--sema" default:"-1" help:"globally add a semaphore to all resources with this lock count"` Sema int `arg:"--sema" default:"-1" help:"globally add a semaphore to all resources with this lock count"`
NoGit bool `arg:"--no-git" help:"don't look at git commit id for safe deploys"` NoGit bool `arg:"--no-git" help:"don't look at git commit id for safe deploys"`

4
cli/util/args.go
View File

@@ -89,7 +89,7 @@ type LangArgs struct {
OnlyUnify bool `arg:"--only-unify" help:"stop after type unification"` OnlyUnify bool `arg:"--only-unify" help:"stop after type unification"`
SkipUnify bool `arg:"--skip-unify" help:"skip type unification"` SkipUnify bool `arg:"--skip-unify" help:"skip type unification"`
UnifySolver *string `arg:"--unify-name" help:"pick a specific unification solver"` UnifySolver *string `arg:"--unify-name" help:"pick a specific unification solver"`
UnifyOptimizations []string `arg:"--unify-optimizations" help:"list of unification optimizations to request (experts only)"` UnifyOptimizations []string `arg:"--unify-optimizations,separate" help:"list of unification optimizations to request (experts only)"`
Depth int `arg:"--depth" default:"-1" help:"max recursion depth limit (-1 is unlimited)"` Depth int `arg:"--depth" default:"-1" help:"max recursion depth limit (-1 is unlimited)"`
@@ -165,7 +165,7 @@ type SetupPkgArgs struct {
type SetupSvcArgs struct { type SetupSvcArgs struct {
BinaryPath string `arg:"--binary-path" help:"path to the binary"` BinaryPath string `arg:"--binary-path" help:"path to the binary"`
SSHURL string `arg:"--ssh-url" help:"transport the etcd client connection over SSH to this server"` SSHURL string `arg:"--ssh-url" help:"transport the etcd client connection over SSH to this server"`
Seeds []string `arg:"--seeds,env:MGMT_SEEDS" help:"default etcd client endpoints"` Seeds []string `arg:"--seeds,separate,env:MGMT_SEEDS" help:"default etcd client endpoints"`
NoServer bool `arg:"--no-server" help:"do not start embedded etcd server (do not promote from client to peer)"` NoServer bool `arg:"--no-server" help:"do not start embedded etcd server (do not promote from client to peer)"`
Install bool `arg:"--install" help:"install the systemd mgmt service"` Install bool `arg:"--install" help:"install the systemd mgmt service"`

4
lang/core/embedded/provisioner/provisioner.go
View File

@@ -89,7 +89,7 @@ type localArgs struct {
Router *string `arg:"--router" help:"router ip for this machine with cidr" func:"cli_router"` // eg: 192.168.42.1/24 Router *string `arg:"--router" help:"router ip for this machine with cidr" func:"cli_router"` // eg: 192.168.42.1/24
// DNS are the list of upstream DNS servers to use during this process. // DNS are the list of upstream DNS servers to use during this process.
DNS []string `arg:"--dns" help:"upstream dns servers to use" func:"cli_dns"` // eg: ["8.8.8.8", "1.1.1.1"] DNS []string `arg:"--dns,separate" help:"upstream dns servers to use" func:"cli_dns"` // eg: ["8.8.8.8", "1.1.1.1"]
// Prefix is a directory to store some provisioner specific state such // Prefix is a directory to store some provisioner specific state such
// as cached distro packages. It can be safely deleted. If you don't // as cached distro packages. It can be safely deleted. If you don't
@@ -165,7 +165,7 @@ type localArgs struct {
// Packages are a list of additional distro packages to install. It's up // Packages are a list of additional distro packages to install. It's up
// to the user to make sure they exist and don't conflict with each // to the user to make sure they exist and don't conflict with each
// other or the base installation packages. // other or the base installation packages.
Packages []string `arg:"--packages" help:"list of additional distro packages to install (comma separated)" func:"cli_packages"` Packages []string `arg:"--packages,separate" help:"list of additional distro packages to install" func:"cli_packages"`
// HandoffCode specifies that we want to handoff to this machine with a // HandoffCode specifies that we want to handoff to this machine with a
// static code deploy bolus. This is useful for isolated, one-time runs. // static code deploy bolus. This is useful for isolated, one-time runs.

10
lib/main.go
View File

@@ -159,24 +159,24 @@ type Config struct {
// Seeds are the list of default etcd client endpoints. If empty, it // Seeds are the list of default etcd client endpoints. If empty, it
// will startup a new server. // will startup a new server.
Seeds []string `arg:"--seeds,env:MGMT_SEEDS" help:"default etcd client endpoints"` Seeds []string `arg:"--seeds,separate,env:MGMT_SEEDS" help:"default etcd client endpoints"`
// ClientURLs are a list of URLs to listen on for client traffic. Ports // ClientURLs are a list of URLs to listen on for client traffic. Ports
// 2379 and 4001 are common. // 2379 and 4001 are common.
ClientURLs []string `arg:"--client-urls,env:MGMT_CLIENT_URLS" help:"list of URLs to listen on for client traffic"` ClientURLs []string `arg:"--client-urls,separate,env:MGMT_CLIENT_URLS" help:"list of URLs to listen on for client traffic"`
// ServerURLs are a list of URLs to listen on for server (peer) traffic. // ServerURLs are a list of URLs to listen on for server (peer) traffic.
// Ports 2380 and 7001 are common. Etcd now uses --peer-urls instead. // Ports 2380 and 7001 are common. Etcd now uses --peer-urls instead.
ServerURLs []string `arg:"--server-urls,env:MGMT_SERVER_URLS" help:"list of URLs to listen on for server (peer) traffic"` ServerURLs []string `arg:"--server-urls,separate,env:MGMT_SERVER_URLS" help:"list of URLs to listen on for server (peer) traffic"`
// AdvertiseClientURLs are a list of URLs to advertise for client // AdvertiseClientURLs are a list of URLs to advertise for client
// traffic. Ports 2379 and 4001 are common. // traffic. Ports 2379 and 4001 are common.
AdvertiseClientURLs []string `arg:"--advertise-client-urls,env:MGMT_ADVERTISE_CLIENT_URLS" help:"list of URLs to listen on for client traffic"` AdvertiseClientURLs []string `arg:"--advertise-client-urls,separate,env:MGMT_ADVERTISE_CLIENT_URLS" help:"list of URLs to listen on for client traffic"`
// AdvertiseServerURLs are a list of URLs to advertise for server (peer) // AdvertiseServerURLs are a list of URLs to advertise for server (peer)
// traffic. Ports 2380 and 7001 are common. Etcd now uses // traffic. Ports 2380 and 7001 are common. Etcd now uses
// --advertise-peer-urls instead. // --advertise-peer-urls instead.
AdvertiseServerURLs []string `arg:"--advertise-server-urls,env:MGMT_ADVERTISE_SERVER_URLS" help:"list of URLs to listen on for server (peer) traffic"` AdvertiseServerURLs []string `arg:"--advertise-server-urls,separate,env:MGMT_ADVERTISE_SERVER_URLS" help:"list of URLs to listen on for server (peer) traffic"`
// IdealClusterSize is the ideal number of server peers in cluster. This // IdealClusterSize is the ideal number of server peers in cluster. This
// value is only read by the initial server. // value is only read by the initial server.