unboundsoftware/s3uploader
6
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Activity

chore: switch to AWS SDK v2

Browse Source
This commit is contained in:
Joakim Olsson
2023-06-28 06:55:56 +02:00
parent d8bc211683
commit 96abde4148
5 changed files with 90 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
storage/s3.go
+14 -8
View File
@@ -1,25 +1,30 @@
package storage
import (
"context"
"io"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3/s3manager"
"github.com/aws/aws-sdk-go/service/s3/s3manager/s3manageriface"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/config"
"github.com/aws/aws-sdk-go-v2/feature/s3/manager"
"github.com/aws/aws-sdk-go-v2/service/s3"
)
type Storage interface {
Store(path string, content io.Reader) error
}
type Uploader interface {
Upload(ctx context.Context, input *s3.PutObjectInput, opts ...func(*manager.Uploader)) (*manager.UploadOutput, error)
}
type S3 struct {
bucket string
svc s3manageriface.UploaderAPI
svc Uploader
}
func (s *S3) Store(path string, content io.Reader) error {
_, err := s.svc.Upload(&s3manager.UploadInput{
_, err := s.svc.Upload(context.Background(), &s3.PutObjectInput{
Bucket: aws.String(s.bucket),
Key: aws.String(path),
Body: content,
@@ -28,11 +33,12 @@ func (s *S3) Store(path string, content io.Reader) error {
}
func New(bucket string) (Storage, error) {
sess, err := session.NewSession(aws.NewConfig())
cfg, err := config.LoadDefaultConfig(context.Background())
if err != nil {
return nil, err
}
uploader := s3manager.NewUploader(sess, func(u *s3manager.Uploader) {
client := s3.NewFromConfig(cfg)
uploader := manager.NewUploader(client, func(u *manager.Uploader) {
u.PartSize = 5 * 1024 * 1024
})
return &S3{bucket: bucket, svc: uploader}, nil
storage/s3_test.go
+15 -19
View File
@@ -1,16 +1,16 @@
package storage
import (
"context"
"fmt"
"io"
"io/ioutil"
"os"
"strings"
"testing"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/s3/s3manager"
"github.com/aws/aws-sdk-go/service/s3/s3manager/s3manageriface"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/feature/s3/manager"
"github.com/aws/aws-sdk-go-v2/service/s3"
"github.com/stretchr/testify/assert"
)
@@ -28,9 +28,9 @@ func TestNew(t *testing.T) {
name: "invalid AWS config",
args: args{},
setup: func() func() {
_ = os.Setenv("AWS_STS_REGIONAL_ENDPOINTS", "unknown_value")
_ = os.Setenv("AWS_MAX_ATTEMPTS", "invalid")
return func() {
_ = os.Unsetenv("AWS_STS_REGIONAL_ENDPOINTS")
_ = os.Unsetenv("AWS_MAX_ATTEMPTS")
}
},
wantErr: true,
@@ -60,7 +60,7 @@ func TestNew(t *testing.T) {
func TestS3_Store(t *testing.T) {
type fields struct {
bucket string
svc func(t *testing.T) s3manageriface.UploaderAPI
svc func(t *testing.T) Uploader
}
type args struct {
path string
@@ -76,12 +76,12 @@ func TestS3_Store(t *testing.T) {
name: "upload error",
fields: fields{
bucket: "some-bucket",
svc: func(t *testing.T) s3manageriface.UploaderAPI {
svc: func(t *testing.T) Uploader {
return &mock{
upload: func(input *s3manager.UploadInput, f ...func(*s3manager.Uploader)) (*s3manager.UploadOutput, error) {
upload: func(ctx context.Context, input *s3.PutObjectInput, f ...func(*manager.Uploader)) (*manager.UploadOutput, error) {
assert.Equal(t, aws.String("some-bucket"), input.Bucket)
assert.Equal(t, aws.String("/some/path"), input.Key)
buff, err := ioutil.ReadAll(input.Body)
buff, err := io.ReadAll(input.Body)
assert.NoError(t, err)
assert.Equal(t, "some content", string(buff))
return nil, fmt.Errorf("error")
@@ -98,7 +98,7 @@ func TestS3_Store(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
var svc s3manageriface.UploaderAPI
var svc Uploader
if tt.fields.svc != nil {
svc = tt.fields.svc(t)
}
@@ -114,18 +114,14 @@ func TestS3_Store(t *testing.T) {
}
type mock struct {
upload func(input *s3manager.UploadInput, f ...func(*s3manager.Uploader)) (*s3manager.UploadOutput, error)
upload func(ctx context.Context, input *s3.PutObjectInput, f ...func(*manager.Uploader)) (*manager.UploadOutput, error)
}
func (m *mock) Upload(input *s3manager.UploadInput, f ...func(*s3manager.Uploader)) (*s3manager.UploadOutput, error) {
func (m *mock) Upload(ctx context.Context, input *s3.PutObjectInput, f ...func(*manager.Uploader)) (*manager.UploadOutput, error) {
if m.upload != nil {
return m.upload(input, f...)
return m.upload(ctx, input, f...)
}
return nil, nil
}
func (m *mock) UploadWithContext(aws.Context, *s3manager.UploadInput, ...func(*s3manager.Uploader)) (*s3manager.UploadOutput, error) {
panic("implement me")
}
var _ s3manageriface.UploaderAPI = &mock{}
var _ Uploader = &mock{}