keep JSON format (#622)

* keep JSON format

* Defer as soon as possible

* Avoid panic on malformed data & rename variables

Also simplifies some logic

* string/re-assginment tweaks (#626)

* updated error checking

* handle old non-json format

* Errorf for %w

* remove unneeded code

Co-authored-by: DavidGOrtega <g.ortega.david@gmail.com>

Co-authored-by: Helio Machado <0x2b3bfa0+git@googlemail.com>
Co-authored-by: Daniel Barnes <dabarnes2b@gmail.com>
Co-authored-by: DavidGOrtega <g.ortega.david@gmail.com>

Author: 4 people

iterative/utils/analytics.go

@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io/fs"
 	"io/ioutil"
 	"net/http"
 	"os"
@@ -47,21 +48,21 @@ func getenv(key, defaultValue string) string {
 	return value
 }
 
-func deterministic(data string) (*uuid.UUID, error) {
+func deterministic(data string) (string, error) {
 	ns := uuid.NewSHA1(uuid.NameSpaceDNS, []byte("iterative.ai"))
 
 	seed, err := ns.MarshalBinary()
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 
 	dk, err := scrypt.Key([]byte(data), seed, 1<<16, 8, 1, 8)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 
 	id := uuid.NewSHA1(ns, []byte(hex.EncodeToString(dk)))
-	return &id, nil
+	return id.String(), nil
 }
 
 func SystemInfo() map[string]interface{} {
@@ -155,10 +156,57 @@ func GroupId() (string, error) {
 		return "", err
 	}
 
-	return id.String(), nil
+	return id, nil
+}
+
+func readId(path string) (string, error) {
+	file, err := os.Open(path)
+	if file != nil {
+		return "", err
+	}
+	defer file.Close()
+
+	bytes, err := ioutil.ReadAll(file)
+	if err != nil {
+		return "", err
+	}
+
+	var data map[string]interface{}
+
+	if err := json.Unmarshal([]byte(bytes), &data); err != nil {
+		uid, uidError := uuid.FromBytes(bytes)
+		if uidError != nil {
+			return "", fmt.Errorf("failed parsing user_id as json and plaintext: %w", uidError)
+		}
+		logrus.Traceln(fmt.Errorf("found old format telemtry uid, json err: %w", err))
+		return uid.String(), nil
+	}
+
+	if id, ok := data["user_id"].(string); ok {
+		return id, nil
+	}
+
+	return "", errors.New("user_id not found or not a string")
+}
+
+func writeId(path string, id string) error {
+	if err := os.MkdirAll(filepath.Dir(path), 0644); err != nil {
+		return err
+	}
+
+	data := map[string]string{"user_id": id}
+
+	bytes, err := json.MarshalIndent(data, "", "  ")
+	if err != nil {
+		return err
+	}
+
+	return ioutil.WriteFile(path, bytes, 0644)
 }
 
 func UserId() (string, error) {
+	var id string
+	var err error
 	if IsCI() {
 		ci := guessCI()
 		var rawId string
@@ -200,66 +248,37 @@ func UserId() (string, error) {
 			return "", err
 		}
 
-		return id.String(), nil
+		return id, nil
 	}
 
-	id := uuid.New().String()
+	id = uuid.New().String()
 	old := appdirs.UserConfigDir("dvc/user_id", "iterative", "", false)
 	_, errorOld := os.Stat(old)
 
 	new := appdirs.UserConfigDir("iterative/telemetry", "", "", false)
 	_, errorNew := os.Stat(new)
 
-	if os.IsNotExist(errorNew) {
-		if !os.IsNotExist(errorOld) {
-			jsonFile, jsonErr := os.Open(old)
-			if jsonErr != nil {
-				return "", jsonErr
-			}
-
-			byteValue, err := ioutil.ReadAll(jsonFile)
-			if err != nil {
-				return "", err
-			}
-			var data map[string]interface{}
-			err = json.Unmarshal([]byte(byteValue), &data)
+	if errors.Is(errorNew, fs.ErrNotExist) {
+		if !errors.Is(errorOld, fs.ErrNotExist) {
+			id, err = readId(old)
 			if err != nil {
 				return "", err
 			}
-			id = data["user_id"].(string)
-
-			defer jsonFile.Close()
 		}
 
-		err := os.MkdirAll(filepath.Dir(new), 0644)
-		if err != nil {
-			return "", err
-		}
-		err = ioutil.WriteFile(new, []byte(id), 0644)
+		err = writeId(new, id)
 		if err != nil {
 			return "", err
 		}
 	} else {
-		dat, err := ioutil.ReadFile(new)
+		id, err = readId(new)
 		if err != nil {
 			return "", err
 		}
-		id = string(dat[:])
 	}
 
 	if os.IsNotExist(errorOld) && id != "do-not-track" {
-		err := os.MkdirAll(filepath.Dir(old), 0644)
-		if err != nil {
-			return "", err
-		}
-		data := map[string]interface{}{
-			"user_id": id,
-		}
-		file, err := json.MarshalIndent(data, "", " ")
-		if err != nil {
-			return "", err
-		}
-		err = ioutil.WriteFile(old, file, 0644)
+		err := writeId(old, id)
 		if err != nil {
 			return "", err
 		}