KurlesHS/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

drive: fix missing error handler

Browse source
This commit is contained in:
Nick Craig-Wood 2018-01-20 18:04:23 +00:00
parent ee66419a27
commit 25a41e1945
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
backend/drive/drive.go
View file

@ -351,9 +351,9 @@ func configTeamDrive(name string) error {
if !config.Confirm() { if !config.Confirm() {
return nil return nil
} }
client, err := authenticate(name) client, err := createOAuthClient(name)
if err != nil { if err != nil {
return errors.Wrap(err, "config team drive failed to authenticate") return errors.Wrap(err, "config team drive failed to create oauth client")
} }
svc, err := drive.New(client) svc, err := drive.New(client)
if err != nil { if err != nil {
@ -408,7 +408,7 @@ func getServiceAccountClient(keyJsonfilePath string) (*http.Client, error) {
return oauth2.NewClient(ctxWithSpecialClient, conf.TokenSource(ctxWithSpecialClient)), nil return oauth2.NewClient(ctxWithSpecialClient, conf.TokenSource(ctxWithSpecialClient)), nil
} }
func authenticate(name string) (*http.Client, error) { func createOAuthClient(name string) (*http.Client, error) {
var oAuthClient *http.Client var oAuthClient *http.Client
var err error var err error
@ -416,12 +416,12 @@ func authenticate(name string) (*http.Client, error) {
if serviceAccountPath != "" { if serviceAccountPath != "" {
oAuthClient, err = getServiceAccountClient(serviceAccountPath) oAuthClient, err = getServiceAccountClient(serviceAccountPath)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "Failed to configure drive Service Account") return nil, errors.Wrap(err, "failed to create oauth client from service account")
} }
} else { } else {
oAuthClient, _, err = oauthutil.NewClient(name, driveConfig) oAuthClient, _, err = oauthutil.NewClient(name, driveConfig)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "Failed to configure drive") return nil, errors.Wrap(err, "failed to create oauth client")
} }
} }
@ -437,7 +437,10 @@ func NewFs(name, path string) (fs.Fs, error) {
return nil, errors.Errorf("drive: chunk size can't be less than 256k - was %v", chunkSize) return nil, errors.Errorf("drive: chunk size can't be less than 256k - was %v", chunkSize)
} }
oAuthClient, _ := authenticate(name) oAuthClient, err := createOAuthClient(name)
if err != nil {
return nil, errors.Wrap(err, "drive: failed when making oauth client")
}
root, err := parseDrivePath(path) root, err := parseDrivePath(path)
if err != nil { if err != nil {