TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-12-09 04:32:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1552 from lawrencejones/use-auto-auth

Browse Source 
Automatically load Google auth
This commit is contained in:
Alexander Neumann
2018-03-18 19:53:30 +01:00
parent 7022144e0f 57c6233982
commit 8206f85d2e
8 changed files with 125 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/restic/global.go
View File

@@ -440,18 +440,6 @@ func parseConfig(loc location.Location, opts options.Options) (interface{}, erro
cfg.ProjectID = os.Getenv("GOOGLE_PROJECT_ID")
}
if cfg.JSONKeyPath == "" {
if path := os.Getenv("GOOGLE_APPLICATION_CREDENTIALS"); path != "" {
// Check read access
if _, err := ioutil.ReadFile(path); err != nil {
return nil, errors.Fatalf("Failed to read google credential from file %v: %v", path, err)
}
cfg.JSONKeyPath = path
} else {
return nil, errors.Fatal("No credential file path is set")
}
}
if err := opts.Apply(loc.Scheme, &cfg); err != nil {
return nil, err
}