Fix a panic caused by setting interface to nil instead of a interface…

… with a nil value
metal-toolbox · Aug 28, 2024 · bd925d7 · bd925d7
1 parent 17e96e1
commit bd925d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/internal/flipflop/handler.go b/internal/flipflop/handler.go
@@ -41,7 +41,7 @@ func (cth *ConditionTaskHandler) HandleTask(ctx context.Context, genTask *rctype
 	cth.publisher = publisher
 
 	// Ungeneric the task
-	task, err := NewTask(genTask, cth.cfg.FaultInjection)
+	task, err := NewTask(genTask)
 	if err != nil {
 		cth.logger.WithFields(logrus.Fields{
 			"conditionID":  genTask.ID,

diff --git a/internal/flipflop/task.go b/internal/flipflop/task.go
@@ -11,7 +11,7 @@ import (
 
 type Task rctypes.Task[*rctypes.ServerControlTaskParameters, json.RawMessage]
 
-func NewTask(task *rctypes.Task[any, any], faultInjection bool) (*Task, error) {
+func NewTask(task *rctypes.Task[any, any]) (*Task, error) {
 	paramsJSON, ok := task.Parameters.(json.RawMessage)
 	if !ok {
 		return nil, errInvalideConditionParams
@@ -28,14 +28,9 @@ func NewTask(task *rctypes.Task[any, any], faultInjection bool) (*Task, error) {
 		return nil, errors.Wrap(errTaskConv, err.Error()+": Task.Server")
 	}
 
-	var fault interface{}
-	if faultInjection {
-		fault, err = copystructure.Copy(task.Fault)
-		if err != nil {
-			return nil, errors.Wrap(errTaskConv, err.Error()+": Task.Fault")
-		}
-	} else {
-		fault = nil
+	fault, err := copystructure.Copy(task.Fault)
+	if err != nil {
+		return nil, errors.Wrap(errTaskConv, err.Error()+": Task.Fault")
 	}
 
 	return &Task{