Skip to content

Commit ea51772

Browse files
committed
fix(deisctl): don't set SSH tunnel for refresh-units command
1 parent 5f7ac02 commit ea51772

1 file changed

Lines changed: 14 additions & 7 deletions

File tree

deisctl/deisctl.go

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func exit(err error, code int) {
2222
os.Exit(code)
2323
}
2424

25-
func setGlobalFlags(args map[string]interface{}) {
25+
func setGlobalFlags(args map[string]interface{}, setTunnel bool) {
2626
fleet.Flags.Endpoint = args["--endpoint"].(string)
2727
fleet.Flags.EtcdKeyPrefix = args["--etcd-key-prefix"].(string)
2828
fleet.Flags.EtcdKeyFile = args["--etcd-keyfile"].(string)
@@ -33,11 +33,13 @@ func setGlobalFlags(args map[string]interface{}) {
3333
fleet.Flags.StrictHostKeyChecking = args["--strict-host-key-checking"].(bool)
3434
timeout, _ := strconv.ParseFloat(args["--request-timeout"].(string), 64)
3535
fleet.Flags.RequestTimeout = timeout
36-
tunnel := args["--tunnel"].(string)
37-
if tunnel != "" {
38-
fleet.Flags.Tunnel = tunnel
39-
} else {
40-
fleet.Flags.Tunnel = os.Getenv("DEISCTL_TUNNEL")
36+
if setTunnel == true {
37+
tunnel := args["--tunnel"].(string)
38+
if tunnel != "" {
39+
fleet.Flags.Tunnel = tunnel
40+
} else {
41+
fleet.Flags.Tunnel = os.Getenv("DEISCTL_TUNNEL")
42+
}
4143
}
4244
}
4345

@@ -88,7 +90,12 @@ Options:
8890
}
8991
command := args["<command>"]
9092
targets := args["<target>"].([]string)
91-
setGlobalFlags(args)
93+
setTunnel := true
94+
// refresh-units doesn't need SSH tunneling
95+
if command == "refresh-units" {
96+
setTunnel = false
97+
}
98+
setGlobalFlags(args, setTunnel)
9299
// construct a client
93100
c, err := client.NewClient("fleet")
94101
if err != nil {

0 commit comments

Comments
 (0)