Merge pull request #100 from alena1108/feb26

Translate field to annotation only when not nil
rancher · Feb 26, 2018 · 5bce948 · 5bce948
2 parents 2399924 + 50be08f
commit 5bce948
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/types/mapper/annotation_field.go b/types/mapper/annotation_field.go
@@ -38,7 +38,7 @@ func (e AnnotationField) FromInternal(data map[string]interface{}) {
 
 func (e AnnotationField) ToInternal(data map[string]interface{}) {
 	v, ok := data[e.Field]
-	if ok {
+	if ok && v != nil {
 		if e.Object || e.List {
 			if bytes, err := json.Marshal(v); err == nil {
 				v = string(bytes)