From a38bb1b19423e50b84fe359ab2047074237e139a Mon Sep 17 00:00:00 2001 From: r-vasquez Date: Tue, 29 Oct 2024 16:03:00 -0700 Subject: [PATCH] rpk: wrap license nag message on term size Better readability since it's a long line. (cherry picked from commit 663291e4c72387ca860d55c90b2fe8e563a8333f) --- src/go/rpk/go.mod | 1 + src/go/rpk/go.sum | 1 + src/go/rpk/pkg/adminapi/admin.go | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/src/go/rpk/go.mod b/src/go/rpk/go.mod index 69fa369d17256..798ed733e83c8 100644 --- a/src/go/rpk/go.mod +++ b/src/go/rpk/go.mod @@ -26,6 +26,7 @@ require ( github.com/hamba/avro/v2 v2.25.2 github.com/hashicorp/go-multierror v1.1.1 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 + github.com/kr/text v0.2.0 github.com/lestrrat-go/jwx v1.2.30 github.com/linkedin/goavro/v2 v2.13.0 github.com/lorenzosaino/go-sysctl v0.3.1 diff --git a/src/go/rpk/go.sum b/src/go/rpk/go.sum index 6074ec061dca9..4ba78d0812a37 100644 --- a/src/go/rpk/go.sum +++ b/src/go/rpk/go.sum @@ -43,6 +43,7 @@ github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3 github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= diff --git a/src/go/rpk/pkg/adminapi/admin.go b/src/go/rpk/pkg/adminapi/admin.go index 8bfe6f5d5ed75..b75d1f5309f01 100644 --- a/src/go/rpk/pkg/adminapi/admin.go +++ b/src/go/rpk/pkg/adminapi/admin.go @@ -27,6 +27,8 @@ import ( "time" "github.com/hashicorp/go-multierror" + "github.com/kr/text" + mTerm "github.com/moby/term" "github.com/redpanda-data/redpanda/src/go/rpk/pkg/config" "github.com/redpanda-data/redpanda/src/go/rpk/pkg/net" "github.com/redpanda-data/redpanda/src/go/rpk/pkg/oauth" @@ -718,6 +720,10 @@ func licenseFeatureChecks(ctx context.Context, fs afero.Fs, cl *AdminAPI, p *con } } } + if ws, err := mTerm.GetWinsize(0); err == nil { + // text.Wrap removes the newline from the text. We add it back. + msg = "\n" + text.Wrap(msg, int(ws.Width)) + "\n" + } return msg }