Skip to content

fix(kafka update): broken preview #1311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rkpattnaik780 merged 4 commits into from
Nov 12, 2021
Merged

fix(kafka update): broken preview #1311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b18caea
fix(kafka update): broken preview
rkpattnaik780 Nov 11, 2021
336dd0d
fix: change update summary logic
rkpattnaik780 Nov 11, 2021
63ca6d0
fix: get field by name
rkpattnaik780 Nov 12, 2021
58c1860
docs: improve error message
rkpattnaik780 Nov 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions pkg/cmd/kafka/update/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"fmt"
"reflect"
"strconv"
"strings"

"github.com/AlecAivazis/survey/v2"
kafkamgmtclient "github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client"
Expand Down Expand Up @@ -291,10 +292,14 @@ func generateUpdateSummary(new reflect.Value, current reflect.Value) string {
fieldTag := field.Tag.Get("json")
fieldName := field.Name

oldVal := getElementValue(current.FieldByName(fieldName)).String()
newVal := getElementValue(new.FieldByName(fieldName)).String()
oldVal := getElementValue(current.FieldByName(fieldName))
newVal := getUpdateObjValue(new.FieldByName(fieldName))

summary += fmt.Sprintf("%v: %v %v %v\n", color.Bold(fieldTag), oldVal, icon.Emoji("\u27A1", "=>"), newVal)
fieldTagDisp := strings.Split(fieldTag, ",")[0]

if newVal != reflect.ValueOf(nil) {
summary += fmt.Sprintf("%v: %v %v %v\n", color.Bold(fieldTagDisp), oldVal, icon.Emoji("\u27A1", "=>"), newVal)
}
}

return summary
Expand All @@ -308,3 +313,12 @@ func getElementValue(v reflect.Value) reflect.Value {
}
return v
}

// get the true value from a reflect.Value for KafkaUpdateRequest struct
func getUpdateObjValue(v reflect.Value) reflect.Value {
if v.Kind() == reflect.Struct {
vstruct := v.FieldByName("value")
return vstruct.Elem()
}
return v
}
4 changes: 2 additions & 2 deletions pkg/localize/locales/en/cmd/acl.en.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,10 @@ one = 'ACLs created to enable principal to consume messages from topics'
one = '"--group" or "--group-prefix" flag is allowed only when consumer ACLs are to be added'

[kafka.acl.grantPermissions.group.error.required]
one = '"--group" flag is required for consumer operation'
one = '"--group" or "--group-prefix" flag is required for consumer operation'

[kafka.acl.grantPermissions.topic.error.required]
one = '"--topic" flag is required for consumer and producer operations'
one = '"--topic" or "--topic-prefix" flag is required for consumer and producer operations'

[kafka.acl.grantPermissions.prefix.error.notAllowed]
one = 'can not use "--{{.Resource}}-prefix" and "--{{.Resource}}" flag together'
Expand Down