extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-22 16:34:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

staticcheck: google api New is deprecated: please use NewService instead

Browse Source
This commit is contained in:
albertony 2022-06-24 21:45:38 +02:00
parent f18095b004
commit e5bf6a813c
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/drive/drive.go
View File

@ -51,6 +51,7 @@ import (
drive_v2 "google.golang.org/api/drive/v2" drive_v2 "google.golang.org/api/drive/v2"
drive "google.golang.org/api/drive/v3" drive "google.golang.org/api/drive/v3"
"google.golang.org/api/googleapi" "google.golang.org/api/googleapi"
"google.golang.org/api/option"
) )
// Constants // Constants
@ -1210,13 +1211,13 @@ func newFs(ctx context.Context, name, path string, m configmap.Mapper) (*Fs, err
// Create a new authorized Drive client. // Create a new authorized Drive client.
f.client = oAuthClient f.client = oAuthClient
f.svc, err = drive.New(f.client) f.svc, err = drive.NewService(context.Background(), option.WithHTTPClient(f.client))
if err != nil { if err != nil {
return nil, fmt.Errorf("couldn't create Drive client: %w", err) return nil, fmt.Errorf("couldn't create Drive client: %w", err)
} }
if f.opt.V2DownloadMinSize >= 0 { if f.opt.V2DownloadMinSize >= 0 {
f.v2Svc, err = drive_v2.New(f.client) f.v2Svc, err = drive_v2.NewService(context.Background(), option.WithHTTPClient(f.client))
if err != nil { if err != nil {
return nil, fmt.Errorf("couldn't create Drive v2 client: %w", err) return nil, fmt.Errorf("couldn't create Drive v2 client: %w", err)
} }
@ -2992,12 +2993,12 @@ func (f *Fs) changeServiceAccountFile(ctx context.Context, file string) (err err
return fmt.Errorf("drive: failed when making oauth client: %w", err) return fmt.Errorf("drive: failed when making oauth client: %w", err)
} }
f.client = oAuthClient f.client = oAuthClient
f.svc, err = drive.New(f.client) f.svc, err = drive.NewService(context.Background(), option.WithHTTPClient(f.client))
if err != nil { if err != nil {
return fmt.Errorf("couldn't create Drive client: %w", err) return fmt.Errorf("couldn't create Drive client: %w", err)
} }
if f.opt.V2DownloadMinSize >= 0 { if f.opt.V2DownloadMinSize >= 0 {
f.v2Svc, err = drive_v2.New(f.client) f.v2Svc, err = drive_v2.NewService(context.Background(), option.WithHTTPClient(f.client))
if err != nil { if err != nil {
return fmt.Errorf("couldn't create Drive v2 client: %w", err) return fmt.Errorf("couldn't create Drive v2 client: %w", err)
} }

3
backend/googlecloudstorage/googlecloudstorage.go
View File

@ -44,6 +44,7 @@ import (
"golang.org/x/oauth2" "golang.org/x/oauth2"
"golang.org/x/oauth2/google" "golang.org/x/oauth2/google"
"google.golang.org/api/googleapi" "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
// NOTE: This API is deprecated // NOTE: This API is deprecated
storage "google.golang.org/api/storage/v1" storage "google.golang.org/api/storage/v1"
@ -524,7 +525,7 @@ func NewFs(ctx context.Context, name, root string, m configmap.Mapper) (fs.Fs, e
// Create a new authorized Drive client. // Create a new authorized Drive client.
f.client = oAuthClient f.client = oAuthClient
f.svc, err = storage.New(f.client) f.svc, err = storage.NewService(context.Background(), option.WithHTTPClient(f.client))
if err != nil { if err != nil {
return nil, fmt.Errorf("couldn't create Google Cloud Storage client: %w", err) return nil, fmt.Errorf("couldn't create Google Cloud Storage client: %w", err)
} }