Skip to content
This repository has been archived by the owner on Oct 9, 2023. It is now read-only.

Truncate execution error message only when size exceeds limit #533

Merged
merged 8 commits into from
Mar 6, 2023
Merged

Truncate execution error message only when size exceeds limit #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fdc0893
Bump propeller
pingsutw Mar 4, 2023
be69f2f
Fixed slice bounds out of range
pingsutw Mar 4, 2023
3107bb4
Fixed slice bounds out of range
pingsutw Mar 4, 2023
e02e022
update go.mod
pingsutw Mar 6, 2023
c6022cc
update go.mod
pingsutw Mar 6, 2023
cc2aed1
update
pingsutw Mar 6, 2023
59d5711
Add tests
pingsutw Mar 6, 2023
2e7f90d
lint
pingsutw Mar 6, 2023
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
4 changes: 3 additions & 1 deletion pkg/repositories/transformers/execution.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,9 @@ func FromExecutionModel(executionModel models.Execution, opts *ExecutionTransfor
}
if closure.GetError() != nil && opts != nil && opts.TrimErrorMessage && len(closure.GetError().Message) > 0 {
trimmedErrOutputResult := closure.GetError()
trimmedErrOutputResult.Message = trimmedErrOutputResult.Message[0:trimmedErrMessageLen]
if len(trimmedErrOutputResult.Message) > trimmedErrMessageLen {
trimmedErrOutputResult.Message = trimmedErrOutputResult.Message[0:trimmedErrMessageLen]
}
closure.OutputResult = &admin.ExecutionClosure_Error{
Error: trimmedErrOutputResult,
}
Expand Down
4 changes: 3 additions & 1 deletion pkg/repositories/transformers/node_execution.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,9 @@ func FromNodeExecutionModel(nodeExecutionModel models.NodeExecution, opts *Execu
}
if closure.GetError() != nil && opts != nil && opts.TrimErrorMessage && len(closure.GetError().Message) > 0 {
trimmedErrOutputResult := closure.GetError()
trimmedErrOutputResult.Message = trimmedErrOutputResult.Message[0:trimmedErrMessageLen]
if len(trimmedErrOutputResult.Message) > trimmedErrMessageLen {
trimmedErrOutputResult.Message = trimmedErrOutputResult.Message[0:trimmedErrMessageLen]
}
closure.OutputResult = &admin.NodeExecutionClosure_Error{
Error: trimmedErrOutputResult,
}
Expand Down
4 changes: 3 additions & 1 deletion pkg/repositories/transformers/task_execution.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,9 @@ func FromTaskExecutionModel(taskExecutionModel models.TaskExecution, opts *Execu
}
if closure.GetError() != nil && opts != nil && opts.TrimErrorMessage && len(closure.GetError().Message) > 0 {
trimmedErrOutputResult := closure.GetError()
trimmedErrOutputResult.Message = trimmedErrOutputResult.Message[0:trimmedErrMessageLen]
if len(trimmedErrOutputResult.Message) > trimmedErrMessageLen {
trimmedErrOutputResult.Message = trimmedErrOutputResult.Message[0:trimmedErrMessageLen]
}
closure.OutputResult = &admin.TaskExecutionClosure_Error{
Error: trimmedErrOutputResult,
}
Expand Down
24 changes: 22 additions & 2 deletions pkg/repositories/transformers/task_execution_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ func TestFromTaskExecutionModel_Error(t *testing.T) {
Phase: core.WorkflowExecution_FAILED,
OutputResult: &admin.ExecutionClosure_Error{Error: execErr},
})
taskExecution, err := FromTaskExecutionModel(models.TaskExecution{
taskExecutionModel := models.TaskExecution{
TaskExecutionKey: models.TaskExecutionKey{
TaskKey: models.TaskKey{
Project: "project",
Expand All @@ -606,14 +606,34 @@ func TestFromTaskExecutionModel_Error(t *testing.T) {
InputURI: "input uri",
Duration: duration,
Closure: closureBytes,
}, &ExecutionTransformerOptions{
}
taskExecution, err := FromTaskExecutionModel(taskExecutionModel, &ExecutionTransformerOptions{
TrimErrorMessage: true,
})

expectedExecErr := execErr
expectedExecErr.Message = string(make([]byte, trimmedErrMessageLen))
assert.Nil(t, err)
assert.True(t, proto.Equal(expectedExecErr, taskExecution.Closure.GetError()))

extraShortErrMsg := string(make([]byte, 10))
execErr = &core.ExecutionError{
Code: "CODE",
Message: extraShortErrMsg,
Kind: core.ExecutionError_USER,
}
closureBytes, _ = proto.Marshal(&admin.ExecutionClosure{
Phase: core.WorkflowExecution_FAILED,
OutputResult: &admin.ExecutionClosure_Error{Error: execErr},
})
taskExecutionModel.Closure = closureBytes
taskExecution, err = FromTaskExecutionModel(taskExecutionModel, &ExecutionTransformerOptions{
TrimErrorMessage: true,
})
expectedExecErr = execErr
expectedExecErr.Message = string(make([]byte, 10))
assert.Nil(t, err)
assert.True(t, proto.Equal(expectedExecErr, taskExecution.Closure.GetError()))
}

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