Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a4dedab2f5 | |||
| 1620565ae6 | |||
| 7539b5db24 | |||
| 862ec3f7bc |
@@ -2,6 +2,18 @@
|
||||
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
||||
## [0.4.0] - 2026-04-17
|
||||
|
||||
### 🚀 Features
|
||||
|
||||
- Auto-enable path-style addressing when a custom endpoint is set (#99)
|
||||
|
||||
## [0.3.0] - 2026-04-16
|
||||
|
||||
### 🚀 Features
|
||||
|
||||
- Add PresignInlineURL method for inline content display (#97)
|
||||
|
||||
## [0.2.0] - 2026-04-16
|
||||
|
||||
### 🚀 Features
|
||||
|
||||
@@ -3,6 +3,7 @@ package storage
|
||||
import (
|
||||
"context"
|
||||
"io"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"github.com/aws/aws-sdk-go-v2/aws"
|
||||
@@ -12,6 +13,19 @@ import (
|
||||
"github.com/aws/aws-sdk-go-v2/service/s3"
|
||||
)
|
||||
|
||||
// s3ClientOptions returns the per-client overrides applied to every S3 client
|
||||
// constructed by this package. When the AWS_ENDPOINT_URL_S3 (or
|
||||
// AWS_ENDPOINT_URL) env var is set — typically because the runtime is
|
||||
// pointing at a local MinIO/S3-compatible endpoint — path-style addressing
|
||||
// is enabled so requests look like `http://host:9000/bucket/key` instead of
|
||||
// `http://bucket.host:9000/key`. Production deployments leave those vars
|
||||
// unset and continue talking to real S3 with virtual-hosted style.
|
||||
func s3ClientOptions(o *s3.Options) {
|
||||
if os.Getenv("AWS_ENDPOINT_URL_S3") != "" || os.Getenv("AWS_ENDPOINT_URL") != "" {
|
||||
o.UsePathStyle = true
|
||||
}
|
||||
}
|
||||
|
||||
// Uploader is the interface for uploading objects to S3 using the transfer manager
|
||||
type Uploader interface {
|
||||
UploadObject(ctx context.Context, input *transfermanager.UploadObjectInput, opts ...func(*transfermanager.Options)) (*transfermanager.UploadObjectOutput, error)
|
||||
@@ -105,6 +119,25 @@ func (s *S3) PresignURL(ctx context.Context, key string) (string, error) {
|
||||
return req.URL, nil
|
||||
}
|
||||
|
||||
// PresignInlineURL generates a presigned URL that tells the browser to display
|
||||
// the content inline rather than triggering a download. The URL is valid for
|
||||
// 15 minutes.
|
||||
func (s *S3) PresignInlineURL(ctx context.Context, key string, contentType string) (string, error) {
|
||||
input := &s3.GetObjectInput{
|
||||
Bucket: aws.String(s.bucket),
|
||||
Key: aws.String(key),
|
||||
ResponseContentDisposition: aws.String("inline"),
|
||||
}
|
||||
if contentType != "" {
|
||||
input.ResponseContentType = aws.String(contentType)
|
||||
}
|
||||
req, err := s.presigner.PresignGetObject(ctx, input, s3.WithPresignExpires(15*time.Minute))
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return req.URL, nil
|
||||
}
|
||||
|
||||
// New creates a new S3 storage instance using the upload manager
|
||||
// This loads AWS config from the default locations and is suitable for most use cases
|
||||
func New(bucket string) (*S3, error) {
|
||||
@@ -112,7 +145,7 @@ func New(bucket string) (*S3, error) {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
client := s3.NewFromConfig(cfg)
|
||||
client := s3.NewFromConfig(cfg, s3ClientOptions)
|
||||
uploader := transfermanager.New(client, func(o *transfermanager.Options) {
|
||||
o.PartSizeBytes = 5 * 1024 * 1024
|
||||
})
|
||||
@@ -128,7 +161,7 @@ func New(bucket string) (*S3, error) {
|
||||
// NewS3 creates a new S3 storage instance using direct PutObject
|
||||
// This is useful when you want more control over the AWS configuration
|
||||
func NewS3(cfg aws.Config, bucket string) *S3 {
|
||||
client := s3.NewFromConfig(cfg)
|
||||
client := s3.NewFromConfig(cfg, s3ClientOptions)
|
||||
return &S3{
|
||||
bucket: bucket,
|
||||
directSvc: client,
|
||||
|
||||
+29
@@ -40,6 +40,35 @@ func (m *mockPresigner) PresignGetObject(ctx context.Context, params *s3.GetObje
|
||||
return m.presignFunc(ctx, params, optFns...)
|
||||
}
|
||||
|
||||
// Test path-style toggle
|
||||
|
||||
func TestS3ClientOptions_PathStyleTogglesOnCustomEndpoint(t *testing.T) {
|
||||
cases := []struct {
|
||||
name string
|
||||
envVar string
|
||||
value string
|
||||
expected bool
|
||||
}{
|
||||
{name: "no env var → virtual-hosted", envVar: "", expected: false},
|
||||
{name: "AWS_ENDPOINT_URL_S3 set → path-style", envVar: "AWS_ENDPOINT_URL_S3", value: "http://minio:9000", expected: true},
|
||||
{name: "AWS_ENDPOINT_URL set → path-style", envVar: "AWS_ENDPOINT_URL", value: "http://minio:9000", expected: true},
|
||||
}
|
||||
for _, tc := range cases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
t.Setenv("AWS_ENDPOINT_URL", "")
|
||||
t.Setenv("AWS_ENDPOINT_URL_S3", "")
|
||||
if tc.envVar != "" {
|
||||
t.Setenv(tc.envVar, tc.value)
|
||||
}
|
||||
opts := s3.Options{}
|
||||
s3ClientOptions(&opts)
|
||||
if opts.UsePathStyle != tc.expected {
|
||||
t.Fatalf("UsePathStyle = %v, want %v", opts.UsePathStyle, tc.expected)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// Test NewS3 constructor
|
||||
|
||||
func TestNewS3(t *testing.T) {
|
||||
|
||||
Reference in New Issue
Block a user