direktil/local-server
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

secrets migration

Browse Source
This commit is contained in:
Mikaël Cluseau
2023-02-15 08:49:34 +01:00
parent 1f03315897
commit 26953cf703
7 changed files with 55 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/dkl-local-server/secrets.go
View File

@ -13,11 +13,6 @@ import (
"github.com/cloudflare/cfssl/log"
)
var (
secretData *SecretData
DontSave = false
)
type SecretData struct {
clusters map[string]*ClusterSecrets
config *config.Config
@ -40,10 +35,10 @@ func secretDataPath() string {
return filepath.Join(*dataDir, "secret-data.json")
}
func loadSecretData(config *config.Config) (err error) {
func loadSecretData(config *config.Config) (sd *SecretData, err error) {
log.Info("Loading secret data")
sd := &SecretData{
sd = &SecretData{
clusters: make(map[string]*ClusterSecrets),
config: config,
}
@ -52,7 +47,6 @@ func loadSecretData(config *config.Config) (err error) {
if err != nil {
if os.IsNotExist(err) {
err = nil
secretData = sd
return
}
return
@ -62,7 +56,6 @@ func loadSecretData(config *config.Config) (err error) {
return
}
secretData = sd
return
}