test/extended/etcd/etcd_storage_path.go: decode CBOR data

Author: bertinatto

test/extended/etcd/etcd_storage_path.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/fxamacker/cbor/v2"
 	g "github.com/onsi/ginkgo/v2"
 	"golang.org/x/net/context"
 
@@ -712,6 +713,10 @@ func getFromEtcd(kv etcdv3.KV, path string) (*metaObject, error) {
 		if err := json.Unmarshal(value, metaObj); err != nil {
 			return nil, err
 		}
+	case isCBOR(value):
+		if err := cbor.Unmarshal(value, metaObj); err != nil {
+			return nil, err
+		}
 	default:
 		// TODO handle encrypted data
 		return nil, fmt.Errorf("unknown data format at path /%s: %s", path, string(value))
@@ -720,6 +725,17 @@ func getFromEtcd(kv etcdv3.KV, path string) (*metaObject, error) {
 	return metaObj, nil
 }
 
+func isCBOR(data []byte) bool {
+	if len(data) == 0 {
+		return false
+	}
+	dec := cbor.NewDecoder(bytes.NewReader(data))
+	if err := dec.Skip(); err != nil {
+		return false
+	}
+	return dec.NumBytesRead() == len(data)
+}
+
 func diffMaps(a, b interface{}) ([]string, []string) {
 	inA := diffMapKeys(a, b, keyStringer)
 	inB := diffMapKeys(b, a, keyStringer)