created storage abstration, local and s3 impl fix #6

Author: dstpierre

Makefile

@@ -12,4 +12,4 @@ deploy:
 	scp staticbackend sb-poc:/home/dstpierre/sb
 
 test:
-	@JWT_SECRET=okdevmode go test --race --cover
+	@JWT_SECRET=okdevmode go test --race --cover ./...

internal/storer.go

@@ -0,0 +1,18 @@
+package internal
+
+import "io"
+
+const (
+	StorageProviderLocal = "local"
+	StorageProviderS3    = "s3"
+)
+
+type UploadFileData struct {
+	FileKey string
+	File    io.ReadSeeker
+}
+
+type Storer interface {
+	Save(UploadFileData) (string, error)
+	Delete(string) error
+}

server.go

@@ -11,6 +11,7 @@ import (
 	"staticbackend/internal"
 	"staticbackend/middleware"
 	"staticbackend/realtime"
+	"staticbackend/storage"
 	"strings"
 	"time"
 
@@ -31,6 +32,7 @@ var (
 	client   *mongo.Client
 	volatile *cache.Cache
 	emailer  internal.Mailer
+	storer   internal.Storer
 	AppEnv   = os.Getenv("APP_ENV")
 )
 
@@ -146,6 +148,13 @@ func initServices(dbHost string) {
 	} else {
 		emailer = email.Dev{}
 	}
+
+	sp := os.Getenv("STORAGE_PROVIDER")
+	if strings.EqualFold(sp, internal.StorageProviderS3) {
+		storer = storage.S3{}
+	} else {
+		storer = storage.Local{}
+	}
 }
 func openDatabase(dbHost string) error {
 	uri := os.Getenv("DATABASE_URL")

storage.go

@@ -9,9 +9,6 @@ import (
 	"staticbackend/middleware"
 	"time"
 
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/s3"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )
@@ -52,36 +49,20 @@ func upload(w http.ResponseWriter, r *http.Request) {
 		name = primitive.NewObjectID().Hex()
 	}
 
-	sess, err := session.NewSession(&aws.Config{Region: aws.String("ca-central-1")})
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
 	fileKey := fmt.Sprintf("%s/%s/%s%s",
 		auth.AccountID.Hex(),
 		config.Name,
 		name,
 		ext,
 	)
 
-	svc := s3.New(sess)
-	obj := &s3.PutObjectInput{}
-	obj.Body = file
-	obj.ACL = aws.String(s3.ObjectCannedACLPublicRead)
-	obj.Bucket = aws.String("files.staticbackend.com")
-	obj.Key = aws.String(fileKey)
-
-	if _, err := svc.PutObject(obj); err != nil {
+	upData := internal.UploadFileData{FileKey: fileKey, File: file}
+	url, err := storer.Save(upData)
+	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
 
-	url := fmt.Sprintf(
-		"https://cdn.staticbackend.com/%s",
-		fileKey,
-	)
-
 	doc := bson.M{
 		"accountId": auth.AccountID,
 		"key":       fileKey,
@@ -148,18 +129,7 @@ func deleteFile(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	sess, err := session.NewSession(&aws.Config{Region: aws.String("ca-central-1")})
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	svc := s3.New(sess)
-	obj := &s3.DeleteObjectInput{
-		Bucket: aws.String("files.staticbackend.com"),
-		Key:    aws.String(fileKey),
-	}
-	if _, err := svc.DeleteObject(obj); err != nil {
+	if err := storer.Delete(fileKey); err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}

storage/local.go

@@ -0,0 +1,36 @@
+package storage
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"path"
+	"staticbackend/internal"
+)
+
+type Local struct{}
+
+func (Local) Save(data internal.UploadFileData) (string, error) {
+	dir := path.Join(os.TempDir(), path.Dir(data.FileKey))
+	if err := os.MkdirAll(dir, 0755); err != nil {
+		return "", err
+	}
+
+	b, err := io.ReadAll(data.File)
+	if err != nil {
+		return "", err
+	}
+
+	filename := path.Join(os.TempDir(), data.FileKey)
+	if err := os.WriteFile(filename, b, 0044); err != nil {
+		return "", err
+	}
+
+	url := fmt.Sprintf("%s/tmp/%s", os.Getenv("LOCAL_STORAGE_URL"), data.FileKey)
+	return url, nil
+}
+
+func (Local) Delete(fileKey string) error {
+	filename := path.Join(os.TempDir(), fileKey)
+	return os.Remove(filename)
+}

storage/local_test.go

@@ -0,0 +1,23 @@
+package storage
+
+import (
+	"bytes"
+	"fmt"
+	"staticbackend/internal"
+	"strings"
+	"testing"
+)
+
+func TestLocalSave(t *testing.T) {
+	rdr := bytes.NewReader([]byte("unit test"))
+
+	local := Local{}
+
+	data := internal.UploadFileData{FileKey: "unit/test/file.txt", File: rdr}
+	url, err := local.Save(data)
+	if err != nil {
+		t.Fatal(err)
+	} else if !strings.Contains(url, "/unit/test/file.txt") {
+		fmt.Errorf("expected ~/tmp/unit/test/file.txt got %s", url)
+	}
+}

storage/s3.go

@@ -0,0 +1,57 @@
+package storage
+
+import (
+	"fmt"
+	"os"
+	"staticbackend/internal"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/s3"
+)
+
+type S3 struct{}
+
+func (S3) Save(data internal.UploadFileData) (string, error) {
+	sess, err := session.NewSession(&aws.Config{Region: aws.String("ca-central-1")})
+	if err != nil {
+		return "", err
+	}
+
+	svc := s3.New(sess)
+	obj := &s3.PutObjectInput{}
+	obj.Body = data.File
+	obj.ACL = aws.String(s3.ObjectCannedACLPublicRead)
+	obj.Bucket = aws.String(os.Getenv("AWS_S3_BUCKET"))
+	obj.Key = aws.String(data.FileKey)
+
+	if _, err := svc.PutObject(obj); err != nil {
+		return "", err
+	}
+
+	url := fmt.Sprintf(
+		"%s/%s",
+		os.Getenv("AWS_CDN_URL"),
+		data.FileKey,
+	)
+
+	return url, nil
+}
+
+func (S3) Delete(fileKey string) error {
+	sess, err := session.NewSession(&aws.Config{Region: aws.String("ca-central-1")})
+	if err != nil {
+		return err
+	}
+
+	svc := s3.New(sess)
+	obj := &s3.DeleteObjectInput{
+		Bucket: aws.String(os.Getenv("AWS_S3_BUCKET")),
+		Key:    aws.String(fileKey),
+	}
+	if _, err := svc.DeleteObject(obj); err != nil {
+		return err
+	}
+
+	return nil
+}