Variables test: fix linter

Signed-off-by: Ilya <[email protected]>
linuxboot · Jun 27, 2022 · f2e47dd · f2e47dd
1 parent ffcd62e
commit f2e47dd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/pkg/runner/test_steps_variables.go b/pkg/runner/test_steps_variables.go
@@ -139,7 +139,7 @@ func (sva *stepVariablesAccessor) Add(tgtID string, name string, in interface{})
 }
 
 func (sva *stepVariablesAccessor) Get(tgtID string, mappedName string, out interface{}) error {
-	if sva.varsMapping == nil {
+	if sva.varsMapping == test.StepVariablesMapping(nil) {
 		return fmt.Errorf("step doesn't have variables mapping")
 	}
 	stepVar, found := sva.varsMapping[mappedName]

diff --git a/pkg/test/param_expander.go b/pkg/test/param_expander.go
@@ -14,10 +14,10 @@ import (
 
 type ParamExpander struct {
 	t    *target.Target
-	vars StepsVariables
+	vars StepsVariablesReader
 }
 
-func NewParamExpander(target *target.Target, vars StepsVariables) *ParamExpander {
+func NewParamExpander(target *target.Target, vars StepsVariablesReader) *ParamExpander {
 	return &ParamExpander{t: target, vars: vars}
 }
 

diff --git a/pkg/test/step.go b/pkg/test/step.go
@@ -125,6 +125,7 @@ type StepsVariablesReader interface {
 
 // StepsVariables represents a read/write access for step variables
 type StepsVariables interface {
+	StepsVariablesReader
 	// Add adds a new or replaces existing variable associated with current test step and target
 	Add(tgtID string, name string, in interface{}) error
 }

diff --git a/plugins/teststeps/variables/variables_test.go b/plugins/teststeps/variables/variables_test.go
@@ -29,23 +29,23 @@ func TestValidateParameters(t *testing.T) {
 	require.NoError(t, obj.ValidateParameters(xcontext.Background(), test.TestStepParameters{
 		"var1": []test.Param{
 			{
-				json.RawMessage("123"),
+				RawMessage: json.RawMessage("123"),
 			},
 		},
 	}))
 	// invalid variable name
 	require.Error(t, obj.ValidateParameters(xcontext.Background(), test.TestStepParameters{
 		"var var": []test.Param{
 			{
-				json.RawMessage("123"),
+				RawMessage: json.RawMessage("123"),
 			},
 		},
 	}))
 	// invalid value
 	require.Error(t, obj.ValidateParameters(xcontext.Background(), test.TestStepParameters{
 		"var1": []test.Param{
 			{
-				json.RawMessage("ALALALALA[}"),
+				RawMessage: json.RawMessage("ALALALALA[}"),
 			},
 		},
 	}))
@@ -84,17 +84,17 @@ func TestVariablesEmission(t *testing.T) {
 	state, err := obj.Run(ctx, test.TestStepChannels{In: in, Out: out}, ev, svm, test.TestStepParameters{
 		"str_variable": []test.Param{
 			{
-				json.RawMessage("\"dummy\""),
+				RawMessage: json.RawMessage("\"dummy\""),
 			},
 		},
 		"int_variable": []test.Param{
 			{
-				json.RawMessage("123"),
+				RawMessage: json.RawMessage("123"),
 			},
 		},
 		"complex_variable": []test.Param{
 			{
-				json.RawMessage("{\"name\":\"value\"}"),
+				RawMessage: json.RawMessage("{\"name\":\"value\"}"),
 			},
 		},
 	}, nil)