Merge pull request #1238 from YourTechBud/metrics-fix

Minor fixes

Author: YourTechBud

gateway/modules/crud/sql/update.go

@@ -78,18 +78,15 @@ func (s *SQL) update(ctx context.Context, col string, req *model.UpdateRequest,
 			doc := make(map[string]interface{})
 			dates := make(map[string]interface{})
 			for k, v := range req.Find {
-				if reflect.TypeOf(v).Kind() == reflect.Array {
-					return 0, utils.ErrInvalidParams
-				}
-
-				// implicit equality operator in where e.g -> "id" : "1"
-				if !strings.HasPrefix(k, "$") && reflect.TypeOf(v).Kind() != reflect.Map {
+				obj, ok := v.(map[string]interface{})
+				if !ok {
 					doc[k] = v
 					continue
 				}
 
-				for colName, colValue := range v.(map[string]interface{}) {
-					doc[colName] = colValue
+				// Required when v is a map. Eg. {"id": { "$eq": "some-value" }}
+				for _, colValue := range obj {
+					doc[k] = colValue
 				}
 			}
 			for op := range req.Update {

gateway/modules/eventing/handle_staged.go

@@ -119,6 +119,13 @@ func (m *Module) processStagedEvent(eventDoc *model.EventDocument) {
 	doc = structs.Map(&cloudEvent)
 	doc, err = m.adjustReqBody(name, "", rule, nil, doc)
 	if err != nil {
+		if err := m.logInvocation(ctx, eventDoc.ID, []byte("{}"), 0, "", err.Error()); err != nil {
+			logrus.Errorf("eventing module couldn't log the invocation - %s", err.Error())
+			return
+		}
+		if err := m.crud.InternalUpdate(context.Background(), m.config.DBAlias, m.project, utils.TableEventingLogs, m.generateFailedEventRequest(eventDoc.ID, "Max retires limit reached")); err != nil {
+			logrus.Errorf("Eventing staged event handler could not update event doc - %s", err.Error())
+		}
 		_ = utils.LogError(fmt.Sprintf("Unable to adjust request body according to template for trigger (%s)", name), "eventing", "process-staged", err)
 		return
 	}

gateway/modules/filestore/operations.go

@@ -3,7 +3,6 @@ package filestore
 import (
 	"context"
 	"errors"
-	"fmt"
 	"io"
 	"net/http"
 
@@ -21,7 +20,7 @@ func (m *Module) CreateDir(ctx context.Context, project, token string, req *mode
 	// Check if the user is authorised to make this request
 	_, err := m.auth.IsFileOpAuthorised(ctx, project, token, req.Path, utils.FileCreate, map[string]interface{}{})
 	if err != nil {
-		return http.StatusForbidden, errors.New("You are not authorized to make this request")
+		return http.StatusForbidden, err
 	}
 
 	m.RLock()
@@ -52,7 +51,7 @@ func (m *Module) DeleteFile(ctx context.Context, project, token string, path str
 	// Check if the user is authorised to make this request
 	_, err := m.auth.IsFileOpAuthorised(ctx, project, token, path, utils.FileDelete, map[string]interface{}{})
 	if err != nil {
-		return http.StatusForbidden, errors.New("You are not authorized to make this request")
+		return http.StatusForbidden, err
 	}
 
 	m.RLock()
@@ -83,7 +82,7 @@ func (m *Module) ListFiles(ctx context.Context, project, token string, req *mode
 	// Check if the user is authorised to make this request
 	_, err := m.auth.IsFileOpAuthorised(ctx, project, token, req.Path, utils.FileRead, map[string]interface{}{})
 	if err != nil {
-		return http.StatusForbidden, nil, fmt.Errorf("You are not authorized to make this request - %v", err)
+		return http.StatusForbidden, nil, err
 	}
 
 	m.RLock()
@@ -106,9 +105,9 @@ func (m *Module) UploadFile(ctx context.Context, project, token string, req *mod
 	}
 
 	// Check if the user is authorised to make this request
-	_, err := m.auth.IsFileOpAuthorised(ctx, project, token, req.Path, utils.FileCreate, map[string]interface{}{})
+	_, err := m.auth.IsFileOpAuthorised(ctx, project, token, req.Path, utils.FileCreate, map[string]interface{}{"meta": req.Meta})
 	if err != nil {
-		return http.StatusForbidden, errors.New("You are not authorized to make this request")
+		return http.StatusForbidden, err
 	}
 
 	m.RLock()
@@ -139,7 +138,7 @@ func (m *Module) DownloadFile(ctx context.Context, project, token, path string)
 	// Check if the user is authorised to make this request
 	_, err := m.auth.IsFileOpAuthorised(ctx, project, token, path, utils.FileRead, map[string]interface{}{})
 	if err != nil {
-		return http.StatusForbidden, nil, errors.New("You are not authorized to make this request")
+		return http.StatusForbidden, nil, err
 	}
 
 	m.RLock()
@@ -165,7 +164,7 @@ func (m *Module) DoesExists(ctx context.Context, project, token, path string) er
 	// Check if the user is authorised to make this request
 	_, err := m.auth.IsFileOpAuthorised(ctx, project, token, path, utils.FileRead, map[string]interface{}{})
 	if err != nil {
-		return errors.New("You are not authorized to make this request")
+		return err
 	}
 
 	m.RLock()

gateway/modules/global/metrics/projects.go

@@ -100,13 +100,13 @@ func (m *Module) updateSCMetrics(id string, set, min map[string]interface{}) {
 	defer cancel()
 	result, err := m.sink.Upsert("config_metrics").Where(types.Cond("id", "==", id)).Set(set).Min(min).Apply(ctx)
 	if err != nil {
-		logrus.Errorf("error querying database got error")
+		logrus.Errorln("Unable to push metrics:", err)
 	}
 	if result == nil {
 		// when space api go is not able to connect to server, the result is empty
 		return
 	}
 	if result.Status != http.StatusOK {
-		logrus.Errorf("error querying database got status (%d) (%s)", result.Status, result.Error)
+		logrus.Errorf("Unable to push metrics - (%d) (%s)", result.Status, result.Error)
 	}
 }

gateway/modules/global/metrics/sink.go

@@ -63,10 +63,10 @@ func (m *Module) flushMetrics(docs []interface{}) {
 	defer cancel()
 	result, err := m.sink.Insert("operation_metrics").Docs(docs).Apply(ctx)
 	if err != nil {
-		logrus.Debugln("Unable to push metrics:", err)
+		logrus.Errorln("Unable to push metrics:", err)
 		return
 	}
 	if result.Status != http.StatusOK {
-		logrus.Debugln("Unable to push metrics:", result.Error)
+		logrus.Errorln("Unable to push metrics:", result.Error)
 	}
 }

gateway/utils/http.go

@@ -77,7 +77,12 @@ func GetTokenFromHeader(r *http.Request) string {
 		tokens = []string{""}
 	}
 
-	return strings.TrimPrefix(tokens[0], "Bearer ")
+	arr := strings.Split(tokens[0], " ")
+	if strings.ToLower(arr[0]) == "bearer" {
+		return arr[1]
+	}
+
+	return ""
 }
 
 // CreateCorsObject creates a cors object with the required config