arch/soju
1
0
Fork 0
Code Issues Pull requests 1 Actions Packages Projects Releases Wiki Activity

S3 API File Uploads #1

Open
arch wants to merge 4 commits from s3-file-upload into master
pull from: s3-file-upload
merge into: arch:master
Conversation 0 Commits 4 Files changed 11 +8 -8
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d21c5be4ae - Show all commits

4
fileupload/fileupload.go
View file

@ -155,7 +155,7 @@ func (h *Handler) fetch(resp http.ResponseWriter, req *http.Request) {
} }
if h.Cdn != "" { if h.Cdn != "" {
resp.Header().Set("Location", h.Cdn + "/" + filename) resp.Header().Set("Location", h.Cdn+"/"+filename)
resp.WriteHeader(http.StatusCreated) resp.WriteHeader(http.StatusCreated)
return return
} }
@ -293,7 +293,7 @@ func (h *Handler) store(resp http.ResponseWriter, req *http.Request) {
} }
if h.Cdn != "" { if h.Cdn != "" {
resp.Header().Set("Location", h.Cdn + "/" + outFilename) resp.Header().Set("Location", h.Cdn+"/"+outFilename)
} else { } else {
resp.Header().Set("Location", "/uploads/"+outFilename) resp.Header().Set("Location", "/uploads/"+outFilename)
} }

10
fileupload/s3.go
View file

@ -8,8 +8,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/aws/aws-sdk-go-v2/config"
"github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/config"
awss3 "github.com/aws/aws-sdk-go-v2/service/s3" awss3 "github.com/aws/aws-sdk-go-v2/service/s3"
"github.com/google/uuid" "github.com/google/uuid"
) )
@ -41,11 +41,11 @@ func (s *s3) store(r io.Reader, username string, mimeType string, basename strin
s3client := awss3.NewFromConfig(cfg) s3client := awss3.NewFromConfig(cfg)
_, err = s3client.PutObject(context.TODO(), &awss3.PutObjectInput{ _, err = s3client.PutObject(context.TODO(), &awss3.PutObjectInput{
Bucket: &bucket, Bucket: &bucket,
Key: &filename, Key: &filename,
ContentType: &mimeType, ContentType: &mimeType,
ContentLength: &contentLength, ContentLength: &contentLength,
Body: r, Body: r,
}) })
if err != nil { if err != nil {
return "", fmt.Errorf("failed to upload to s3 api: %v", err) return "", fmt.Errorf("failed to upload to s3 api: %v", err)