nested large tags fix and test

Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
(cherry picked from commit 05d76ab)

Author: giggsoff

pkg/pillar/pubsub/large.go

@@ -71,7 +71,7 @@ func writeRemoveTree(log *base.LogObject,
 	for k, v := range tree {
 		if !strings.HasPrefix(k, tagLarge) {
 			// descend into subtree if map
-			tree1, ok := v.(jsonTree)
+			tree1, ok := v.(map[string]interface{})
 			if !ok {
 				out[k] = v
 				continue
@@ -195,7 +195,7 @@ func readAddTree(log *base.LogObject, tree jsonTree) (jsonTree, error) {
 	for k, v := range tree {
 		if !strings.HasPrefix(k, tagFile) {
 			// descend into subtree if map
-			tree1, ok := v.(jsonTree)
+			tree1, ok := v.(map[string]interface{})
 			if !ok {
 				out[k] = v
 				continue

pkg/pillar/pubsub/large_test.go

@@ -0,0 +1,102 @@
+// Copyright (c) 2021 Zededa, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+package pubsub
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"os"
+	"reflect"
+	"strings"
+	"testing"
+
+	"github.com/lf-edge/eve/pkg/pillar/base"
+	"github.com/sirupsen/logrus"
+)
+
+type LargeNested struct {
+	LargeNestedData []byte `json:"pubsub-large-LargeNestedData"`
+}
+
+type LargeWithNested struct {
+	LargeTop    []byte `json:"pubsub-large-LargeTop"`
+	LargeNested LargeNested
+}
+
+func TestRemoveAndAddLarge(t *testing.T) {
+	logger := logrus.StandardLogger()
+	log := base.NewSourceLogObject(logger, "test", 1234)
+	// Run in a unique directory
+	rootPath, err := ioutil.TempDir("", "remove_large_test")
+	if err != nil {
+		t.Fatalf("TempDir failed: %s", err)
+	}
+	defer os.RemoveAll(rootPath)
+
+	originalObject := LargeWithNested{LargeNested: LargeNested{LargeNestedData: []byte{1}}, LargeTop: []byte{2}}
+
+	originb, err := json.Marshal(originalObject)
+	if err != nil {
+		t.Fatalf("cannot marshal %v: %s", originalObject, err)
+	}
+	originb, err = writeAndRemoveLarge(log, originb, rootPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	newTree := jsonTree{}
+
+	err = json.Unmarshal(originb, &newTree)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	largeTop, ok := newTree[tagFile+"LargeTop"]
+	if !ok {
+		t.Fatalf("cannot find LargeTop after writeAndRemoveLarge: %v", newTree)
+	}
+	largeTopString, isLargeTopString := largeTop.(string)
+	if !isLargeTopString {
+		t.Fatalf("LargeTop %T is not a string", largeTop)
+	}
+	if !strings.Contains(largeTopString, rootPath) {
+		t.Errorf("cannot find directory (%s) in LargeTop %s", rootPath, largeTopString)
+	}
+
+	largeNested, ok := newTree["LargeNested"]
+	if !ok {
+		t.Fatalf("cannot find LargeNested after writeAndRemoveLarge: %v", newTree)
+	}
+	largeNestedObj, isLargeNestedObjMap := largeNested.(map[string]interface{})
+	if !isLargeNestedObjMap {
+		t.Fatalf("LargeNested %T is not a map", largeNested)
+	}
+	largeNestedData, ok := largeNestedObj[tagFile+"LargeNestedData"]
+	if !ok {
+		t.Fatalf("cannot find %s after writeAndRemoveLarge: %v", tagFile+"LargeNestedData", largeNestedObj)
+	}
+	largeNestedDataString, isLargeNestedDataString := largeNestedData.(string)
+	if !isLargeNestedDataString {
+		t.Fatalf("%s %T is not a string", tagFile+"LargeNestedData", largeNestedData)
+	}
+	if !strings.Contains(largeNestedDataString, rootPath) {
+		t.Errorf("cannot find directory (%s) in %s %s", rootPath, tagFile+"LargeNestedData", largeNestedDataString)
+	}
+
+	originb, err = readAddLarge(log, originb)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	newObject := LargeWithNested{}
+
+	err = json.Unmarshal(originb, &newObject)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !reflect.DeepEqual(originalObject, newObject) {
+		t.Fatalf("objects are not equal: %v %v", originalObject, newObject)
+	}
+}