Skip to content

Commit 5c1c794

Browse files
author
Frank Martinez
committed
cleanup
1 parent b4fc5bb commit 5c1c794

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+185
-142
lines changed

‎activity/registry.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func GetFactory(ref string) Factory {
8686
// GetLogger gets activity logger by ref
8787
func GetLogger(ref string) log.Logger {
8888
if ref[0] == '#' {
89-
ref,_ = support.GetAliasRef("activity", ref[1:])
89+
ref, _ = support.GetAliasRef("activity", ref[1:])
9090
}
9191

9292
logger, ok := activityLoggers[ref]

‎activity/registry_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func registerDup() (err error) {
7676
}()
7777

7878
act := NewMockActivity()
79-
Register(act)
79+
_ = Register(act)
8080
err = Register(act)
8181
return err
8282
}
@@ -93,7 +93,7 @@ func TestRegisterActivityOk(t *testing.T) {
9393
}()
9494

9595
act := NewMockActivity()
96-
Register(act)
96+
_ = Register(act)
9797
assert.Equal(t, 1, len(activities))
9898
}
9999

@@ -109,7 +109,7 @@ func TestGetFactoriesOk(t *testing.T) {
109109
}()
110110

111111
act := NewMockActivity()
112-
Register(act, testFactory)
112+
_ = Register(act, testFactory)
113113

114114
// Get factory
115115
f := GetFactory("github.com/project-flogo/core/activity")

