better errors for gui config migration (keybase#18545)

* better errors for gui config migration
tendi09 · Jul 24, 2019 · 7967214 · 7967214
1 parent 526d5f0
commit 7967214
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/go/libkb/globals.go b/go/libkb/globals.go
@@ -448,7 +448,9 @@ func migrateGUIConfig(serviceConfig ConfigReader, guiConfig *JSONFile) error {
 	p = "ui.importContacts"
 	syncSettings, err := serviceConfig.GetInterfaceAtPath(p)
 	if err != nil {
-		errs = append(errs, err)
+		if !isJSONNoSuchKeyError(err) {
+			errs = append(errs, err)
+		}
 	} else {
 		syncSettings, ok := syncSettings.(map[string]interface{})
 		if !ok {

diff --git a/go/libkb/json.go b/go/libkb/json.go
@@ -12,6 +12,7 @@ import (
 	"io"
 	"os"
 	"runtime"
+	"strings"
 	"sync"
 
 	jsonw "github.com/keybase/go-jsonw"
@@ -494,3 +495,8 @@ func (f *JSONFile) SetNullAtPath(p string) (err error) {
 	}
 	return err
 }
+
+func isJSONNoSuchKeyError(err error) bool {
+	_, isJSONError := err.(*jsonw.Error)
+	return err != nil && isJSONError && strings.Contains(err.Error(), "no such key")
+}