Skip to content

fix(health): treat nil return from Lua health status script as n/a instead of unknown #28269

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

Open
snorwin wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −8
Open

fix(health): treat nil return from Lua health status script as n/a instead of unknown #28269

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
6 changes: 3 additions & 3 deletions util/lua/health_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ type TestStructure struct {
}

type IndividualTest struct {
InputPath string `yaml:"inputPath"`
HealthStatus health.HealthStatus `yaml:"healthStatus"`
InputPath string `yaml:"inputPath"`
HealthStatus *health.HealthStatus `yaml:"healthStatus"`
}

func getObj(t *testing.T, path string) *unstructured.Unstructured {
Expand Down Expand Up @@ -56,7 +56,7 @@ func TestLuaHealthScript(t *testing.T) {
require.NoError(t, err)
result, err := vm.ExecuteHealthLua(obj, script)
require.NoError(t, err)
assert.Equal(t, &test.HealthStatus, result)
assert.Equal(t, test.HealthStatus, result)
})
}
return nil
Expand Down
2 changes: 1 addition & 1 deletion util/lua/lua.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ func (vm VM) ExecuteHealthLua(obj *unstructured.Unstructured, script string) (*h

return healthStatus, nil
} else if returnValue.Type() == lua.LTNil {
return &health.HealthStatus{}, nil
return nil, nil
}
return nil, fmt.Errorf(incorrectReturnType, "table", returnValue.Type().String())
}
Expand Down
6 changes: 2 additions & 4 deletions util/lua/lua_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,7 @@ func TestNoReturnHealthStatusStatus(t *testing.T) {
vm := VM{}
status, err := vm.ExecuteHealthLua(testObj, validReturnNothingHealthStatusStatus)
require.NoError(t, err)
expectedStatus := &health.HealthStatus{}
assert.Equal(t, expectedStatus, status)
assert.Nil(t, status)
}

const validNilHealthStatusStatus = `local healthStatus = {}
Expand All @@ -168,8 +167,7 @@ func TestNilHealthStatusStatus(t *testing.T) {
vm := VM{}
status, err := vm.ExecuteHealthLua(testObj, validNilHealthStatusStatus)
require.NoError(t, err)
expectedStatus := &health.HealthStatus{}
assert.Equal(t, expectedStatus, status)
assert.Nil(t, status)
}

const validEmptyArrayHealthStatusStatus = `local healthStatus = {}
Expand Down
Loading