Use test variables in StepState class

Signed-off-by: Ilya <rihter007@inbox.ru>

Author: rihter007

pkg/runner/step_state.go

@@ -22,6 +22,7 @@ type stepState struct {
 	sb        test.TestStepBundle // The test bundle.
 
 	ev         testevent.Emitter
+	tsv        *testStepsVariables
 	stepRunner *StepRunner
 	addTarget  AddTargetToStep
 	stopped    chan struct{}
@@ -37,6 +38,7 @@ func newStepState(
 	stepIndex int,
 	sb test.TestStepBundle,
 	emitterFactory TestStepEventsEmitterFactory,
+	tsv *testStepsVariables,
 	resumeState json.RawMessage,
 	resumeStateTargets []target.Target,
 	onError func(err error),
@@ -45,6 +47,7 @@ func newStepState(
 		stepIndex:          stepIndex,
 		sb:                 sb,
 		ev:                 emitterFactory.New(sb.TestStepLabel),
+		tsv:                tsv,
 		stepRunner:         NewStepRunner(),
 		stopped:            make(chan struct{}),
 		resumeState:        resumeState,
@@ -113,7 +116,10 @@ func (ss *stepState) Run(ctx xcontext.Context) error {
 	stepCtx = stepCtx.WithField("step_index", strconv.Itoa(ss.stepIndex))
 	stepCtx = stepCtx.WithField("step_label", ss.sb.TestStepLabel)
 
-	addTarget, resumeTargetsNotifiers, stepRunResult, err := ss.stepRunner.Run(stepCtx, ss.sb, ss.ev, ss.resumeState, ss.resumeStateTargets)
+	addTarget, resumeTargetsNotifiers, stepRunResult, err := ss.stepRunner.Run(
+		stepCtx, ss.sb, newStepVariablesAccessor(ss.sb.TestStepLabel, ss.tsv), ss.ev, ss.resumeState,
+		ss.resumeStateTargets,
+	)
 	if err != nil {
 		return fmt.Errorf("failed to launch step runner: %v", err)
 	}

pkg/runner/test_runner.go

@@ -43,8 +43,6 @@ type TestRunner struct {
 	steps   []*stepState            // The pipeline, in order of execution
 	targets map[string]*targetState // Target state lookup map
 
-	stepOutputs *testStepsVariables // contains emitted steps variables
-
 	// One mutex to rule them all, used to serialize access to all the state above.
 	// Could probably be split into several if necessary.
 	mu          sync.Mutex
@@ -144,15 +142,14 @@ func (tr *TestRunner) Run(
 		}
 	}
 
-	var err error
-	tr.stepOutputs, err = newTestStepsVariables(t.TestStepsBundles)
+	stepOutputs, err := newTestStepsVariables(t.TestStepsBundles)
 	if err != nil {
 		ctx.Errorf("Failed to initialise test steps variables: %v", err)
 		return nil, nil, err
 	}
 
 	for targetID, targetState := range tr.targets {
-		if err := tr.stepOutputs.initTargetStepsVariables(targetID, targetState.StepsVariables); err != nil {
+		if err := stepOutputs.initTargetStepsVariables(targetID, targetState.StepsVariables); err != nil {
 			ctx.Errorf("Failed to initialise test steps variables for target: %s: %v", targetID, err)
 			return nil, nil, err
 		}
@@ -174,7 +171,7 @@ func (tr *TestRunner) Run(
 		}
 
 		// Step handlers will be started from target handlers as targets reach them.
-		tr.steps = append(tr.steps, newStepState(i, sb, emitterFactory, srs, resumeStateTargets, func(err error) {
+		tr.steps = append(tr.steps, newStepState(i, sb, emitterFactory, stepOutputs, srs, resumeStateTargets, func(err error) {
 			tr.monitorCond.Signal()
 		}))
 	}
@@ -221,7 +218,7 @@ func (tr *TestRunner) Run(
 	numInFlightTargets := 0
 	for i, tgt := range targets {
 		tgs := tr.targets[tgt.ID]
-		tgs.StepsVariables, err = tr.stepOutputs.getTargetStepsVariables(tgt.ID)
+		tgs.StepsVariables, err = stepOutputs.getTargetStepsVariables(tgt.ID)
 		if err != nil {
 			ctx.Errorf("Failed to get steps variables: %v", err)
 			return nil, nil, err

pkg/test/step.go

@@ -156,7 +156,7 @@ func CheckIdentifier(s string) error {
 		return fmt.Errorf("empty identifier")
 	}
 	match := identifierRegexPattern.FindString(s)
-	if match != s {
+	if len(match) != len(s) {
 		return fmt.Errorf("identifier should be an non-empty string that matches: %s", identifierRegexPattern.String())
 	}
 	return nil