Skip to content

fix: wrap KError into error returned by IncrementalAlterConfig #3352

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
dnwe merged 1 commit into from
Oct 14, 2025
Merged

fix: wrap KError into error returned by IncrementalAlterConfig #3352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,11 +826,12 @@ func (ca *clusterAdmin) IncrementalAlterConfig(resourceType ConfigResourceType,

for _, rspResource := range rsp.Resources {
if rspResource.Name == name {
if rspResource.ErrorMsg != "" {
return errors.New(rspResource.ErrorMsg)
}
if rspResource.ErrorCode != 0 {
return KError(rspResource.ErrorCode)
if rspResource.ErrorCode != int16(ErrNoError) {
err = KError(rspResource.ErrorCode)
if rspResource.ErrorMsg != "" {
err = fmt.Errorf("%w: %s", err, rspResource.ErrorMsg)
}
return err
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions admin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,6 +1072,9 @@ func TestClusterAdminIncrementalAlterConfigWithErrorCode(t *testing.T) {
if err == nil {
t.Fatal(errors.New("ErrorCode present but no Error returned"))
}
if !errors.Is(err, ErrInvalidConfig) {
t.Fatal(errors.New("ErrorCode present but not wrapped into returned error"))
}
}

func TestClusterAdminIncrementalAlterBrokerConfig(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions mockresponses.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,8 +1029,8 @@ func (mr *MockIncrementalAlterConfigsResponseWithErrorCode) For(reqBody versione
res.Resources = append(res.Resources, &AlterConfigsResourceResponse{
Name: r.Name,
Type: r.Type,
ErrorCode: 83,
ErrorMsg: "",
ErrorCode: int16(ErrInvalidConfig),
ErrorMsg: "Invalid value xyz for configuration retention.ms: Not a number of type LONG",
})
}
return res
Expand Down
Loading