From 6c974f7903d0fcff4775ce70fe6180074255fddd Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <lfernandez.dev@gmail.com>
Date: Sun, 1 Sep 2019 18:15:22 +0200
Subject: [PATCH] refactor: remane old KV account format.

---
 dumper/kv/convert.go | 14 +++++++-------
 dumper/kv/kv.go      |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dumper/kv/convert.go b/dumper/kv/convert.go
index ec6d34b..948c1e9 100644
--- a/dumper/kv/convert.go
+++ b/dumper/kv/convert.go
@@ -6,8 +6,8 @@ import (
 	"github.com/ldez/traefik-certs-dumper/v2/dumper"
 )
 
-// CertificateV1 is used to store certificate info
-type CertificateV1 struct {
+// CertificateOld is used to store certificate info
+type CertificateOld struct {
 	Domain        string
 	CertURL       string
 	CertStableURL string
@@ -15,8 +15,8 @@ type CertificateV1 struct {
 	Certificate   []byte
 }
 
-// AccountV1 is used to store lets encrypt registration info
-type AccountV1 struct {
+// AccountOld is used to store lets encrypt registration info
+type AccountOld struct {
 	Email              string
 	Registration       *registration.Resource
 	PrivateKey         []byte
@@ -40,11 +40,11 @@ type ChallengeCert struct {
 // DomainsCertificate contains a certificate for multiple domains
 type DomainsCertificate struct {
 	Domains     dumper.Domain
-	Certificate *CertificateV1
+	Certificate *CertificateOld
 }
 
-// convertAccountV1ToV2 converts account information from version 1 to 2
-func convertAccountV1ToV2(account *AccountV1) *dumper.StoredData {
+// convertOldAccount converts account information from old account format.
+func convertOldAccount(account *AccountOld) *dumper.StoredData {
 	storedData := &dumper.StoredData{}
 	storedData.Account = &dumper.Account{
 		PrivateKey:   account.PrivateKey,
diff --git a/dumper/kv/kv.go b/dumper/kv/kv.go
index 3714a60..5db024f 100644
--- a/dumper/kv/kv.go
+++ b/dumper/kv/kv.go
@@ -86,12 +86,12 @@ func getStoredDataFromGzip(pair *store.KVPair) (*dumper.StoredData, error) {
 		return nil, fmt.Errorf("unable to read the pair content: %v", err)
 	}
 
-	account := &AccountV1{}
+	account := &AccountOld{}
 	if err := json.Unmarshal(acmeData, &account); err != nil {
-		return nil, fmt.Errorf("unable marshal AccountV1: %v", err)
+		return nil, fmt.Errorf("unable marshal AccountOld: %v", err)
 	}
 
-	return convertAccountV1ToV2(account), nil
+	return convertOldAccount(account), nil
 }
 
 func isDebug() bool {