octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-11-29 08:14:03 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1491 from restic/improve-b2-config

Browse Source 
b2: Warn when account ID or key is empty
This commit is contained in:
Alexander Neumann 2017-12-20 18:06:58 +01:00
commit 29c92ca415
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/restic/global.go
View File

@ -500,10 +500,18 @@ func parseConfig(loc location.Location, opts options.Options) (interface{}, erro
cfg.AccountID = os.Getenv("B2_ACCOUNT_ID") cfg.AccountID = os.Getenv("B2_ACCOUNT_ID")
} }
if cfg.AccountID == "" {
return nil, errors.Fatalf("unable to open B2 backend: Account ID ($B2_ACCOUNT_ID) is empty")
}
if cfg.Key == "" { if cfg.Key == "" {
cfg.Key = os.Getenv("B2_ACCOUNT_KEY") cfg.Key = os.Getenv("B2_ACCOUNT_KEY")
} }
if cfg.Key == "" {
return nil, errors.Fatalf("unable to open B2 backend: Key ($B2_ACCOUNT_KEY) is empty")
}
if err := opts.Apply(loc.Scheme, &cfg); err != nil { if err := opts.Apply(loc.Scheme, &cfg); err != nil {
return nil, err return nil, err
} }