github-starred/vikunja
2
0
Fork 0
mirror of https://github.com/go-vikunja/vikunja.git synced 2026-04-29 02:49:55 -05:00
Code Issues 690 Packages Projects Releases 11 Wiki Activity

fix(deps): update module github.com/fclairamb/afero-s3 to v0.4.0 (#2087)

Browse Source
This commit is contained in:
renovate[bot]
2026-01-15 16:21:16 +01:00
committed by GitHub
parent f85e30fcb1
commit 843ef7218a
5 changed files with 90 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
pkg/files/filehandling.go
View File

@@ -18,6 +18,7 @@ package files
import (
"bytes"
"context"
"errors"
"fmt"
"os"
@@ -31,10 +32,10 @@ import (
"code.vikunja.io/api/pkg/log"
"code.vikunja.io/api/pkg/modules/keyvalue"
"github.com/aws/aws-sdk-go/aws" //nolint:staticcheck // afero-s3 still requires aws-sdk-go v1
"github.com/aws/aws-sdk-go/aws/credentials" //nolint:staticcheck // afero-s3 still requires aws-sdk-go v1
"github.com/aws/aws-sdk-go/aws/session" //nolint:staticcheck // afero-s3 still requires aws-sdk-go v1
"github.com/aws/aws-sdk-go/service/s3" //nolint:staticcheck // afero-s3 still requires aws-sdk-go v1
"github.com/aws/aws-sdk-go-v2/aws"
awsconfig "github.com/aws/aws-sdk-go-v2/config"
"github.com/aws/aws-sdk-go-v2/credentials"
"github.com/aws/aws-sdk-go-v2/service/s3"
aferos3 "github.com/fclairamb/afero-s3"
"github.com/spf13/afero"
"github.com/stretchr/testify/require"
@@ -46,7 +47,7 @@ var afs *afero.Afero
// S3 client and bucket for direct uploads with Content-Length
type s3PutObjectClient interface {
PutObject(input *s3.PutObjectInput) (*s3.PutObjectOutput, error)
PutObject(ctx context.Context, input *s3.PutObjectInput, optFns ...func(*s3.Options)) (*s3.PutObjectOutput, error)
}
var s3Client s3PutObjectClient
@@ -83,23 +84,27 @@ func initS3FileHandler() error {
return errors.New("S3 secret key is not configured. Please set files.s3.secretkey")
}
// Create AWS session for afero-s3
sess, err := session.NewSession(&aws.Config{
Region: aws.String(region),
Credentials: credentials.NewStaticCredentials(accessKey, secretKey, ""),
Endpoint: aws.String(endpoint),
S3ForcePathStyle: aws.Bool(config.FilesS3UsePathStyle.GetBool()),
})
// Create AWS SDK v2 config
cfg, err := awsconfig.LoadDefaultConfig(context.Background(),
awsconfig.WithRegion(region),
awsconfig.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(accessKey, secretKey, "")),
)
if err != nil {
return fmt.Errorf("failed to create AWS session: %w", err)
return fmt.Errorf("failed to load AWS config: %w", err)
}
// Create S3 client with custom endpoint and path style options
client := s3.NewFromConfig(cfg, func(o *s3.Options) {
o.BaseEndpoint = aws.String(endpoint)
o.UsePathStyle = config.FilesS3UsePathStyle.GetBool()
})
// Initialize S3 filesystem using afero-s3
fs = aferos3.NewFs(bucket, sess)
fs = aferos3.NewFsFromClient(bucket, client)
afs = &afero.Afero{Fs: fs}
// Store S3 client and bucket for direct uploads with Content-Length
s3Client = s3.New(sess)
s3Client = client
s3Bucket = bucket
return nil

7
pkg/files/files.go
View File

@@ -17,6 +17,7 @@
package files
import (
"context"
"errors"
"fmt"
"io"
@@ -33,8 +34,8 @@ import (
"code.vikunja.io/api/pkg/modules/keyvalue"
"code.vikunja.io/api/pkg/web"
"github.com/aws/aws-sdk-go/aws" //nolint:staticcheck // afero-s3 still requires aws-sdk-go v1
"github.com/aws/aws-sdk-go/service/s3" //nolint:staticcheck // afero-s3 still requires aws-sdk-go v1
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/s3"
"github.com/c2h5oh/datasize"
"github.com/spf13/afero"
"xorm.io/xorm"
@@ -166,7 +167,7 @@ func writeToStorage(path string, content io.Reader, size uint64) error {
defer cleanup()
}
_, err = s3Client.PutObject(&s3.PutObjectInput{
_, err = s3Client.PutObject(context.Background(), &s3.PutObjectInput{
Bucket: aws.String(s3Bucket),
Key: aws.String(path),
Body: body,

5
pkg/files/s3_test.go
View File

@@ -18,6 +18,7 @@ package files
import (
"bytes"
"context"
"errors"
"io"
"os"
@@ -25,7 +26,7 @@ import (
"code.vikunja.io/api/pkg/config"
"code.vikunja.io/api/pkg/db"
"github.com/aws/aws-sdk-go/service/s3" //nolint:staticcheck // afero-s3 still requires aws-sdk-go v1
"github.com/aws/aws-sdk-go-v2/service/s3"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -312,7 +313,7 @@ type fakeS3PutObjectClient struct {
err error
}
func (f *fakeS3PutObjectClient) PutObject(input *s3.PutObjectInput) (*s3.PutObjectOutput, error) {
func (f *fakeS3PutObjectClient) PutObject(_ context.Context, input *s3.PutObjectInput, _ ...func(*s3.Options)) (*s3.PutObjectOutput, error) {
f.lastInput = input
if f.err != nil {
return nil, f.err