fix migration2 after an excessive refactor

Author: MichaelMure

go.mod

@@ -8,14 +8,10 @@ require (
 	github.com/dustin/go-humanize v1.0.0
 	github.com/fatih/color v1.9.0
 	github.com/go-git/go-git/v5 v5.1.0
+	github.com/mattn/go-isatty v0.0.12 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/shurcooL/githubv4 v0.0.0-20200915023059-bc5e4feb2971
-	github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f // indirect
 	github.com/spf13/cobra v1.0.0
 	github.com/stretchr/testify v1.6.1
-	github.com/xanzy/go-gitlab v0.37.0
-	golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288
-	golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4
 	golang.org/x/text v0.3.3
 )
 

go.sum

@@ -16,10 +16,10 @@ import (
 const (
 	keyringKeyPrefix     = "auth-"
 	keyringKeyKind       = "kind"
-	keyringKeyTarget     = "TargetT"
+	keyringKeyTarget     = "target"
 	keyringKeyCreateTime = "createtime"
-	keyringKeySalt       = "SaltT"
-	keyringKeyPrefixMeta = "MetaT."
+	keyringKeySalt       = "salt"
+	keyringKeyPrefixMeta = "meta."
 
 	MetaKeyLogin   = "login"
 	MetaKeyBaseURL = "base-url"

migration2/after/bridge/core/auth/credential.go

@@ -11,10 +11,10 @@ import (
 )
 
 type CredentialBase struct {
-	TargetT     string
-	CreateTimeT time.Time
-	SaltT       []byte
-	MetaT       map[string]string
+	TargetT     string            `json:"target"`
+	CreateTimeT time.Time         `json:"create_time"`
+	SaltT       []byte            `json:"salt"`
+	MetaT       map[string]string `json:"meta"`
 }
 
 func NewCredentialBase(target string, createTime time.Time, salt []byte, meta map[string]string) *CredentialBase {
@@ -99,7 +99,7 @@ func (cb *CredentialBase) Salt() []byte {
 
 func (cb *CredentialBase) validate() error {
 	if cb.TargetT == "" {
-		return fmt.Errorf("missing TargetT")
+		return fmt.Errorf("missing target")
 	}
 	if cb.CreateTimeT.IsZero() || cb.CreateTimeT.Equal(time.Time{}) {
 		return fmt.Errorf("missing creation time")

migration2/after/bridge/core/auth/credential_base.go

@@ -16,10 +16,10 @@ import (
 const (
 	configKeyPrefix     = "git-bug.auth"
 	configKeyKind       = "kind"
-	configKeyTarget     = "TargetT"
+	configKeyTarget     = "target"
 	configKeyCreateTime = "createtime"
-	configKeySalt       = "SaltT"
-	configKeyPrefixMeta = "MetaT."
+	configKeySalt       = "salt"
+	configKeyPrefixMeta = "meta."
 
 	MetaKeyLogin   = "login"
 	MetaKeyBaseURL = "base-url"
@@ -159,7 +159,7 @@ func makeSalt() []byte {
 func saltFromConfig(configs map[string]string) ([]byte, error) {
 	val, ok := configs[configKeySalt]
 	if !ok {
-		return nil, fmt.Errorf("no credential SaltT found")
+		return nil, fmt.Errorf("no credential salt found")
 	}
 	return base64.StdEncoding.DecodeString(val)
 }

migration2/before/bridge/core/auth/credential.go

@@ -8,10 +8,10 @@ import (
 )
 
 type CredentialBase struct {
-	TargetT     string
-	CreateTimeT time.Time
-	SaltT       []byte
-	MetaT       map[string]string
+	TargetT     string            `json:"target"`
+	CreateTimeT time.Time         `json:"create_time"`
+	SaltT       []byte            `json:"salt"`
+	MetaT       map[string]string `json:"meta"`
 }
 
 func newCredentialBase(target string) *CredentialBase {
@@ -61,7 +61,7 @@ func (cb *CredentialBase) Salt() []byte {
 
 func (cb *CredentialBase) validate() error {
 	if cb.TargetT == "" {
-		return fmt.Errorf("missing TargetT")
+		return fmt.Errorf("missing target")
 	}
 	if cb.CreateTimeT.IsZero() || cb.CreateTimeT.Equal(time.Time{}) {
 		return fmt.Errorf("missing creation time")

migration2/before/bridge/core/auth/credential_base.go

@@ -28,6 +28,16 @@ func TestMigrate12(t *testing.T) {
 	err = beforeauth.Store(repo1, token)
 	require.NoError(t, err)
 
+	repo2 := afterrepo.NewMockRepoForTest()
+	require.NoError(t, err)
+
+	m := Migration2{}
+	err = m.migrate(repo1, repo2)
+	require.NoError(t, err, "got error when migrating repository with version 2")
+
+	// to avoid the types problem, we compare the json output of those credentials
+	// which also mean we need to ensure a deterministic ordering:
+
 	oldCredentials, err := beforeauth.List(repo1)
 	require.NoError(t, err)
 	sort.Slice(oldCredentials, func(i, j int) bool {
@@ -39,13 +49,6 @@ func TestMigrate12(t *testing.T) {
 	oldJSON, err := json.Marshal(oldCredentials)
 	require.NoError(t, err)
 
-	repo2 := afterrepo.NewMockRepoForTest()
-	require.NoError(t, err)
-
-	m := Migration2{}
-	err = m.migrate(repo1, repo2)
-	require.NoError(t, err, "got error when migrating repository with version 2")
-
 	newCredentials, err := afterauth.List(repo2)
 	require.NoError(t, err)
 	sort.Slice(newCredentials, func(i, j int) bool {