Merge pull request #519 from spaceuptech/v0.13.1

V0.13.1

Author: Jayesh Choudhary

.gitignore

@@ -8,9 +8,8 @@ test
 *.exe~
 *.dll
 *.so
-*.dylib
 *.zip
-
+*.dylib
 # Test binary, build with `go test -c`
 *.test
 

config/config.go

@@ -18,7 +18,7 @@ type Project struct {
 // Admin stores the admin credentials
 type Admin struct {
 	Secret    string          `json:"secret" yaml:"secret"`
-	Operation OperationConfig `json:"operatiop"`
+	Operation OperationConfig `json:"operation"`
 	Users     []AdminUser     `json:"users" yaml:"users"`
 }
 
@@ -114,8 +114,9 @@ type Service struct {
 
 // Endpoint holds the config of a endpoint
 type Endpoint struct {
-	Path string `json:"path" yaml:"path"`
-	Rule *Rule  `json:"rule" yaml:"rule"`
+	Method string `json:"method" yaml:"method"`
+	Path   string `json:"path" yaml:"path"`
+	Rule   *Rule  `json:"rule" yaml:"rule"`
 }
 
 // FileStore holds the config for the file store module

main.go

@@ -22,9 +22,10 @@ var essentialFlags = []cli.Flag{
 		EnvVar: "NODE_ID",
 	},
 	cli.StringFlag{
-		Name:  "config",
-		Value: "config.yaml",
-		Usage: "Load space cloud config from `FILE`",
+		Name:   "config",
+		Value:  "config.yaml",
+		Usage:  "Load space cloud config from `FILE`",
+		EnvVar: "CONFIG",
 	},
 	cli.StringFlag{
 		Name:   "ssl-cert",

modules/auth/auth.go

@@ -7,7 +7,7 @@ import (
 	"github.com/dgrijalva/jwt-go"
 
 	"github.com/spaceuptech/space-cloud/config"
-	"github.com/spaceuptech/space-cloud/modules/auth/schema"
+	"github.com/spaceuptech/space-cloud/modules/schema"
 	"github.com/spaceuptech/space-cloud/modules/crud"
 
 	"github.com/spaceuptech/space-cloud/modules/functions"

modules/auth/handle_crud.go

@@ -1,6 +1,7 @@
 package auth
 
 import (
+	"context"
 	"net/http"
 
 	"github.com/spaceuptech/space-cloud/config"
@@ -9,7 +10,7 @@ import (
 )
 
 // IsCreateOpAuthorised checks if the crud operation is authorised
-func (m *Module) IsCreateOpAuthorised(project, dbType, col, token string, req *model.CreateRequest) (int, error) {
+func (m *Module) IsCreateOpAuthorised(ctx context.Context, project, dbType, col, token string, req *model.CreateRequest) (int, error) {
 	m.RLock()
 	defer m.RUnlock()
 
@@ -32,7 +33,7 @@ func (m *Module) IsCreateOpAuthorised(project, dbType, col, token string, req *m
 
 	for _, row := range rows {
 		args["doc"] = row
-		err := m.matchRule(project, rule, map[string]interface{}{"args": args}, auth)
+		err := m.matchRule(ctx, project, rule, map[string]interface{}{"args": args}, auth)
 		if err != nil {
 			return http.StatusForbidden, err
 		}
@@ -46,7 +47,7 @@ func (m *Module) IsCreateOpAuthorised(project, dbType, col, token string, req *m
 }
 
 // IsReadOpAuthorised checks if the crud operation is authorised
-func (m *Module) IsReadOpAuthorised(project, dbType, col, token string, req *model.ReadRequest) (int, error) {
+func (m *Module) IsReadOpAuthorised(ctx context.Context, project, dbType, col, token string, req *model.ReadRequest) (int, error) {
 	m.RLock()
 	defer m.RUnlock()
 
@@ -56,7 +57,7 @@ func (m *Module) IsReadOpAuthorised(project, dbType, col, token string, req *mod
 	}
 
 	args := map[string]interface{}{"op": req.Operation, "auth": auth, "find": req.Find, "token": token}
-	err = m.matchRule(project, rule, map[string]interface{}{"args": args}, auth)
+	err = m.matchRule(ctx, project, rule, map[string]interface{}{"args": args}, auth)
 	if err != nil {
 		return http.StatusForbidden, err
 	}
@@ -65,7 +66,7 @@ func (m *Module) IsReadOpAuthorised(project, dbType, col, token string, req *mod
 }
 
 // IsUpdateOpAuthorised checks if the crud operation is authorised
-func (m *Module) IsUpdateOpAuthorised(project, dbType, col, token string, req *model.UpdateRequest) (int, error) {
+func (m *Module) IsUpdateOpAuthorised(ctx context.Context, project, dbType, col, token string, req *model.UpdateRequest) (int, error) {
 	m.RLock()
 	defer m.RUnlock()
 
@@ -75,7 +76,7 @@ func (m *Module) IsUpdateOpAuthorised(project, dbType, col, token string, req *m
 	}
 
 	args := map[string]interface{}{"op": req.Operation, "auth": auth, "find": req.Find, "update": req.Update, "token": token}
-	err = m.matchRule(project, rule, map[string]interface{}{"args": args}, auth)
+	err = m.matchRule(ctx, project, rule, map[string]interface{}{"args": args}, auth)
 	if err != nil {
 		return http.StatusForbidden, err
 	}
@@ -88,7 +89,7 @@ func (m *Module) IsUpdateOpAuthorised(project, dbType, col, token string, req *m
 }
 
 // IsDeleteOpAuthorised checks if the crud operation is authorised
-func (m *Module) IsDeleteOpAuthorised(project, dbType, col, token string, req *model.DeleteRequest) (int, error) {
+func (m *Module) IsDeleteOpAuthorised(ctx context.Context, project, dbType, col, token string, req *model.DeleteRequest) (int, error) {
 	m.RLock()
 	defer m.RUnlock()
 
@@ -98,7 +99,7 @@ func (m *Module) IsDeleteOpAuthorised(project, dbType, col, token string, req *m
 	}
 
 	args := map[string]interface{}{"op": req.Operation, "auth": auth, "find": req.Find, "token": token}
-	err = m.matchRule(project, rule, map[string]interface{}{"args": args}, auth)
+	err = m.matchRule(ctx, project, rule, map[string]interface{}{"args": args}, auth)
 	if err != nil {
 		return http.StatusForbidden, err
 	}
@@ -107,7 +108,7 @@ func (m *Module) IsDeleteOpAuthorised(project, dbType, col, token string, req *m
 }
 
 // IsAggregateOpAuthorised checks if the crud operation is authorised
-func (m *Module) IsAggregateOpAuthorised(project, dbType, col, token string, req *model.AggregateRequest) (int, error) {
+func (m *Module) IsAggregateOpAuthorised(ctx context.Context, project, dbType, col, token string, req *model.AggregateRequest) (int, error) {
 	m.RLock()
 	defer m.RUnlock()
 
@@ -117,7 +118,7 @@ func (m *Module) IsAggregateOpAuthorised(project, dbType, col, token string, req
 	}
 
 	args := map[string]interface{}{"op": req.Operation, "auth": auth, "pipeline": req.Pipeline, "token": token}
-	err = m.matchRule(project, rule, map[string]interface{}{"args": args}, auth)
+	err = m.matchRule(ctx, project, rule, map[string]interface{}{"args": args}, auth)
 	if err != nil {
 		return http.StatusForbidden, err
 	}

modules/auth/handle_file.go

@@ -1,6 +1,7 @@
 package auth
 
 import (
+	"context"
 	"errors"
 	"os"
 	"strings"
@@ -10,7 +11,7 @@ import (
 )
 
 // IsFileOpAuthorised checks if the caller is authorized to make the request
-func (m *Module) IsFileOpAuthorised(project, token, path string, op utils.FileOpType, args map[string]interface{}) error {
+func (m *Module) IsFileOpAuthorised(ctx context.Context, project, token, path string, op utils.FileOpType, args map[string]interface{}) error {
 	m.RLock()
 	defer m.RUnlock()
 
@@ -38,7 +39,7 @@ func (m *Module) IsFileOpAuthorised(project, token, path string, op utils.FileOp
 	args["token"] = token
 
 	// Match the rule
-	return m.matchRule(project, rule, map[string]interface{}{"args": args}, auth)
+	return m.matchRule(ctx, project, rule, map[string]interface{}{"args": args}, auth)
 }
 
 func (m *Module) getFileRule(path string) (map[string]interface{}, *config.FileRule, error) {

modules/auth/handle_functions.go

@@ -1,13 +1,14 @@
 package auth
 
 import (
+	"context"
 	"errors"
 
 	"github.com/spaceuptech/space-cloud/config"
 )
 
 // IsFuncCallAuthorised checks if the func call is authorised
-func (m *Module) IsFuncCallAuthorised(project, service, function, token string, params interface{}) (TokenClaims, error) {
+func (m *Module) IsFuncCallAuthorised(ctx context.Context, project, service, function, token string, params interface{}) (TokenClaims, error) {
 	m.RLock()
 	defer m.RUnlock()
 
@@ -27,7 +28,7 @@ func (m *Module) IsFuncCallAuthorised(project, service, function, token string,
 		return nil, err
 	}
 
-	if err = m.matchRule(project, rule, map[string]interface{}{
+	if err = m.matchRule(ctx, project, rule, map[string]interface{}{
 		"args": map[string]interface{}{"auth": auth, "params": params, "token": token},
 	}, auth); err != nil {
 		return nil, err

modules/auth/match.go

@@ -12,7 +12,7 @@ import (
 	"github.com/spaceuptech/space-cloud/modules/crud"
 )
 
-func (m *Module) matchRule(project string, rule *config.Rule, args map[string]interface{}, auth map[string]interface{}) error {
+func (m *Module) matchRule(ctx context.Context, project string, rule *config.Rule, args map[string]interface{}, auth map[string]interface{}) error {
 	if project != m.project {
 		return errors.New("invalid project details provided")
 	}
@@ -41,17 +41,17 @@ func (m *Module) matchRule(project string, rule *config.Rule, args map[string]in
 		return matchOr(rule, args)
 
 	case "webhook":
-		return matchFunc(rule, m.makeHttpRequest, args)
+		return matchFunc(ctx, rule, m.makeHttpRequest, args)
 
 	case "query":
-		return matchQuery(project, rule, m.crud, args)
+		return matchQuery(ctx, project, rule, m.crud, args)
 
 	default:
 		return ErrIncorrectMatch
 	}
 }
 
-func matchFunc(rule *config.Rule, MakeHttpRequest utils.MakeHttpRequest, args map[string]interface{}) error {
+func matchFunc(ctx context.Context, rule *config.Rule, MakeHttpRequest utils.MakeHttpRequest, args map[string]interface{}) error {
 	obj := args["args"].(map[string]interface{})
 	token := obj["token"].(string)
 	delete(obj, "token")
@@ -63,15 +63,15 @@ func matchFunc(rule *config.Rule, MakeHttpRequest utils.MakeHttpRequest, args ma
 	return MakeHttpRequest(ctx, "POST", rule.Url, token, obj, &result)
 }
 
-func matchQuery(project string, rule *config.Rule, crud *crud.Module, args map[string]interface{}) error {
+func matchQuery(ctx context.Context, project string, rule *config.Rule, crud *crud.Module, args map[string]interface{}) error {
 	// Adjust the find object to load any variables referenced from state
 	rule.Find = utils.Adjust(rule.Find, args).(map[string]interface{})
 
 	// Create a new read request
 	req := &model.ReadRequest{Find: rule.Find, Operation: utils.One}
 
 	// Execute the read request
-	_, err := crud.Read(context.TODO(), rule.DB, project, rule.Col, req)
+	_, err := crud.Read(ctx, rule.DB, project, rule.Col, req)
 	return err
 }
 

modules/crud/mgo/mongo.go

@@ -55,7 +55,7 @@ func (m *Mongo) IsClientSafe() error {
 }
 
 func (m *Mongo) connect() error {
-	timeOut := 5 * time.Second
+	timeOut := 3 * time.Second
 
 	ctx, cancel := context.WithTimeout(context.Background(), timeOut)
 	defer cancel()

modules/crud/sql/collections.go

@@ -20,7 +20,7 @@ func (s *SQL) GetCollections(ctx context.Context, project string) ([]utils.Datab
 	}
 
 	sqlString = strings.Replace(sqlString, "\"", "", -1)
-	rows, err := s.client.Queryx(sqlString, args...)
+	rows, err := s.client.QueryxContext(ctx, sqlString, args...)
 	if err != nil {
 		return nil, err
 	}

modules/crud/sql/sql.go

@@ -90,7 +90,7 @@ func (s *SQL) IsClientSafe() error {
 }
 
 func (s *SQL) connect() error {
-	timeOut := 5 * time.Second
+	timeOut := 3 * time.Second
 
 	ctx, cancel := context.WithTimeout(context.Background(), timeOut)
 	defer cancel()

modules/eventing/handle_intents.go

@@ -13,13 +13,15 @@ import (
 )
 
 func (m *Module) processIntents(t *time.Time) {
-	m.lock.RLock()
-	defer m.lock.RUnlock()
 
 	// Return if module is not enabled
-	if !m.config.Enabled {
+	if !m.IsEnabled() {
 		return
 	}
+	m.lock.RLock()
+	project := m.project
+	dbType, col := m.config.DBType, m.config.Col
+	m.lock.RUnlock()
 
 	// Create a context with 5 second timeout
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
@@ -35,9 +37,7 @@ func (m *Module) processIntents(t *time.Time) {
 		},
 	}}
 
-	dbType, col := m.config.DBType, m.config.Col
-
-	results, err := m.crud.Read(ctx, dbType, m.project, col, &readRequest)
+	results, err := m.crud.Read(ctx, dbType, project, col, &readRequest)
 	if err != nil {
 		log.Println("Eventing intent routine error:", err)
 		return
@@ -62,6 +62,9 @@ func (m *Module) processIntents(t *time.Time) {
 }
 
 func (m *Module) processIntent(eventDoc *model.EventDocument) {
+	m.lock.RLock()
+	defer m.lock.RUnlock()
+
 	// Create a context with 5 second timeout
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()

modules/eventing/handle_staged.go

@@ -13,13 +13,15 @@ import (
 )
 
 func (m *Module) processStagedEvents(t *time.Time) {
-	m.lock.RLock()
-	defer m.lock.RUnlock()
 
 	// Return if module is not enabled
-	if !m.config.Enabled {
+	if !m.IsEnabled() {
 		return
 	}
+	m.lock.RLock()
+	project := m.project
+	dbType, col := m.config.DBType, m.config.Col
+	m.lock.RUnlock()
 
 	// Create a context with 5 second timeout
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
@@ -35,9 +37,7 @@ func (m *Module) processStagedEvents(t *time.Time) {
 		},
 	}}
 
-	dbType, col := m.config.DBType, m.config.Col
-
-	results, err := m.crud.Read(ctx, dbType, m.project, col, &readRequest)
+	results, err := m.crud.Read(ctx, dbType, project, col, &readRequest)
 	if err != nil {
 		log.Println("Eventing stage routine error:", err)
 		return
@@ -58,6 +58,9 @@ func (m *Module) processStagedEvents(t *time.Time) {
 }
 
 func (m *Module) processStagedEvent(eventDoc *model.EventDocument) {
+	m.lock.RLock()
+	defer m.lock.RUnlock()
+
 	// Create a context with 5 second timeout
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
@@ -112,7 +115,7 @@ func (m *Module) processStagedEvent(eventDoc *model.EventDocument) {
 				}
 			}
 
-			m.crud.InternalUpdate(ctx, m.config.DBType, m.project, m.config.Col, m.generateProcessedEventRequest(eventDoc.ID))
+			m.crud.InternalUpdate(ctxLocal, m.config.DBType, m.project, m.config.Col, m.generateProcessedEventRequest(eventDoc.ID))
 			return
 		}
 
@@ -129,7 +132,7 @@ func (m *Module) processStagedEvent(eventDoc *model.EventDocument) {
 		time.Sleep(5 * time.Second)
 	}
 
-	if err := m.crud.InternalUpdate(context.TODO(), m.config.DBType, m.project, m.config.Col, m.generateFailedEventRequest(eventDoc.ID, "Max retires limit reached")); err != nil {
+	if err := m.crud.InternalUpdate(ctx, m.config.DBType, m.project, m.config.Col, m.generateFailedEventRequest(eventDoc.ID, "Max retires limit reached")); err != nil {
 		log.Println("Eventing staged event handler could not update event doc:", err)
 	}
 }