From a032265e58dbc69fe2c912b50d1590e449ca9ed6 Mon Sep 17 00:00:00 2001 From: Rogger Vasquez Date: Tue, 17 May 2022 13:16:48 -0500 Subject: [PATCH] rpk: fix ipv6 parsing of ParseHostMaybeScheme function --- src/go/rpk/pkg/cli/cmd/redpanda/admin/config/config.go | 2 +- src/go/rpk/pkg/net/hostport.go | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/go/rpk/pkg/cli/cmd/redpanda/admin/config/config.go b/src/go/rpk/pkg/cli/cmd/redpanda/admin/config/config.go index f4c39e4950a7..52c1bcbb5be0 100644 --- a/src/go/rpk/pkg/cli/cmd/redpanda/admin/config/config.go +++ b/src/go/rpk/pkg/cli/cmd/redpanda/admin/config/config.go @@ -163,7 +163,7 @@ failure of enabling each logger is individually printed. cmd.Flags().StringVarP(&level, "level", "l", "debug", "log level to set (error, warn, info, debug, trace)") cmd.Flags().IntVarP(&expirySeconds, "expiry-seconds", "e", 300, "seconds to persist this log level override before redpanda reverts to its previous settings (if 0, persist until shutdown)") - cmd.Flags().StringVar(&host, "host", "", "either an index into admin_api hosts to issue the request to, or a hostname") + cmd.Flags().StringVar(&host, "host", "", "either a hostname or an index into rpk.admin_api.addresses config section to select the hosts to issue the request to") cobra.MarkFlagRequired(cmd.Flags(), "host") return cmd diff --git a/src/go/rpk/pkg/net/hostport.go b/src/go/rpk/pkg/net/hostport.go index 5068e05b6202..4b7e7bf9a4ca 100644 --- a/src/go/rpk/pkg/net/hostport.go +++ b/src/go/rpk/pkg/net/hostport.go @@ -23,7 +23,9 @@ func ParseHostMaybeScheme(h string) (scheme, host string, err error) { return "", "", err } if port != "" { - return scheme, net.JoinHostPort(host, port), nil + // We can return host + port since splitSchemeHostPort already + // ensures an IPV6 host is wrapped in brackets. + return scheme, host + ":" + port, nil } return scheme, host, nil }