YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: tweak linter

Browse Source
This commit is contained in:
Steven
2024-05-02 22:10:50 +08:00
parent 74145157a0
commit b23b6302de
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/service/s3_object_presigner/s3_object_presigner.go
View File

@@ -4,7 +4,6 @@ import (
"context" "context"
"time" "time"
"github.com/pkg/errors"
"google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/timestamppb"
"github.com/usememos/memos/plugin/storage/s3" "github.com/usememos/memos/plugin/storage/s3"
@@ -23,19 +22,19 @@ func NewS3ObjectPresigner(store *store.Store) *S3ObjectPresigner {
} }
} }
func (p *S3ObjectPresigner) CheckAndPresign(ctx context.Context) error { func (p *S3ObjectPresigner) CheckAndPresign(ctx context.Context) {
workspaceStorageSetting, err := p.Store.GetWorkspaceStorageSetting(ctx) workspaceStorageSetting, err := p.Store.GetWorkspaceStorageSetting(ctx)
if err != nil { if err != nil {
return errors.Wrap(err, "failed to get workspace storage setting") return
} }
s3Config := workspaceStorageSetting.GetS3Config() s3Config := workspaceStorageSetting.GetS3Config()
if s3Config == nil { if s3Config == nil {
return errors.New("no actived external storage found") return
} }
s3Client, err := s3.NewClient(ctx, s3Config) s3Client, err := s3.NewClient(ctx, s3Config)
if err != nil { if err != nil {
return errors.Wrap(err, "Failed to create s3 client") return
} }
s3StorageType := storepb.ResourceStorageType_S3 s3StorageType := storepb.ResourceStorageType_S3
@@ -44,7 +43,7 @@ func (p *S3ObjectPresigner) CheckAndPresign(ctx context.Context) error {
StorageType: &s3StorageType, StorageType: &s3StorageType,
}) })
if err != nil { if err != nil {
return errors.Wrapf(err, "list resources") return
} }
for _, resource := range resources { for _, resource := range resources {
@@ -61,7 +60,7 @@ func (p *S3ObjectPresigner) CheckAndPresign(ctx context.Context) error {
} }
presignURL, err := s3Client.PresignGetObject(ctx, s3ObjectPayload.Key) presignURL, err := s3Client.PresignGetObject(ctx, s3ObjectPayload.Key)
if err != nil { if err != nil {
return errors.Wrap(err, "Failed to presign via s3 client") return
} }
s3ObjectPayload.LastPresignedTime = timestamppb.New(time.Now()) s3ObjectPayload.LastPresignedTime = timestamppb.New(time.Now())
if err := p.Store.UpdateResource(ctx, &store.UpdateResource{ if err := p.Store.UpdateResource(ctx, &store.UpdateResource{
@@ -72,11 +71,9 @@ func (p *S3ObjectPresigner) CheckAndPresign(ctx context.Context) error {
}, },
}, },
}); err != nil { }); err != nil {
return errors.Wrap(err, "Failed to update resource") return
} }
} }
return nil
} }
func (p *S3ObjectPresigner) Start(ctx context.Context) { func (p *S3ObjectPresigner) Start(ctx context.Context) {