Merge branch 'v0.10.0' of https://github.com/spaceuptech/space-cloud into ee-v0.10.0

Author: YourTechBud

config/config.go

@@ -142,6 +142,7 @@ type FileStore struct {
 	Enabled   bool        `json:"enabled" yaml:"enabled"`
 	StoreType string      `json:"storeType" yaml:"storeType"`
 	Conn      string      `json:"conn" yaml:"conn"`
+	Endpoint  string      `json:"endpoint" yaml:"endpoint"`
 	Rules     []*FileRule `json:"rules" yaml:"rules"`
 }
 

modules/filestore/amazons3/amaxonS3.go

@@ -0,0 +1,32 @@
+package amazons3
+
+import (
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/spaceuptech/space-cloud/utils"
+)
+
+// AmazonS3 holds the S3 driver session
+type AmazonS3 struct {
+	client *session.Session
+}
+
+// Init initializes an amazon s3 driver
+func Init(region, endpoint string) (*AmazonS3, error) {
+	awsConf := &aws.Config{Region: aws.String(region)}
+	if len(endpoint) > 0 {
+		awsConf.Endpoint = aws.String(endpoint)
+	}
+	session, err := session.NewSession(awsConf)
+	return &AmazonS3{client: session}, err
+}
+
+// GetStoreType returns the file store type
+func (a *AmazonS3) GetStoreType() utils.FileStoreType {
+	return utils.AmazonS3
+}
+
+// Close gracefully closed the local filestore module
+func (a *AmazonS3) Close() error {
+	return nil
+}

modules/filestore/amazons3/amazonS3.go

@@ -2,57 +2,40 @@ package amazons3
 
 import (
 	"context"
-	"fmt"
 	"io"
 	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/aws/aws-sdk-go/service/s3/s3manager"
 	"github.com/spaceuptech/space-cloud/model"
 )
 
+// CreateFile creates a file in S3
 func (a *AmazonS3) CreateFile(ctx context.Context, project string, req *model.CreateFileRequest, file io.Reader) error {
-	sess, err := session.NewSession(&aws.Config{
-		Region: aws.String(a.region),
-	},
-	)
-	if err != nil {
-		fmt.Println("AmazonS3 Couldn't Establish Connection ", err)
-		return err
-	}
-	uploader := s3manager.NewUploader(sess)
-	_, err = uploader.Upload(&s3manager.UploadInput{
+	uploader := s3manager.NewUploader(a.client)
+	_, err := uploader.Upload(&s3manager.UploadInput{
 		Bucket: aws.String(project),
 		Key:    aws.String(req.Path + "/" + req.Name),
 		Body:   file,
 	})
 	return err
 }
 
+// CreateDir creates a directory in S3
 func (a *AmazonS3) CreateDir(ctx context.Context, project string, req *model.CreateFileRequest) error {
-	sess, err := session.NewSession(&aws.Config{
-		Region: aws.String(a.region),
-	},
-	)
-	if err != nil {
-		fmt.Println("AmazonS3 Couldn't Establish Connection ", err)
-		return err
-	}
-
 	path := req.Path
 	// back slash at the end is important, if not then file will be created of that name
 	if !strings.HasSuffix(path, "/") {
 		path = req.Path + "/"
 	}
 
-	svc := s3.New(sess)
+	svc := s3.New(a.client)
 	request := &s3.PutObjectInput{
 		Bucket: aws.String(project),
 		Key:    aws.String(req.Path),
 	}
-	_, err = svc.PutObject(request)
+	_, err := svc.PutObject(request)
 	return err
 	// return errors.New("Not Implemented")
 }

modules/filestore/amazons3/create.go

@@ -2,25 +2,16 @@ package amazons3
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/aws/aws-sdk-go/service/s3/s3manager"
 )
 
+// DeleteFile deletes a file from S3
 func (a *AmazonS3) DeleteFile(ctx context.Context, project, path string) error {
-	session, err := session.NewSession(&aws.Config{
-		Region: aws.String(a.region),
-	},
-	)
-	if err != nil {
-		fmt.Println("AmazonS3 Couldn't Establish Connection ", err)
-		return err
-	}
-	svc := s3.New(session)
-	_, err = svc.DeleteObject(&s3.DeleteObjectInput{Bucket: aws.String(project), Key: aws.String(path)})
+	svc := s3.New(a.client)
+	_, err := svc.DeleteObject(&s3.DeleteObjectInput{Bucket: aws.String(project), Key: aws.String(path)})
 	if err != nil {
 		return err
 	}
@@ -31,17 +22,10 @@ func (a *AmazonS3) DeleteFile(ctx context.Context, project, path string) error {
 	})
 }
 
