Fix #560 (kinda/sorta)

This commit is contained in:
Jeffrey Regan
2018-11-27 12:17:48 -08:00
parent df3ec571fb
commit 6b93973bad
2 changed files with 9 additions and 5 deletions

View File

@@ -18,6 +18,8 @@ package transformers
import ( import (
"fmt" "fmt"
"log"
"strings"
) )
type mutateFunc func(interface{}) (interface{}, error) type mutateFunc func(interface{}) (interface{}, error)
@@ -53,6 +55,11 @@ func mutateField(
v := m[pathToField[0]] v := m[pathToField[0]]
newPathToField := pathToField[1:] newPathToField := pathToField[1:]
switch typedV := v.(type) { switch typedV := v.(type) {
case nil:
log.Printf(
"nil value at `%s` ignored in mutation attempt",
strings.Join(pathToField, "."))
return nil
case map[string]interface{}: case map[string]interface{}:
return mutateField(typedV, newPathToField, createIfNotPresent, fns...) return mutateField(typedV, newPathToField, createIfNotPresent, fns...)
case []interface{}: case []interface{}:

View File

@@ -162,10 +162,7 @@ func TestWithNil(t *testing.T) {
m := &noopMutator{} m := &noopMutator{}
err := mutateField( err := mutateField(
obj.Map(), []string{"spec", "template", "metadata", "labels", "vegetable"}, false, m.mutate) obj.Map(), []string{"spec", "template", "metadata", "labels", "vegetable"}, false, m.mutate)
if err == nil { if err != nil {
t.Fatalf("Expected error due to nil field.") t.Fatalf("Unexpected error: %v", err)
}
if err.Error() != "<nil> is not expected to be a primitive type" {
t.Fatalf("unexpected error: %v", err)
} }
} }