Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

fix: failed to upload OSS with S3 SDK (#1792)

Athurg Goothc27c6cea136e
diff --git a/plugin/storage/s3/s3.go b/plugin/storage/s3/s3.go
index f69921725..028c563ef 100644
--- a/plugin/storage/s3/s3.go
+++ b/plugin/storage/s3/s3.go
@@ -4,6 +4,7 @@ import (
"context"
"fmt"
"io"
+ "strings"
"github.com/aws/aws-sdk-go-v2/aws"
s3config "github.com/aws/aws-sdk-go-v2/config"
@@ -29,13 +30,18 @@ type Client struct {
}
func NewClient(ctx context.Context, config *Config) (*Client, error) {
+ // For some s3-compatible object stores, converting the hostname is not required,
+ // and not setting this option will result in not being able to access the corresponding object store address.
+ // But Aliyun OSS should disable this option
+ hostnameImmutable := true
+ if strings.HasSuffix(config.EndPoint, "aliyuncs.com") {
+ hostnameImmutable = false
+ }
resolver := aws.EndpointResolverWithOptionsFunc(func(service, region string, options ...any) (aws.Endpoint, error) {
return aws.Endpoint{
- URL: config.EndPoint,
- SigningRegion: config.Region,
- // For some s3-compatible object stores, converting the hostname is not required,
- // and not setting this option will result in not being able to access the corresponding object store address.
- HostnameImmutable: true,
+ URL: config.EndPoint,
+ SigningRegion: config.Region,
+ HostnameImmutable: hostnameImmutable,
}, nil
})