Skip to content

Commit

Permalink
fix: JSON unmarshaling error handling and nil return (#18700)
Browse files Browse the repository at this point in the history
* fix: JSON unmarshaling error handling and nil return in ExecuteHealthLua function

Signed-off-by: Yonatan Sasson <yonatanxd7@gmail.com>

* Update util/lua/lua.go

Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

---------

Signed-off-by: Yonatan Sasson <yonatanxd7@gmail.com>
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
  • Loading branch information
3 people committed Jun 18, 2024
1 parent 9f0d2a8 commit f8e2ca7
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 0 deletions.
9 changes: 9 additions & 0 deletions util/lua/lua.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ import (
"bytes"
"context"
"encoding/json"
"errors"
"fmt"
"os"
"path/filepath"
"reflect"
"time"

"github.com/argoproj/gitops-engine/pkg/health"
Expand Down Expand Up @@ -109,6 +111,11 @@ func (vm VM) ExecuteHealthLua(obj *unstructured.Unstructured, script string) (*h
healthStatus := &health.HealthStatus{}
err = json.Unmarshal(jsonBytes, healthStatus)
if err != nil {
// Validate if the error is caused by an empty object
typeError := &json.UnmarshalTypeError{Value: "array", Type: reflect.TypeOf(healthStatus)}
if errors.As(err, &typeError) {
return &health.HealthStatus{}, nil
}
return nil, err
}
if !isValidHealthStatusCode(healthStatus.Status) {
Expand All @@ -119,6 +126,8 @@ 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, fmt.Errorf(incorrectReturnType, "table", returnValue.Type().String())
}
Expand Down
39 changes: 39 additions & 0 deletions util/lua/lua_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,45 @@ func TestInvalidHealthStatusStatus(t *testing.T) {
assert.Equal(t, expectedStatus, status)
}

const validReturnNothingHealthStatusStatus = `local healthStatus = {}
return
`

func TestNoReturnHealthStatusStatus(t *testing.T) {
testObj := StrToUnstructured(objJSON)
vm := VM{}
status, err := vm.ExecuteHealthLua(testObj, validReturnNothingHealthStatusStatus)
require.NoError(t, err)
expectedStatus := &health.HealthStatus{}
assert.Equal(t, expectedStatus, status)
}

const validNilHealthStatusStatus = `local healthStatus = {}
return nil
`

func TestNilHealthStatusStatus(t *testing.T) {
testObj := StrToUnstructured(objJSON)
vm := VM{}
status, err := vm.ExecuteHealthLua(testObj, validNilHealthStatusStatus)
require.NoError(t, err)
expectedStatus := &health.HealthStatus{}
assert.Equal(t, expectedStatus, status)
}

const validEmptyArrayHealthStatusStatus = `local healthStatus = {}
return healthStatus
`

func TestEmptyHealthStatusStatus(t *testing.T) {
testObj := StrToUnstructured(objJSON)
vm := VM{}
status, err := vm.ExecuteHealthLua(testObj, validEmptyArrayHealthStatusStatus)
require.NoError(t, err)
expectedStatus := &health.HealthStatus{}
assert.Equal(t, expectedStatus, status)
}

const infiniteLoop = `while true do ; end`

func TestHandleInfiniteLoop(t *testing.T) {
Expand Down

0 comments on commit f8e2ca7

Please sign in to comment.