Skip to content
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

Sets ConfigEntry.Default flag in addition to the ConfigEntry.Source for Kafka versions > V1_1_0_0 #1594

Merged
merged 4 commits into from
Feb 21, 2020
Merged

Sets ConfigEntry.Default flag in addition to the ConfigEntry.Source for Kafka versions > V1_1_0_0 #1594

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a45ea83
Set describeConfigsRequest.Version in ListTopics for consistency with…
sladkoff Jan 31, 2020
26c3bc5
Set ConfigEntry.Default for KafkaVersions > 0
sladkoff Jan 31, 2020
1b5e305
Set ConfigEntry.Source to default for KafkaVersions <= 0 when applicable
sladkoff Jan 31, 2020
1f4a446
Add tests for default flag/source
sladkoff Feb 13, 2020
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
9 changes: 9 additions & 0 deletions admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,15 @@ func (ca *clusterAdmin) ListTopics() (map[string]TopicDetail, error) {
describeConfigsReq := &DescribeConfigsRequest{
Resources: describeConfigsResources,
}

if ca.conf.Version.IsAtLeast(V1_1_0_0) {
describeConfigsReq.Version = 1
}

if ca.conf.Version.IsAtLeast(V2_0_0_0) {
describeConfigsReq.Version = 2
}

describeConfigsResp, err := b.DescribeConfigs(describeConfigsReq)
if err != nil {
return nil, err
Expand Down
4 changes: 4 additions & 0 deletions describe_configs_response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,12 +249,16 @@ func (r *ConfigEntry) decode(pd packetDecoder, version int16) (err error) {
return err
}
r.Default = defaultB
if defaultB {
r.Source = SourceDefault
}
} else {
source, err := pd.getInt8()
if err != nil {
return err
}
r.Source = ConfigSource(source)
r.Default = r.Source == SourceDefault
}

sensitive, err := pd.getBool()
Expand Down