Skip to content

Commit 731d02e

Browse files
committed
Fix lint
Signed-off-by: Ricardo Zanini <[email protected]>
1 parent 9820704 commit 731d02e

14 files changed

+48
-27
lines changed

expr/expr.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ package expr
1717
import (
1818
"errors"
1919
"fmt"
20-
"github.com/itchyny/gojq"
2120
"strings"
21+
22+
"github.com/itchyny/gojq"
2223
)
2324

2425
// IsStrictExpr returns true if the string is enclosed in `${ }`

impl/json_schema.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"encoding/json"
1919
"errors"
2020
"fmt"
21+
2122
"github.com/serverlessworkflow/sdk-go/v3/model"
2223
"github.com/xeipuuv/gojsonschema"
2324
)

impl/runner.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ package impl
1717
import (
1818
"context"
1919
"fmt"
20+
2021
"github.com/serverlessworkflow/sdk-go/v3/model"
2122
)
2223

impl/task_runner.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ package impl
1616

1717
import (
1818
"fmt"
19+
1920
"github.com/serverlessworkflow/sdk-go/v3/expr"
2021
"github.com/serverlessworkflow/sdk-go/v3/model"
2122
)

impl/task_runner_do.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ package impl
1616

1717
import (
1818
"fmt"
19+
1920
"github.com/serverlessworkflow/sdk-go/v3/expr"
2021
"github.com/serverlessworkflow/sdk-go/v3/model"
2122
)

impl/task_runner_raise_test.go

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ package impl
1717
import (
1818
"encoding/json"
1919
"errors"
20+
"testing"
21+
2022
"github.com/serverlessworkflow/sdk-go/v3/model"
2123
"github.com/stretchr/testify/assert"
22-
"testing"
2324
)
2425

2526
func TestRaiseTaskRunner_WithDefinedError(t *testing.T) {
@@ -47,16 +48,20 @@ func TestRaiseTaskRunner_WithDefinedError(t *testing.T) {
4748

4849
expectedErr := model.NewErrValidation(errors.New("Invalid input data"), "task_raise_defined")
4950

50-
assert.Equal(t, expectedErr.Type.String(), err.(*model.Error).Type.String())
51-
assert.Equal(t, expectedErr.Status, err.(*model.Error).Status)
52-
assert.Equal(t, expectedErr.Title.String(), err.(*model.Error).Title.String())
53-
assert.Equal(t, "Invalid input data", err.(*model.Error).Detail.String())
54-
assert.Equal(t, expectedErr.Instance.String(), err.(*model.Error).Instance.String())
51+
var modelErr *model.Error
52+
if errors.As(err, &modelErr) {
53+
assert.Equal(t, expectedErr.Type.String(), modelErr.Type.String())
54+
assert.Equal(t, expectedErr.Status, modelErr.Status)
55+
assert.Equal(t, expectedErr.Title.String(), modelErr.Title.String())
56+
assert.Equal(t, "Invalid input data", modelErr.Detail.String())
57+
assert.Equal(t, expectedErr.Instance.String(), modelErr.Instance.String())
58+
} else {
59+
t.Errorf("expected error of type *model.Error but got %T", err)
60+
}
5561
}
5662

5763
func TestRaiseTaskRunner_WithReferencedError(t *testing.T) {
58-
var ref string
59-
ref = "someErrorRef"
64+
ref := "someErrorRef"
6065
raiseTask := &model.RaiseTask{
6166
Raise: model.RaiseTaskConfiguration{
6267
Error: model.RaiseTaskError{
@@ -97,11 +102,16 @@ func TestRaiseTaskRunner_TimeoutErrorWithExpression(t *testing.T) {
97102

98103
expectedErr := model.NewErrTimeout(errors.New("Request took too long"), "task_raise_timeout_expr")
99104

100-
assert.Equal(t, expectedErr.Type.String(), err.(*model.Error).Type.String())
101-
assert.Equal(t, expectedErr.Status, err.(*model.Error).Status)
102-
assert.Equal(t, expectedErr.Title.String(), err.(*model.Error).Title.String())
103-
assert.Equal(t, "Request took too long", err.(*model.Error).Detail.String())
104-
assert.Equal(t, expectedErr.Instance.String(), err.(*model.Error).Instance.String())
105+
var modelErr *model.Error
106+
if errors.As(err, &modelErr) {
107+
assert.Equal(t, expectedErr.Type.String(), modelErr.Type.String())
108+
assert.Equal(t, expectedErr.Status, modelErr.Status)
109+
assert.Equal(t, expectedErr.Title.String(), modelErr.Title.String())
110+
assert.Equal(t, "Request took too long", modelErr.Detail.String())
111+
assert.Equal(t, expectedErr.Instance.String(), modelErr.Instance.String())
112+
} else {
113+
t.Errorf("expected error of type *model.Error but got %T", err)
114+
}
105115
}
106116

107117
func TestRaiseTaskRunner_Serialization(t *testing.T) {
@@ -134,8 +144,7 @@ func TestRaiseTaskRunner_Serialization(t *testing.T) {
134144
}
135145

136146
func TestRaiseTaskRunner_ReferenceSerialization(t *testing.T) {
137-
var ref string
138-
ref = "errorReference"
147+
ref := "errorReference"
139148
raiseTask := &model.RaiseTask{
140149
Raise: model.RaiseTaskConfiguration{
141150
Error: model.RaiseTaskError{

impl/task_runner_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
package impl
1616

1717
import (
18-
"github.com/serverlessworkflow/sdk-go/v3/model"
19-
"github.com/serverlessworkflow/sdk-go/v3/parser"
20-
"github.com/stretchr/testify/assert"
2118
"os"
2219
"path/filepath"
2320
"testing"
21+
22+
"github.com/serverlessworkflow/sdk-go/v3/model"
23+
"github.com/serverlessworkflow/sdk-go/v3/parser"
24+
"github.com/stretchr/testify/assert"
2425
)
2526

2627
// runWorkflowTest is a reusable test function for workflows

impl/task_set_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
package impl
1616

1717
import (
18-
"github.com/serverlessworkflow/sdk-go/v3/model"
19-
"github.com/stretchr/testify/assert"
2018
"reflect"
2119
"testing"
20+
21+
"github.com/serverlessworkflow/sdk-go/v3/model"
22+
"github.com/stretchr/testify/assert"
2223
)
2324

2425
func TestSetTaskExecutor_Exec(t *testing.T) {

model/errors.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,13 +297,13 @@ func GenerateJSONPointer(workflow *Workflow, targetNode interface{}) (string, er
297297
// Convert struct to JSON
298298
jsonData, err := json.Marshal(workflow)
299299
if err != nil {
300-
return "", fmt.Errorf("error marshalling to JSON: %v", err)
300+
return "", fmt.Errorf("error marshalling to JSON: %w", err)
301301
}
302302

303303
// Convert JSON to a generic map for traversal
304304
var jsonMap map[string]interface{}
305305
if err := json.Unmarshal(jsonData, &jsonMap); err != nil {
306-
return "", fmt.Errorf("error unmarshalling JSON: %v", err)
306+
return "", fmt.Errorf("error unmarshalling JSON: %w", err)
307307
}
308308

309309
transformedNode := ""

model/errors_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
package model
1616

1717
import (
18-
"github.com/stretchr/testify/assert"
1918
"testing"
19+
20+
"github.com/stretchr/testify/assert"
2021
)
2122

2223
// TestGenerateJSONPointer_SimpleTask tests a simple workflow task.

0 commit comments

Comments
 (0)