+// DeleteDir deletes a directory in S3
 func (a *AmazonS3) DeleteDir(ctx context.Context, project, path string) error {
-	session, err := session.NewSession(&aws.Config{
-		Region: aws.String(a.region),
-	},
-	)
-	if err != nil {
-		fmt.Println("AmazonS3 Couldn't Establish Connection ", err)
-		return err
-	}
 	// TODO: Consider AWS operation limit
-	svc := s3.New(session)
+	svc := s3.New(a.client)
 
 	// Setup BatchDeleteIterator to iterate through a list of objects.
 	iter := s3manager.NewDeleteListIterator(svc, &s3.ListObjectsInput{

modules/filestore/amazons3/delete.go

@@ -3,29 +3,20 @@ package amazons3
 import (
 	"bufio"
 	"context"
-	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 
 	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/aws/aws-sdk-go/service/s3/s3manager"
 	uuid "github.com/satori/go.uuid"
 	"github.com/spaceuptech/space-cloud/model"
 )
 
+// ListDir lists a directory in S3
 func (a *AmazonS3) ListDir(ctx context.Context, project string, req *model.ListFilesRequest) ([]*model.ListFilesResponse, error) {
-	sess, err := session.NewSession(&aws.Config{
-		Region: aws.String(a.region),
-	},
-	)
-	if err != nil {
-		fmt.Println("AmazonS3 Couldn't Establish Connection ", err)
-		return nil, err
-	}
-	svc := s3.New(sess)
+	svc := s3.New(a.client)
 
 	resp, _ := svc.ListObjects(&s3.ListObjectsInput{
 		Bucket:    aws.String(project),
@@ -52,22 +43,16 @@ func (a *AmazonS3) ListDir(ctx context.Context, project string, req *model.ListF
 	return result, nil
 }
 
+// ReadFile reads a file from S3
 func (a *AmazonS3) ReadFile(ctx context.Context, project, path string) (*model.File, error) {
 	u2 := uuid.NewV4()
 
 	tmpfile, err := ioutil.TempFile("", u2.String())
 	if err != nil {
 		return nil, err
 	}
-	sess, err := session.NewSession(&aws.Config{
-		Region: aws.String(a.region),
-	},
-	)
-	if err != nil {
-		fmt.Println("AmazonS3 Couldn't Establish Connection ", err)
-		return nil, err
-	}
-	downloader := s3manager.NewDownloader(sess)
+
+	downloader := s3manager.NewDownloader(a.client)
 
 	_, err = downloader.Download(tmpfile,
 		&s3.GetObjectInput{

modules/filestore/amazons3/read.go

@@ -9,9 +9,9 @@ import (
 	"github.com/spaceuptech/space-cloud/model"
 	"github.com/spaceuptech/space-cloud/utils"
 
+	"github.com/spaceuptech/space-cloud/modules/auth"
 	"github.com/spaceuptech/space-cloud/modules/filestore/amazons3"
 	"github.com/spaceuptech/space-cloud/modules/filestore/local"
-	"github.com/spaceuptech/space-cloud/modules/auth"
 )
 
 // Module is responsible for managing the file storage module
@@ -70,7 +70,7 @@ func (m *Module) SetConfig(conf *config.FileStore) error {
 	}
 
 	// Create a new crud blocks
-	s, err := initBlock(utils.FileStoreType(conf.StoreType), conf.Conn)
+	s, err := initBlock(utils.FileStoreType(conf.StoreType), conf.Conn, conf.Endpoint)
 	if err != nil {
 		return err
 	}
@@ -86,12 +86,12 @@ func (m *Module) IsEnabled() bool {
 	return m.enabled
 }
 
-func initBlock(fileStoreType utils.FileStoreType, connection string) (FileStore, error) {
+func initBlock(fileStoreType utils.FileStoreType, connection, endpoint string) (FileStore, error) {
 	switch fileStoreType {
 	case utils.Local:
 		return local.Init(connection)
 	case utils.AmazonS3:
-		return amazons3.Init(connection) // connection is the aws region code
+		return amazons3.Init(connection, endpoint) // connection is the aws region code
 	default:
 		return nil, utils.ErrInvalidParams
 	}