config/conf_loader.go

@@ -26,12 +26,12 @@ import (
 func GetConfLoader() *onion.Onion {
 	logger := zerolog.New(os.Stdout).With().Timestamp().Logger()
 	AppName := GetAppName()
-	EnvPrefix := "OC_"
+	EnvPrefix := strings.ToUpper(AppName[0:2]+AppName[3:]) + "_"
 	defaultConfigFile := "/etc/oc/" + AppName[3:] + ".json"
 	localConfigFile := "./" + AppName[3:] + ".json"
 	var configFile string
 	var o *onion.Onion
-	l3 := GetEnvVarLayer(EnvPrefix)
+	l3 := onion.NewEnvLayerPrefix("_", EnvPrefix)
 	l2, err := onion.NewFileLayer(localConfigFile, nil)
 	if err == nil {
 		logger.Info().Msg("Local config file found " + localConfigFile + ", overriding default file")
@@ -54,17 +54,3 @@ func GetConfLoader() *onion.Onion {
 	}
 	return o
 }
-
-func GetEnvVarLayer(prefix string) onion.Layer {
-	envVars := make(map[string]interface{})
-
-	for _, e := range os.Environ() {
-		pair := strings.SplitN(e, "=", 2)
-		key := pair[0]
-		if strings.HasPrefix(key, prefix) {
-			envVars[strings.TrimPrefix(key, prefix)] = pair[1]
-		}
-	}
-
-	return onion.NewMapLayer(envVars)
-}

models/booking/booking_mongo_accessor.go

@@ -51,15 +51,13 @@ func (a *bookingMongoAccessor) CopyOne(data utils.DBObject) (utils.DBObject, int
 
 func (a *bookingMongoAccessor) LoadOne(id string) (utils.DBObject, int, error) {
 	return utils.GenericLoadOne[*Booking](id, func(d utils.DBObject) (utils.DBObject, int, error) {
-		now := time.Now()
+		if d.(*Booking).State == enum.DRAFT && time.Now().UTC().After(d.(*Booking).ExpectedStartDate) {
-		now = now.Add(time.Second * -60)
-		if d.(*Booking).State == enum.DRAFT && now.UTC().After(d.(*Booking).ExpectedStartDate) {
 			return utils.GenericDeleteOne(d.GetID(), a)
 		}
 		if (d.(*Booking).ExpectedEndDate) == nil {
 			d.(*Booking).State = enum.FORGOTTEN
 			utils.GenericRawUpdateOne(d, id, a)
-		} else if d.(*Booking).State == enum.SCHEDULED && now.UTC().After(d.(*Booking).ExpectedStartDate) {
+		} else if d.(*Booking).State == enum.SCHEDULED && time.Now().UTC().After(*&d.(*Booking).ExpectedStartDate) {
 			d.(*Booking).State = enum.DELAYED
 			utils.GenericRawUpdateOne(d, id, a)
 		}
@@ -77,13 +75,11 @@ func (a *bookingMongoAccessor) Search(filters *dbs.Filters, search string, isDra
 
 func (a *bookingMongoAccessor) getExec() func(utils.DBObject) utils.ShallowDBObject {
 	return func(d utils.DBObject) utils.ShallowDBObject {
-		now := time.Now()
+		if d.(*Booking).State == enum.DRAFT && time.Now().UTC().After(d.(*Booking).ExpectedStartDate) {
-		now = now.Add(time.Second * -60)
-		if d.(*Booking).State == enum.DRAFT && now.UTC().After(d.(*Booking).ExpectedStartDate) {
 			utils.GenericDeleteOne(d.GetID(), a)
 			return nil
 		}
-		if d.(*Booking).State == enum.SCHEDULED && now.UTC().After(d.(*Booking).ExpectedStartDate) {
+		if d.(*Booking).State == enum.SCHEDULED && time.Now().UTC().After(*&d.(*Booking).ExpectedStartDate) {
 			d.(*Booking).State = enum.DELAYED
 			utils.GenericRawUpdateOne(d, d.GetID(), a)
 		}

models/peer/peer_cache.go

@@ -48,7 +48,7 @@ func (p *PeerCache) urlFormat(url string, dt tools.DataType) string {
 			url = strings.ReplaceAll(url, localhost, dt.API()+":8080/oc")
 		}
 	} else {
-		url = url + "/" + strings.ReplaceAll(dt.API(), "oc-", "")
+		url = url + "/" + dt.API()
 	}
 	return url
 }

models/resources/resource.go

@@ -89,9 +89,6 @@ func (r *AbstractInstanciatedResource[T]) GetSelectedInstance() utils.DBObject {
 }
 
 func (abs *AbstractInstanciatedResource[T]) SetAllowedInstances(request *tools.APIRequest) {
-	if request != nil && request.PeerID == abs.CreatorID && request.PeerID != "" {
-		return
-	}
 	abs.Instances = verifyAuthAction[T](abs.Instances, request)
 }
 

models/resources/resource_accessor.go

@@ -65,12 +65,6 @@ func (wfa *resourceMongoAccessor[T]) LoadAll(isDraft bool) ([]utils.ShallowDBObj
 }
 
 func (wfa *resourceMongoAccessor[T]) Search(filters *dbs.Filters, search string, isDraft bool) ([]utils.ShallowDBObject, int, error) {
-	if filters == nil && search == "*" {
-		return utils.GenericLoadAll[T](func(d utils.DBObject) utils.ShallowDBObject {
-			d.(T).SetAllowedInstances(wfa.Request)
-			return d
-		}, isDraft, wfa)
-	}
 	return utils.GenericSearch[T](filters, search, wfa.getResourceFilter(search),
 		func(d utils.DBObject) utils.ShallowDBObject {
 			d.(T).SetAllowedInstances(wfa.Request)
@@ -79,6 +73,9 @@ func (wfa *resourceMongoAccessor[T]) Search(filters *dbs.Filters, search string,
 }
 
 func (abs *resourceMongoAccessor[T]) getResourceFilter(search string) *dbs.Filters {
+	if search == "*" {
+		search = ""
+	}
 	return &dbs.Filters{
 		Or: map[string][]dbs.Filter{ // filter by like name, short_description, description, owner, url if no filters are provided
 			"abstractintanciatedresource.abstractresource.abstractobject.name":       {{Operator: dbs.LIKE.String(), Value: search}},

models/utils/abstracts.go

@@ -91,7 +91,7 @@ func (ao *AbstractObject) UpToDate(user string, peer string, create bool) {
 }
 
 func (ao *AbstractObject) VerifyAuth(request *tools.APIRequest) bool {
-	return ao.AccessMode == Public || (request != nil && ao.CreatorID == request.PeerID && request.PeerID != "")
+	return ao.AccessMode == Public || (request != nil && ao.CreatorID == request.PeerID)
 }
 
 func (ao *AbstractObject) GetObjectFilters(search string) *dbs.Filters {

models/workflow/workflow_mongo_accessor.go

@@ -95,7 +95,7 @@ func (a *workflowMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.
 	if set.(*Workflow).Graph != nil && set.(*Workflow).Graph.Partial {
 		return nil, 403, errors.New("you are not allowed to update a partial workflow")
 	}
-	res, code, err := utils.GenericUpdateOne(set, id, a, &Workflow{})
+	res, code, err := utils.GenericUpdateOne(a.verifyResource(set), id, a, &Workflow{})
 	if code != 200 {
 		return nil, code, err
 	}

models/workflow_execution/workflow_execution_mongo_accessor.go

@@ -60,13 +60,11 @@ func (wfa *workflowExecutionMongoAccessor) CopyOne(data utils.DBObject) (utils.D
 
 func (a *workflowExecutionMongoAccessor) LoadOne(id string) (utils.DBObject, int, error) {
 	return utils.GenericLoadOne[*WorkflowExecution](id, func(d utils.DBObject) (utils.DBObject, int, error) {
-		now := time.Now()
+		if d.(*WorkflowExecution).State == enum.DRAFT && !a.shallow && time.Now().UTC().After(d.(*WorkflowExecution).ExecDate) {
-		now = now.Add(time.Second * -60)
-		if d.(*WorkflowExecution).State == enum.DRAFT && !a.shallow && now.UTC().After(d.(*WorkflowExecution).ExecDate) {
 			utils.GenericDeleteOne(d.GetID(), newShallowAccessor(a.Request))
 			return nil, 404, errors.New("not found")
 		}
-		if d.(*WorkflowExecution).State == enum.SCHEDULED && !a.shallow && now.UTC().After(d.(*WorkflowExecution).ExecDate) {
+		if d.(*WorkflowExecution).State == enum.SCHEDULED && !a.shallow && time.Now().UTC().After(d.(*WorkflowExecution).ExecDate) {
 			d.(*WorkflowExecution).State = enum.FORGOTTEN
 			utils.GenericRawUpdateOne(d, id, newShallowAccessor(a.Request))
 		}
@@ -84,13 +82,11 @@ func (a *workflowExecutionMongoAccessor) Search(filters *dbs.Filters, search str
 
 func (a *workflowExecutionMongoAccessor) getExec() func(utils.DBObject) utils.ShallowDBObject {
 	return func(d utils.DBObject) utils.ShallowDBObject {
-		now := time.Now()
+		if d.(*WorkflowExecution).State == enum.DRAFT && time.Now().UTC().After(d.(*WorkflowExecution).ExecDate) {
-		now = now.Add(time.Second * -60)
-		if d.(*WorkflowExecution).State == enum.DRAFT && now.UTC().After(d.(*WorkflowExecution).ExecDate) {
 			utils.GenericDeleteOne(d.GetID(), newShallowAccessor(a.Request))
 			return nil
 		}
-		if d.(*WorkflowExecution).State == enum.SCHEDULED && now.UTC().After(d.(*WorkflowExecution).ExecDate) {
+		if d.(*WorkflowExecution).State == enum.SCHEDULED && time.Now().UTC().After(d.(*WorkflowExecution).ExecDate) {
 			d.(*WorkflowExecution).State = enum.FORGOTTEN
 			utils.GenericRawUpdateOne(d, d.GetID(), newShallowAccessor(a.Request))
 			return d

models/workflow_execution/workflow_scheduler.go

@@ -118,16 +118,15 @@ func (ws *WorkflowSchedule) Schedules(wfID string, request *tools.APIRequest) (*
 			return ws, wf, executions, errors.New("could not launch the peer execution : " + fmt.Sprintf("%v", err))
 		}
 	}
-	fmt.Println("Schedules")
 	for _, exec := range executions {
 		err := exec.PurgeDraft(request)
 		if err != nil {
 			return ws, nil, []*WorkflowExecution{}, errors.New("purge draft" + fmt.Sprintf("%v", err))
 		}
 		exec.StoreDraftDefault()
-		utils.GenericStoreOne(exec, NewAccessor(request))
+		// Should DELETE the previous execution2
+		fmt.Println(utils.GenericStoreOne(exec, NewAccessor(request)))
 	}
-	fmt.Println("Schedules")
 	return ws, wf, executions, nil
 }
 

models/workspace/workspace_mongo_accessor.go

@@ -73,10 +73,8 @@ func (a *workspaceMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject,
 	filters := &dbs.Filters{
 		Or: map[string][]dbs.Filter{
 			"abstractobject.name": {{Operator: dbs.LIKE.String(), Value: data.GetName() + "_workspace"}},
-			"abstractobject.creator_id": {{Operator: dbs.EQUAL.String(), Value: a.GetPeerID()}},
 		},
 	}
-	// filters *dbs.Filters, word string, isDraft bool
 	res, _, err := a.Search(filters, "", true) // Search for the workspace
 	if err == nil && len(res) > 0 {            // If the workspace already exists, return an error
 		return nil, 409, errors.New("a workspace with the same name already exists")

tools/api.go

@@ -3,7 +3,6 @@ package tools
 import (
 	"encoding/json"
 	"errors"
-	"fmt"
 	"strings"
 
 	"cloud.o-forge.io/core/oc-lib/config"
@@ -98,7 +97,6 @@ func (a *API) SubscribeRouter(infos []*beego.ControllerInfo) {
 	nats := NewNATSCaller()
 	discovery := map[string][]string{}
 	for _, info := range infos {
-		fmt.Println("DISCOVERY", info.GetPattern())
 		path := strings.ReplaceAll(info.GetPattern(), "/oc/", "/"+strings.ReplaceAll(config.GetAppName(), "oc-", ""))
 		for k, v := range info.GetMethod() {
 			if discovery[path] == nil {