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

Author: YourTechBud

config/config.go

@@ -39,6 +39,7 @@ type CrudStub struct {
 	Conn        string                `json:"conn" yaml:"conn"`
 	Collections map[string]*TableRule `json:"collections" yaml:"collections"` // The key here is table name
 	IsPrimary   bool                  `json:"isPrimary" yaml:"isPrimary"`
+	Enabled     bool                  `json:"enabled" yaml:"enabled"`
 }
 
 // TableRule contains the config at the collection level

config/template.go

@@ -6,6 +6,7 @@ secret: some-secret
 modules:
   crud:
     {{.PrimaryDB}}:
+      enabled: true
       conn: {{.Conn}}
       isPrimary: true
       collections:

examples/basic-todo-app/config.yaml

@@ -4,6 +4,7 @@ secret: some-secret
 modules:
   crud:
     mongo:
+      enabled: true
       conn: mongodb://localhost:27017
       collections:
         todos:

examples/realtime-monitoring-app/config.yaml

@@ -17,6 +17,7 @@ modules:
           rule: allow
   crud:
     sql-mysql:
+      enabled: true
       conn: root:my-secret-pw@/test_database
       isPrimary: true
       collections:

examples/realtime-todo-app/config.yaml

@@ -4,6 +4,7 @@ secret: some-secret
 modules:
   crud:
     mongo:
+      enabled: true
       conn: mongodb://localhost:27017
       isPrimary: true
       collections:

modules/crud/crud.go

@@ -84,6 +84,11 @@ func (m *Module) SetConfig(crud config.Crud) error {
 
 	// Create a new crud blocks
 	for k, v := range crud {
+		// Skip this block if it is not enabled
+		if !v.Enabled {
+			continue
+		}
+
 		c, err := initBlock(utils.DBType(k), v.Conn)
 		if err != nil {
 			return errors.New("CURD: Error - " + k + " could not be initialised")

modules/crud/mgo/aggregate.go

@@ -17,10 +17,10 @@ func (m *Mongo) Aggregate(ctx context.Context, project, col string, req *model.A
 		var result map[string]interface{}
 
 		cur, err := collection.Aggregate(ctx, req.Pipeline)
-		defer cur.Close(ctx)
 		if err != nil {
 			return nil, err
 		}
+		defer cur.Close(ctx)
 
 		if !cur.Next(ctx) {
 			return nil, errors.New("No result found")

modules/crud/mgo/read.go

@@ -58,10 +58,10 @@ func (m *Mongo) Read(ctx context.Context, project, col string, req *model.ReadRe
 
 		results := []interface{}{}
 		cur, err := collection.Find(ctx, req.Find, findOptions)
-		defer cur.Close(ctx)
 		if err != nil {
 			return nil, err
 		}
+		defer cur.Close(ctx)
 
 		// Finding multiple documents returns a cursor
 		// Iterating through the cursor allows us to decode documents one at a time

modules/realtime/routine.go

@@ -52,6 +52,7 @@ func (m *Module) worker() {
 		// Get the feedData
 		req := tempReq.(*pendingRequest)
 		m.helperSendFeed(req.data)
+		m.pendingRequests.Delete(msg.ID)
 	}
 }
 

utils/client/grpc_realtime.go

@@ -58,8 +58,8 @@ func (c *GRPCRealtimeClient) RoutineWrite() {
 // Write wrties the object to the client
 func (c *GRPCRealtimeClient) Write(res *model.Message) {
 	select {
-	case c.channel <- res:
 	case <-c.ctx.Done():
+	case c.channel <- res:
 	}
 }
 
@@ -74,7 +74,6 @@ func (c *GRPCRealtimeClient) Read(cb DataCallback) {
 	for {
 		in, err := c.stream.Recv()
 		if err != nil {
-			log.Println("GRPC Error -", err)
 			return
 		}
 		data := make(map[string]interface{})

utils/client/grpc_service.go

@@ -26,7 +26,6 @@ func (c *GRPCServiceClient) RoutineWrite() {
 		case utils.TypeServiceRequest:
 			reqMsg, ok := res.Data.(*model.FunctionsPayload)
 			if !ok {
-				log.Println("GRPC Service Error - Invalid data type", res.Data)
 				break
 			}
 
@@ -63,8 +62,8 @@ func (c *GRPCServiceClient) RoutineWrite() {
 // Write wrties the object to the client
 func (c *GRPCServiceClient) Write(res *model.Message) {
 	select {
-	case c.channel <- res:
 	case <-c.ctx.Done():
+	case c.channel <- res:
 	}
 }
 
@@ -80,7 +79,7 @@ func (c *GRPCServiceClient) Read(cb DataCallback) {
 		in, err := c.streamServer.Recv()
 		if err != nil {
 			if err != nil {
-				log.Println("GRPC Service Error -", err)
+				log.Println("GRPC Service Receive Error -", err)
 				return
 			}
 		}

utils/client/websocket.go

@@ -50,7 +50,6 @@ func (c *WebsocketClient) Read(cb DataCallback) {
 		data := &model.Message{}
 		err := c.socket.ReadJSON(data)
 		if err != nil {
-			log.Println(err)
 			return
 		}