usememos/memos
1
1
Fork 0
mirror of https://github.com/usememos/memos.git synced 2024-08-14 14:30:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

chore: update s3 config

Browse Source
This commit is contained in:
Steven 2024-06-11 22:05:28 +08:00
parent e9d027ca3e
commit 387bf48fc8
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugin/storage/s3/s3.go
View File

@ -21,13 +21,7 @@ type Client struct {
} }
func NewClient(ctx context.Context, s3Config *storepb.StorageS3Config) (*Client, error) { func NewClient(ctx context.Context, s3Config *storepb.StorageS3Config) (*Client, error) {
resolver := aws.EndpointResolverWithOptionsFunc(func(service, region string, options ...any) (aws.Endpoint, error) {
return aws.Endpoint{
URL: s3Config.Endpoint,
}, nil
})
cfg, err := config.LoadDefaultConfig(ctx, cfg, err := config.LoadDefaultConfig(ctx,
config.WithEndpointResolverWithOptions(resolver),
config.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(s3Config.AccessKeyId, s3Config.AccessKeySecret, "")), config.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(s3Config.AccessKeyId, s3Config.AccessKeySecret, "")),
config.WithRegion(s3Config.Region), config.WithRegion(s3Config.Region),
) )
@ -35,7 +29,9 @@ func NewClient(ctx context.Context, s3Config *storepb.StorageS3Config) (*Client,
return nil, errors.Wrap(err, "failed to load s3 config") return nil, errors.Wrap(err, "failed to load s3 config")
} }
client := s3.NewFromConfig(cfg) client := s3.NewFromConfig(cfg, func(o *s3.Options) {
o.BaseEndpoint = aws.String(s3Config.Endpoint)
})
return &Client{ return &Client{
Client: client, Client: client,
Bucket: aws.String(s3Config.Bucket), Bucket: aws.String(s3Config.Bucket),