Skip to content

Commit 1cab57f

Browse files
author
Enda
authored
fix: misformatted error message (#669)
1 parent 9fb7b8a commit 1cab57f

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

pkg/cmd/kafka/consumergroup/list/list.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ func checkForConsumerGroups(count int, opts *Options, kafkaName string) (hasCoun
180180
if err != nil {
181181
return false, err
182182
}
183-
kafkaNameTmplPair := localize.NewEntry("Name", kafkaName)
183+
kafkaNameTmplPair := localize.NewEntry("InstanceName", kafkaName)
184184
if count == 0 && opts.output == "" {
185185
if opts.topic == "" {
186-
logger.Info(opts.localizer.MustLocalize("kafka.consumerGroup.list.log.info.noConsumerGroups"), kafkaNameTmplPair)
186+
logger.Info(opts.localizer.MustLocalize("kafka.consumerGroup.list.log.info.noConsumerGroups", kafkaNameTmplPair))
187187
} else {
188188
logger.Info(opts.localizer.MustLocalize("kafka.consumerGroup.list.log.info.noConsumerGroupsForTopic"), kafkaNameTmplPair, localize.NewEntry("TopicName", opts.topic))
189189
}

pkg/cmd/kafka/topic/list/list.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ func runCmd(opts *Options) error {
111111
operationTemplatePair := localize.NewEntry("Operation", "list")
112112
switch httpRes.StatusCode {
113113
case 401:
114-
return errors.New(opts.localizer.MustLocalize("kafka.topic.list.common.error.unauthorized", operationTemplatePair))
114+
return errors.New(opts.localizer.MustLocalize("kafka.topic.list.error.unauthorized", operationTemplatePair))
115115
case 403:
116-
return errors.New(opts.localizer.MustLocalize("kafka.topic.list.common.error.forbidden", operationTemplatePair))
116+
return errors.New(opts.localizer.MustLocalize("kafka.topic.list.error.forbidden", operationTemplatePair))
117117
case 500:
118118
return errors.New(opts.localizer.MustLocalize("kafka.topic.common.error.internalServerError"))
119119
case 503:

pkg/httputil/logging_round_tripper.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,18 @@ type LoggingRoundTripper struct {
1515
}
1616

1717
// RoundTrip logs the http request and response in debug mode
18+
// for all errors, where status code >= 400
1819
func (c LoggingRoundTripper) RoundTrip(r *http.Request) (*http.Response, error) {
1920
resp, err := c.Proxied.RoundTrip(r)
2021
if err != nil {
2122
return nil, err
2223
}
2324

25+
// only dump the HTTP request and response for errors
26+
if resp.StatusCode < 400 {
27+
return resp, nil
28+
}
29+
2430
requestDump, err := httputil.DumpRequest(r, true)
2531
if err != nil {
2632
return nil, err

0 commit comments

Comments
 (0)