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

feat: add visibility field to resource (#1185)

Browse Source
This commit is contained in:
boojack
2023-02-27 21:26:50 +08:00
committed by GitHub
parent c399ff86e0
commit 977e7f55e5
6 changed files with 91 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,7 @@ func NewClient(ctx context.Context, config *Config) (*Client, error) {
}, nil
})
cfg, err := s3config.LoadDefaultConfig(ctx,
awsConfig, err := s3config.LoadDefaultConfig(ctx,
s3config.WithEndpointResolverWithOptions(resolver),
s3config.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(config.AccessKey, config.SecretKey, "")),
)
@@ -43,7 +43,7 @@ func NewClient(ctx context.Context, config *Config) (*Client, error) {
return nil, err
}
client := awss3.NewFromConfig(cfg)
client := awss3.NewFromConfig(awsConfig)
return &Client{
Client: client,
@@ -53,7 +53,7 @@ func NewClient(ctx context.Context, config *Config) (*Client, error) {
func (client *Client) UploadFile(ctx context.Context, filename string, fileType string, src io.Reader) (string, error) {
uploader := manager.NewUploader(client.Client)
resp, err := uploader.Upload(ctx, &awss3.PutObjectInput{
uploadOutput, err := uploader.Upload(ctx, &awss3.PutObjectInput{
Bucket: aws.String(client.Config.Bucket),
Key: aws.String(filename),
Body: src,
@@ -63,10 +63,12 @@ func (client *Client) UploadFile(ctx context.Context, filename string, fileType
if err != nil {
return "", err
}
var link string
if client.Config.URLPrefix == "" {
link = resp.Location
} else {
link := uploadOutput.Location
if link == "" {
if client.Config.URLPrefix == "" {
return "", fmt.Errorf("url prefix is empty")
}
link = fmt.Sprintf("%s/%s", client.Config.URLPrefix, filename)
}
return link, nil