‎api/support.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ func toTriggerConfig(id string, trg *Trigger) *trigger.Config {
5454
h := &trigger.HandlerConfig{Settings: handler.Settings()}
5555
actions := handler.Actions()
5656
h.Actions = make([]*trigger.ActionConfig, len(actions))
57-
for i, action := range actions {
58-
h.Actions[i] = toActionConfig(action)
57+
for i, anAction := range actions {
58+
h.Actions[i] = toActionConfig(anAction)
5959
}
6060
handlerConfigs = append(handlerConfigs, h)
6161
}

‎app/app.go

+17-5
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ func New(config *Config, runner action.Runner, options ...Option) (*App, error)
2929

3030
for _, anImport := range config.Imports {
3131
matches := flogoImportPattern.FindStringSubmatch(anImport)
32-
registerImport(matches[1] + matches[3] + matches[5]) // alias + module path + relative import path
32+
err := registerImport(matches[1] + matches[3] + matches[5]) // alias + module path + relative import path
33+
if err != nil {
34+
log.RootLogger().Errorf("cannot register import '%s' : %v", anImport, err)
35+
}
3336
}
3437

3538
function.ResolveAliases()
@@ -53,14 +56,20 @@ func New(config *Config, runner action.Runner, options ...Option) (*App, error)
5356
property.SetDefaultManager(app.propManager)
5457

5558
for _, option := range options {
56-
option(app)
59+
err := option(app)
60+
if err != nil {
61+
return nil, err
62+
}
5763
}
5864

5965
resources := make(map[string]*resource.Resource, len(config.Resources))
6066
app.resManager = resource.NewManager(resources)
6167

6268
for _, actionFactory := range action.Factories() {
63-
actionFactory.Initialize(app)
69+
err := actionFactory.Initialize(app)
70+
if err != nil {
71+
return nil, err
72+
}
6473
}
6574

6675
for _, resConfig := range config.Resources {
@@ -205,7 +214,7 @@ func (a *App) Stop() error {
205214

206215
// Stop Triggers
207216
for id, trg := range a.triggers {
208-
managed.Stop("Trigger [ "+id+" ]", trg.trg)
217+
_ = managed.Stop("Trigger [ "+id+" ]", trg.trg)
209218
trg.status.Status = managed.StatusStopped
210219
}
211220

@@ -243,7 +252,10 @@ func registerImport(anImport string) error {
243252

244253
log.RootLogger().Debugf("Registering type alias '%s' for %s [%s]", alias, ct, ref)
245254

246-
support.RegisterAlias(ct, alias, ref)
255+
err := support.RegisterAlias(ct, alias, ref)
256+
if err != nil {
257+
return err
258+
}
247259

248260
if ct == "function" {
249261
function.SetPackageAlias(ref, alias)

‎app/instances.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -92,22 +92,24 @@ func (a *App) createTriggers(tConfigs []*trigger.Config, runner action.Runner) (
9292
return nil, fmt.Errorf("trigger factory '%s' not registered", ref)
9393
}
9494

95-
tConfig.FixUp(triggerFactory.Metadata())
95+
err := tConfig.FixUp(triggerFactory.Metadata())
96+
if err != nil {
97+
return nil, err
98+
}
9699

97100
trg, err := triggerFactory.New(tConfig)
98-
99101
if err != nil {
100102
return nil, err
101103
}
102104

103105
if trg == nil {
104-
return nil, fmt.Errorf("cannot create Trigger nil for id '%s'", tConfig.Id)
106+
return nil, fmt.Errorf("cannot create trigger nil for id '%s'", tConfig.Id)
105107
}
106108

107109
logger := trigger.GetLogger(ref)
108110

109111
if log.CtxLoggingEnabled() {
110-
logger = log.ChildLoggerWithFields(logger, log.String("triggerId", tConfig.Id))
112+
logger = log.ChildLoggerWithFields(logger, log.FieldString("triggerId", tConfig.Id))
111113
}
112114

113115
log.ChildLogger(logger, tConfig.Id)
@@ -131,7 +133,7 @@ func (a *App) createTriggers(tConfigs []*trigger.Config, runner action.Runner) (
131133
if id := act.Id; id != "" {
132134
act, _ := a.actions[id]
133135
if act == nil {
134-
return nil, fmt.Errorf("shared Action '%s' does not exists", id)
136+
return nil, fmt.Errorf("shared action '%s' does not exists", id)
135137
}
136138
acts = append(acts, act)
137139
} else {

‎app/propertyresolver/env.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func init() {
2222

2323
logger := log.RootLogger()
2424

25-
property.RegisterPropertyResolver(&EnvVariableValueResolver{})
25+
_ = property.RegisterPropertyResolver(&EnvVariableValueResolver{})
2626

2727
mappings := getEnvValue()
2828
if mappings != "" {

‎app/propertyresolver/env_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88
)
99

1010
func TestEnvValueResolver(t *testing.T) {
11-
os.Setenv("Test", "Test")
12-
os.Setenv("TEST_PROP", "test.Prop")
11+
_ = os.Setenv("Test", "Test")
12+
_ = os.Setenv("TEST_PROP", "test.Prop")
1313

1414
defer func() {
15-
os.Unsetenv("Test")
16-
os.Unsetenv("TEST_PROP")
15+
_ = os.Unsetenv("Test")
16+
_ = os.Unsetenv("TEST_PROP")
1717
}()
1818
resolver := &EnvVariableValueResolver{}
1919

‎app/propertyresolver/json.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func init() {
2626
filePaths := getExternalFiles()
2727
if filePaths != "" {
2828
// Register value resolver
29-
property.RegisterPropertyResolver(&JSONFileValueResolver{})
29+
_ = property.RegisterPropertyResolver(&JSONFileValueResolver{})
3030

3131
// preload props from files
3232
files := strings.Split(filePaths, ",")

‎data/coerce/primatives.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func ToInt64(val interface{}) (int64, error) {
119119
case nil:
120120
return 0, nil
121121
default:
122-
return 0, fmt.Errorf("Unable to coerce %#v to integer", val)
122+
return 0, fmt.Errorf("unable to coerce %#v to integer", val)
123123
}
124124
}
125125

‎data/expression/function/builtin/len.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
)
99

1010
func init() {
11-
function.Register(&fnLen{})
11+
_ = function.Register(&fnLen{})
1212
}
1313

1414
type fnLen struct {

‎data/expression/script/expr_test.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@ const testJsonData = `{
126126
}`
127127

128128
func TestJsonExpr(t *testing.T) {
129-
var data interface{}
130-
err := json.Unmarshal([]byte(testJsonData), &data)
129+
var testData interface{}
130+
err := json.Unmarshal([]byte(testJsonData), &testData)
131131
assert.Nil(t, err)
132132

133-
scope := newScope(map[string]interface{}{"foo": data, "key": 2})
133+
scope := newScope(map[string]interface{}{"foo": testData, "key": 2})
134134

135135
expr, err := factory.NewExpr("$.foo.store.book[0].price")
136136
assert.Nil(t, err)
@@ -142,11 +142,11 @@ func TestJsonExpr(t *testing.T) {
142142
}
143143

144144
func TestArrayIndexExpr(t *testing.T) {
145-
var data interface{}
146-
err := json.Unmarshal([]byte(testJsonData), &data)
145+
var testData interface{}
146+
err := json.Unmarshal([]byte(testJsonData), &testData)
147147
assert.Nil(t, err)
148148

149-
scope := newScope(map[string]interface{}{"foo": data, "key": 2})
149+
scope := newScope(map[string]interface{}{"foo": testData, "key": 2})
150150

151151
expr, err := factory.NewExpr("$.foo.store.book[$.key].price")
152152
assert.Nil(t, err)
@@ -185,7 +185,7 @@ func TestLitExprStaticRef(t *testing.T) {
185185

186186
func TestEnvResolve(t *testing.T) {
187187

188-
os.Setenv("FOO", "bar")
188+
_ = os.Setenv("FOO", "bar")
189189
expr, err := factory.NewExpr(`$env[FOO]`)
190190
assert.Nil(t, err)
191191
assert.NotNil(t, expr)
@@ -709,8 +709,8 @@ func TestExpression(t *testing.T) {
709709

710710
scope := data.NewSimpleScope(map[string]interface{}{"queryParams": map[string]interface{}{"id": "helloworld"}}, nil)
711711
factory := NewExprFactory(resolve.GetBasicResolver())
712-
os.Setenv("name", "flogo")
713-
os.Setenv("address", "tibco")
712+
_ = os.Setenv("name", "flogo")
713+
_ = os.Setenv("address", "tibco")
714714

715715
testcases := make(map[string]interface{})
716716
testcases[`1>2?tstring.concat("sss","ddddd"):"fff"`] = "fff"

‎data/expression/script/funcexpr_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func TestFunctionWithRef(t *testing.T) {
7272
}
7373

7474
func init() {
75-
function.Register(&fnConcat{})
75+
_ = function.Register(&fnConcat{})
7676
}
7777

7878
type fnConcat struct {
@@ -108,7 +108,7 @@ func TestFuncExprSingleQuote(t *testing.T) {
108108
}
109109

110110
func init() {
111-
function.Register(&tLength{})
111+
_ = function.Register(&tLength{})
112112
}
113113

114114
type tLength struct {

‎data/mapper/expr.go

-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ func (m *ExprMapper) Apply(inputScope data.Scope) (map[string]interface{}, error
7979
return output, nil
8080
}
8181

82-
83-
8482
func IsLiteral(value interface{}) bool {
8583
if value != nil {
8684
switch t := value.(type) {

‎data/mapper/expr_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ func BenchmarkExpressionMapperTernaryExpr(b *testing.B) {
258258
}
259259

260260
func init() {
261-
function.Register(&fnConcat{})
261+
_ = function.Register(&fnConcat{})
262262
}
263263

264264
type fnConcat struct {

‎data/mapper/object.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func (am *ObjectMapper) Eval(inputScope data.Scope) (interface{}, error) {
9393
objectMapperLog.Debugf("StackTrace: %s", debug.Stack())
9494
}
9595
}()
96-
objectMapperLog.Debugf("Handleing object mapper %+v", am.mappings)
96+
objectMapperLog.Debugf("Handling object mapper %+v", am.mappings)
9797
return handleObjectMapping(am.mappings, am.exprFactory, inputScope)
9898
}
9999

‎data/mapper/object_test.go

+12
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ func TestObjectMappingWithFunction(t *testing.T) {
2828
mappings := map[string]interface{}{"addresses": arrayMapping}
2929
factory := NewFactory(resolve.GetBasicResolver())
3030
mapper, err := factory.NewMapper(mappings)
31+
assert.Nil(t, err)
3132

3233
results, err := mapper.Apply(nil)
3334
assert.Nil(t, err)
@@ -58,6 +59,7 @@ func TestObjectMappingWithArray(t *testing.T) {
5859
mappings := map[string]interface{}{"addresses": arrayMapping}
5960
factory := NewFactory(resolve.GetBasicResolver())
6061
mapper, err := factory.NewMapper(mappings)
62+
assert.Nil(t, err)
6163

6264
results, err := mapper.Apply(nil)
6365
assert.Nil(t, err)
@@ -106,6 +108,7 @@ func TestRootObjectArray(t *testing.T) {
106108
mappings := map[string]interface{}{"target": arrayMapping}
107109
factory := NewFactory(resolve.GetBasicResolver())
108110
mapper, err := factory.NewMapper(mappings)
111+
assert.Nil(t, err)
109112

110113
results, err := mapper.Apply(scope)
111114
assert.Nil(t, err)
@@ -127,6 +130,7 @@ func TestRootLiteralArray(t *testing.T) {
127130
mappings := map[string]interface{}{"target": arrayMapping}
128131
factory := NewFactory(resolve.GetBasicResolver())
129132
mapper, err := factory.NewMapper(mappings)
133+
assert.Nil(t, err)
130134

131135
results, err := mapper.Apply(nil)
132136
assert.Nil(t, err)
@@ -160,6 +164,7 @@ func TestPrimitiveArray(t *testing.T) {
160164
mappings := map[string]interface{}{"target": arrayMapping}
161165
factory := NewFactory(resolve.GetBasicResolver())
162166
mapper, err := factory.NewMapper(mappings)
167+
assert.Nil(t, err)
163168

164169
attr := make(map[string]interface{})
165170

@@ -207,6 +212,7 @@ func TestRootLiteralArrayMapping(t *testing.T) {
207212
mappings := map[string]interface{}{"target": arrayMapping}
208213
factory := NewFactory(resolve.GetBasicResolver())
209214
mapper, err := factory.NewMapper(mappings)
215+
assert.Nil(t, err)
210216

211217
results, err := mapper.Apply(scope)
212218
assert.Nil(t, err)
@@ -244,6 +250,7 @@ func TestRootLiteralNumberArrayMapping(t *testing.T) {
244250
mappings := map[string]interface{}{"target": arrayMapping}
245251
factory := NewFactory(resolve.GetBasicResolver())
246252
mapper, err := factory.NewMapper(mappings)
253+
assert.Nil(t, err)
247254

248255
results, err := mapper.Apply(scope)
249256
assert.Nil(t, err)
@@ -286,6 +293,7 @@ func TestRootArrayMapping(t *testing.T) {
286293
mappings := map[string]interface{}{"target": arrayMapping}
287294
factory := NewFactory(resolve.GetBasicResolver())
288295
mapper, err := factory.NewMapper(mappings)
296+
assert.Nil(t, err)
289297

290298
results, err := mapper.Apply(scope)
291299
assert.Nil(t, err)
@@ -309,6 +317,7 @@ func TestStringStringMap(t *testing.T) {
309317
mappings := map[string]interface{}{"target": arrayMapping}
310318
factory := NewFactory(resolve.GetBasicResolver())
311319
mapper, err := factory.NewMapper(mappings)
320+
assert.Nil(t, err)
312321

313322
results, err := mapper.Apply(nil)
314323
assert.Nil(t, err)
@@ -386,6 +395,7 @@ func TestArrayMappingWithNest(t *testing.T) {
386395
mappings := map[string]interface{}{"addresses": arrayMapping}
387396
factory := NewFactory(resolve.GetBasicResolver())
388397
mapper, err := factory.NewMapper(mappings)
398+
assert.Nil(t, err)
389399

390400
attrs := map[string]interface{}{"field": arrayData}
391401
scope := data.NewSimpleScope(attrs, nil)
@@ -448,6 +458,7 @@ func TestArrayMappingWithFunction(t *testing.T) {
448458
mappings := map[string]interface{}{"addresses": arrayMapping}
449459
factory := NewFactory(resolve.GetBasicResolver())
450460
mapper, err := factory.NewMapper(mappings)
461+
assert.Nil(t, err)
451462

452463
attrs := map[string]interface{}{"field": arrayData}
453464
scope := data.NewSimpleScope(attrs, nil)
@@ -525,6 +536,7 @@ func TestArrayMappingWithFunction3Level(t *testing.T) {
525536
mappings := map[string]interface{}{"addresses": arrayMapping}
526537
factory := NewFactory(resolve.GetBasicResolver())
527538
mapper, err := factory.NewMapper(mappings)
539+
assert.Nil(t, err)
528540

529541
attrs := map[string]interface{}{"field": arrayValue}
530542
scope := data.NewSimpleScope(attrs, nil)

0 commit comments

Comments
 (0)