core/oc-lib
5
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

module name

Browse Source
This commit is contained in:
mr 2024-07-18 13:35:14 +02:00
parent 7d5bdadbef
commit 1999213f8b
19 changed files with 103 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
dbs/mongo/mongo.go
View File

@ -4,11 +4,14 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"errors" "errors"
lib "oc-lib"
"oc-lib/dbs"
"os" "os"
"time" "time"
lib "cloud.o-forge.io/core/oc-lib"
"cloud.o-forge.io/core/oc-lib/dbs"
"cloud.o-forge.io/core/oc-lib/logs"
"github.com/rs/zerolog"
"go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo"
@ -26,39 +29,45 @@ var (
ResourceMap map[string]interface{} ResourceMap map[string]interface{}
) )
func Init(collections []string) { var MONGOService = MongoDB{}
type MongoDB struct {
Logger zerolog.Logger
}
func (m *MongoDB) Init(collections []string) {
// var baseConfig string // var baseConfig string
var err error var err error
var conf map[string]string var conf map[string]string
var DBname string var DBname string
m.Logger = logs.CreateLogger("oc-lib", "")
ResourceMap = make(map[string]interface{}) ResourceMap = make(map[string]interface{})
lib.Logger = lib.CreateLogger("oclib", "") logger := logs.CreateLogger("oclib", "")
db_conf, err := os.ReadFile("tests/oclib_conf.json") db_conf, err := os.ReadFile("tests/oclib_conf.json")
if err != nil { if err != nil {
lib.Logger.Fatal().Msg("Could not find configuration file") logger.Fatal().Msg("Could not find configuration file")
} }
json.Unmarshal(db_conf, &conf) json.Unmarshal(db_conf, &conf)
DBname = lib.GetConfig().DCNAME + "-" + lib.GetConfig().DBPOINT DBname = lib.GetConfig().DCNAME + "-" + lib.GetConfig().DBPOINT
lib.Logger.Info().Msg("Connecting to" + lib.GetConfig().MongoURL) logger.Info().Msg("Connecting to" + lib.GetConfig().MongoURL)
MngoCtx, cancel = context.WithTimeout(context.Background(), 10*time.Second) MngoCtx, cancel = context.WithTimeout(context.Background(), 10*time.Second)
defer cancel() defer cancel()
createClient(lib.GetConfig().MongoURL) m.createClient(lib.GetConfig().MongoURL)
lib.Logger.Info().Msg("Connecting mongo client to db " + DBname) logger.Info().Msg("Connecting mongo client to db " + DBname)
prepareDB(collections, lib.GetConfig().DCNAME, lib.GetConfig().DBPOINT) m.prepareDB(collections, lib.GetConfig().DCNAME, lib.GetConfig().DBPOINT)
lib.Logger.Info().Msg("Database is READY") logger.Info().Msg("Database is READY")
} }
func createClient(MongoURL string) { func (m *MongoDB) createClient(MongoURL string) {
var err error var err error
@ -71,30 +80,30 @@ func createClient(MongoURL string) {
clientOptions := options.Client().ApplyURI(MongoURL).SetBSONOptions(bsonOpts) clientOptions := options.Client().ApplyURI(MongoURL).SetBSONOptions(bsonOpts)
mngoClient, err = mongo.Connect(MngoCtx, clientOptions) mngoClient, err = mongo.Connect(MngoCtx, clientOptions)
if err != nil { if err != nil {
lib.Logger.Fatal().Msg("Mongodb NewClient " + MongoURL + ":" + "err") m.Logger.Fatal().Msg("Mongodb NewClient " + MongoURL + ":" + "err")
panic(err) panic(err)
} }
// Ping the primary // Ping the primary
if mngoClient, err = mongo.Connect(MngoCtx, clientOptions); err != nil { if mngoClient, err = mongo.Connect(MngoCtx, clientOptions); err != nil {
lib.Logger.Fatal().Msg("Mongodb connect " + MongoURL + ":" + "err") m.Logger.Fatal().Msg("Mongodb connect " + MongoURL + ":" + "err")
panic(err) panic(err)
} }
if err = mngoClient.Ping(MngoCtx, nil); err != nil { if err = mngoClient.Ping(MngoCtx, nil); err != nil {
lib.Logger.Fatal().Msg("Mongodb ping " + MongoURL + ":" + "err") m.Logger.Fatal().Msg("Mongodb ping " + MongoURL + ":" + "err")
panic(err) panic(err)
} }
} }
func prepareDB(list_collection []string, dc_name string, db_point string) { func (m *MongoDB) prepareDB(list_collection []string, dc_name string, db_point string) {
var err error var err error
DBname := dc_name + "-" + db_point DBname := dc_name + "-" + db_point
mngoDB = mngoClient.Database(DBname) mngoDB = mngoClient.Database(DBname)
existingCollections, err = mngoDB.ListCollectionNames(MngoCtx, bson.D{}) existingCollections, err = mngoDB.ListCollectionNames(MngoCtx, bson.D{})
if err != nil { if err != nil {
lib.Logger.Fatal().Msg("Error contacting MongoDB\n" + err.Error()) m.Logger.Fatal().Msg("Error contacting MongoDB\n" + err.Error())
} }
collectionMap := make(map[string]bool) collectionMap := make(map[string]bool)
for _, name := range existingCollections { for _, name := range existingCollections {
@ -105,17 +114,16 @@ func prepareDB(list_collection []string, dc_name string, db_point string) {
for _, collection_name := range list_collection { for _, collection_name := range list_collection {
new_collection := mngoDB.Collection(collection_name) new_collection := mngoDB.Collection(collection_name)
if _, exists := collectionMap[collection_name]; !exists { if _, exists := collectionMap[collection_name]; !exists {
createCollection(collection_name, new_collection) m.createCollection(collection_name, new_collection)
} else { } else {
CollectionMap[collection_name] = new_collection CollectionMap[collection_name] = new_collection
} }
} }
} }
// Creates the collection with index specified in mongo/mongo_collections // Creates the collection with index specified in mongo/mongo_collections
// or use the basic collection creation function // or use the basic collection creation function
func createCollection(collection_name string, new_collection *mongo.Collection) { func (m *MongoDB) createCollection(collection_name string, new_collection *mongo.Collection) {
var err error var err error
CollectionMap[collection_name] = new_collection CollectionMap[collection_name] = new_collection
_, exists := IndexesMap[collection_name] _, exists := IndexesMap[collection_name]
@ -123,10 +131,10 @@ func createCollection(collection_name string, new_collection *mongo.Collection)
if _, err = new_collection.Indexes().CreateMany(MngoCtx, IndexesMap[collection_name]); err != nil { if _, err = new_collection.Indexes().CreateMany(MngoCtx, IndexesMap[collection_name]); err != nil {
var cmdErr mongo.CommandError var cmdErr mongo.CommandError
if errors.As(err, &cmdErr) && cmdErr.Code != 85 { if errors.As(err, &cmdErr) && cmdErr.Code != 85 {
lib.Logger.Fatal().Msg("Error creating indexes for " + collection_name + " collection : \n" + err.Error()) m.Logger.Fatal().Msg("Error creating indexes for " + collection_name + " collection : \n" + err.Error())
panic(err) panic(err)
} else if !errors.As(err, &cmdErr) { } else if !errors.As(err, &cmdErr) {
lib.Logger.Fatal().Msg("Unexpected error: " + err.Error()) m.Logger.Fatal().Msg("Unexpected error: " + err.Error())
panic(err) panic(err)
} }
} }
@ -136,7 +144,7 @@ func createCollection(collection_name string, new_collection *mongo.Collection)
} }
func DeleteOne(id string, collection_name string) (int64, error) { func (m *MongoDB) DeleteOne(id string, collection_name string) (int64, error) {
filter := bson.M{"_id": GetObjIDFromString(id)} filter := bson.M{"_id": GetObjIDFromString(id)}
targetDBCollection := CollectionMap[collection_name] targetDBCollection := CollectionMap[collection_name]
opts := options.Delete().SetHint(bson.D{{Key: "_id", Value: 1}}) opts := options.Delete().SetHint(bson.D{{Key: "_id", Value: 1}})
@ -145,13 +153,13 @@ func DeleteOne(id string, collection_name string) (int64, error) {
result, err := targetDBCollection.DeleteOne(MngoCtx, filter, opts) result, err := targetDBCollection.DeleteOne(MngoCtx, filter, opts)
if err != nil { if err != nil {
lib.Logger.Error().Msg("Couldn't insert resource: " + err.Error()) m.Logger.Error().Msg("Couldn't insert resource: " + err.Error())
return 0, err return 0, err
} }
return result.DeletedCount, nil return result.DeletedCount, nil
} }
func UpdateOne(set map[string]interface{}, id string, collection_name string) (string, error) { func (m *MongoDB) UpdateOne(set map[string]interface{}, id string, collection_name string) (string, error) {
filter := bson.M{"_id": GetObjIDFromString(id)} filter := bson.M{"_id": GetObjIDFromString(id)}
targetDBCollection := CollectionMap[collection_name] targetDBCollection := CollectionMap[collection_name]
MngoCtx, cancel = context.WithTimeout(context.Background(), 10*time.Second) MngoCtx, cancel = context.WithTimeout(context.Background(), 10*time.Second)
@ -159,13 +167,13 @@ func UpdateOne(set map[string]interface{}, id string, collection_name string) (s
result, err := targetDBCollection.UpdateOne(MngoCtx, filter, dbs.InputToBson(set, true)) result, err := targetDBCollection.UpdateOne(MngoCtx, filter, dbs.InputToBson(set, true))
if err != nil { if err != nil {
lib.Logger.Error().Msg("Couldn't insert resource: " + err.Error()) m.Logger.Error().Msg("Couldn't insert resource: " + err.Error())
return "", err return "", err
} }
return result.UpsertedID.(primitive.ObjectID).Hex(), nil return result.UpsertedID.(primitive.ObjectID).Hex(), nil
} }
func StoreOne(obj interface{}, collection_name string) (string, error) { func (m *MongoDB) StoreOne(obj interface{}, collection_name string) (string, error) {
targetDBCollection := CollectionMap[collection_name] targetDBCollection := CollectionMap[collection_name]
MngoCtx, cancel = context.WithTimeout(context.Background(), 10*time.Second) MngoCtx, cancel = context.WithTimeout(context.Background(), 10*time.Second)
@ -173,14 +181,14 @@ func StoreOne(obj interface{}, collection_name string) (string, error) {
result, err := targetDBCollection.InsertOne(MngoCtx, obj) result, err := targetDBCollection.InsertOne(MngoCtx, obj)
if err != nil { if err != nil {
lib.Logger.Error().Msg("Couldn't insert resource: " + err.Error()) m.Logger.Error().Msg("Couldn't insert resource: " + err.Error())
return "", err return "", err
} }
return result.InsertedID.(primitive.ObjectID).Hex(), nil return result.InsertedID.(primitive.ObjectID).Hex(), nil
} }
func LoadOne(id string, collection_name string) (res *mongo.SingleResult, err error) { func (m *MongoDB) LoadOne(id string, collection_name string) (res *mongo.SingleResult, err error) {
filter := bson.M{"_id": GetObjIDFromString(id)} filter := bson.M{"_id": GetObjIDFromString(id)}
targetDBCollection := CollectionMap[collection_name] targetDBCollection := CollectionMap[collection_name]
@ -189,7 +197,7 @@ func LoadOne(id string, collection_name string) (res *mongo.SingleResult, err er
res = targetDBCollection.FindOne(MngoCtx, filter) res = targetDBCollection.FindOne(MngoCtx, filter)
if res.Err() != nil { if res.Err() != nil {
lib.Logger.Error().Msg("Couldn't find resource " + id + ". Error : " + res.Err().Error()) m.Logger.Error().Msg("Couldn't find resource " + id + ". Error : " + res.Err().Error())
err = res.Err() err = res.Err()
return nil, err return nil, err
} }

41
logger.go
View File

@ -1,41 +0,0 @@
package oclib
import (
"oc-lib/logs"
"os"
"runtime"
"time"
"github.com/rs/zerolog"
)
var Logger zerolog.Logger
// CreateLogger
// Create a new logger
// Parameters:
// - appname: string : the name of the application using oclib
// - url: string : the url of a loki logger, console log only if ""
// Returns:
// - zerolog.Logger : the logger that will log for the library and the app
func CreateLogger(appname string, url string) zerolog.Logger {
if url != "" {
labels := map[string]string{
"app": "app",
"code": "go",
"platform": runtime.GOOS,
}
lokiWriter := logs.NewLokiWriter(url, labels)
consoleWriter := zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: time.RFC3339}
multiWriter := zerolog.MultiLevelWriter(consoleWriter, lokiWriter)
Logger = zerolog.New(multiWriter).With().Timestamp().Logger()
} else {
Logger = zerolog.New(os.Stdout).With().Timestamp().Logger()
}
return Logger
}

22
models/models.go
View File

@ -1,15 +1,15 @@
package models package models
import ( import (
oclib "oc-lib" "cloud.o-forge.io/core/oc-lib/dbs/mongo"
"oc-lib/dbs/mongo" "cloud.o-forge.io/core/oc-lib/logs"
r "oc-lib/models/resources" r "cloud.o-forge.io/core/oc-lib/models/resources"
d "oc-lib/models/resources/data" d "cloud.o-forge.io/core/oc-lib/models/resources/data"
dc "oc-lib/models/resources/datacenter" dc "cloud.o-forge.io/core/oc-lib/models/resources/datacenter"
p "oc-lib/models/resources/processing" p "cloud.o-forge.io/core/oc-lib/models/resources/processing"
s "oc-lib/models/resources/storage" s "cloud.o-forge.io/core/oc-lib/models/resources/storage"
"oc-lib/models/utils" "cloud.o-forge.io/core/oc-lib/models/utils"
w "oc-lib/models/workflow" w "cloud.o-forge.io/core/oc-lib/models/workflow"
) )
var models = map[string]utils.DBObject{ var models = map[string]utils.DBObject{
@ -21,7 +21,7 @@ var models = map[string]utils.DBObject{
} }
func Model(model string) utils.DBObject { func Model(model string) utils.DBObject {
log := oclib.CreateLogger("oclib", "") log := logs.CreateLogger("oclib", "")
if _, ok := models[model]; ok { if _, ok := models[model]; ok {
return models[model] return models[model]
} }
@ -34,5 +34,5 @@ func Init() {
for db := range models { for db := range models {
dbs = append(dbs, db) dbs = append(dbs, db)
} }
mongo.Init(dbs) mongo.MONGOService.Init(dbs)
} }

4
models/resources/data/data.go
View File

@ -1,8 +1,8 @@
package data package data
import ( import (
resources "oc-lib/models/resources" resources "cloud.o-forge.io/core/oc-lib/models/resources"
"oc-lib/models/utils" "cloud.o-forge.io/core/oc-lib/models/utils"
) )
type Data struct { type Data struct {

8
models/resources/data/data_mongo_accessor.go
View File

@ -1,8 +1,8 @@
package data package data
import ( import (
mongo "oc-lib/dbs/mongo" mongo "cloud.o-forge.io/core/oc-lib/dbs/mongo"
"oc-lib/models/utils" "cloud.o-forge.io/core/oc-lib/models/utils"
) )
type DataMongoAccessor struct { type DataMongoAccessor struct {
@ -18,7 +18,7 @@ func (dma *DataMongoAccessor) UpdateOne(set map[string]interface{}, id string) u
} }
func (dma *DataMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject { func (dma *DataMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject {
id, err := mongo.StoreOne(data.(*Data), "data") id, err := mongo.MONGOService.StoreOne(data.(*Data), "data")
if err != nil { if err != nil {
dma.Logger.Error().Msg("Could not store " + data.GetName() + " to db. Error: " + err.Error()) dma.Logger.Error().Msg("Could not store " + data.GetName() + " to db. Error: " + err.Error())
return &Data{} return &Data{}
@ -28,7 +28,7 @@ func (dma *DataMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject {
func (dma *DataMongoAccessor) LoadOne(id string) utils.DBObject { func (dma *DataMongoAccessor) LoadOne(id string) utils.DBObject {
var data Data var data Data
res_mongo, err := mongo.LoadOne(id, "data") res_mongo, err := mongo.MONGOService.LoadOne(id, "data")
if err != nil { if err != nil {
dma.Logger.Error().Msg("Could not retrieve " + id + " from db. Error: " + err.Error()) dma.Logger.Error().Msg("Could not retrieve " + id + " from db. Error: " + err.Error())
return &Data{} return &Data{}

3
models/resources/data/data_test.go
View File

@ -1,9 +1,10 @@
package data package data
import ( import (
resources "oc-lib/models/resources"
"testing" "testing"
resources "cloud.o-forge.io/core/oc-lib/models/resources"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

4
models/resources/datacenter/datacenter.go
View File

@ -1,8 +1,8 @@
package datacenter package datacenter
import ( import (
resources "oc-lib/models/resources" resources "cloud.o-forge.io/core/oc-lib/models/resources"
"oc-lib/models/utils" "cloud.o-forge.io/core/oc-lib/models/utils"
) )
type Datacenter struct { type Datacenter struct {

10
models/resources/datacenter/datacenter_mongo_accessor.go
View File

@ -1,9 +1,9 @@
package datacenter package datacenter
import ( import (
"oc-lib/dbs/mongo" "cloud.o-forge.io/core/oc-lib/dbs/mongo"
logs "oc-lib/logs" logs "cloud.o-forge.io/core/oc-lib/logs"
"oc-lib/models/utils" "cloud.o-forge.io/core/oc-lib/models/utils"
) )
type DatacenterMongoAccessor struct { type DatacenterMongoAccessor struct {
@ -19,7 +19,7 @@ func (dma *DatacenterMongoAccessor) UpdateOne(set map[string]interface{}, id str
} }
func (dma *DatacenterMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject { func (dma *DatacenterMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject {
id, err := mongo.StoreOne(data.(*Datacenter), "data") id, err := mongo.MONGOService.StoreOne(data.(*Datacenter), "data")
if err != nil { if err != nil {
dma.Logger.Error().Msg("Could not store " + data.GetName() + " to db. Error: " + err.Error()) dma.Logger.Error().Msg("Could not store " + data.GetName() + " to db. Error: " + err.Error())
return &Datacenter{} return &Datacenter{}
@ -30,7 +30,7 @@ func (dma *DatacenterMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject
func (dca *DatacenterMongoAccessor) LoadOne(id string) utils.DBObject { func (dca *DatacenterMongoAccessor) LoadOne(id string) utils.DBObject {
var datacenter Datacenter var datacenter Datacenter
res_mongo, err := mongo.LoadOne(id, "datacenter") res_mongo, err := mongo.MONGOService.LoadOne(id, "datacenter")
if err != nil { if err != nil {
l := logs.CreateLogger("oclib", "") l := logs.CreateLogger("oclib", "")
l.Error().Msg("Could not retrieve " + id + " from db. Error: " + err.Error()) l.Error().Msg("Could not retrieve " + id + " from db. Error: " + err.Error())

3
models/resources/datacenter/datacenter_test.go
View File

@ -1,9 +1,10 @@
package datacenter package datacenter
import ( import (
resources "oc-lib/models/resources"
"testing" "testing"
resources "cloud.o-forge.io/core/oc-lib/models/resources"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

4
models/resources/processing/processing.go
View File

@ -1,8 +1,8 @@
package processing package processing
import ( import (
resources "oc-lib/models/resources" resources "cloud.o-forge.io/core/oc-lib/models/resources"
"oc-lib/models/utils" "cloud.o-forge.io/core/oc-lib/models/utils"
) )
type Processing struct { type Processing struct {

10
models/resources/processing/processing_mongo_accessor.go
View File

@ -1,9 +1,9 @@
package processing package processing
import ( import (
"oc-lib/dbs/mongo" "cloud.o-forge.io/core/oc-lib/dbs/mongo"
"oc-lib/logs" "cloud.o-forge.io/core/oc-lib/logs"
"oc-lib/models/utils" "cloud.o-forge.io/core/oc-lib/models/utils"
) )
type ProcessingMongoAccessor struct { type ProcessingMongoAccessor struct {
@ -19,7 +19,7 @@ func (dma *ProcessingMongoAccessor) UpdateOne(set map[string]interface{}, id str
} }
func (dma *ProcessingMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject { func (dma *ProcessingMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject {
id, err := mongo.StoreOne(data.(*Processing), "data") id, err := mongo.MONGOService.StoreOne(data.(*Processing), "data")
if err != nil { if err != nil {
dma.Logger.Error().Msg("Could not store " + data.GetName() + " to db. Error: " + err.Error()) dma.Logger.Error().Msg("Could not store " + data.GetName() + " to db. Error: " + err.Error())
return &Processing{} return &Processing{}
@ -31,7 +31,7 @@ func (pma *ProcessingMongoAccessor) LoadOne(id string) utils.DBObject {
var processing Processing var processing Processing
res_mongo, err := mongo.LoadOne(id, "processing") res_mongo, err := mongo.MONGOService.LoadOne(id, "processing")
if err != nil { if err != nil {
l := logs.CreateLogger("oclib", "") l := logs.CreateLogger("oclib", "")
l.Error().Msg("Could not retrieve " + id + " from db. Error: " + err.Error()) l.Error().Msg("Could not retrieve " + id + " from db. Error: " + err.Error())

3
models/resources/processing/processing_test.go
View File

@ -1,9 +1,10 @@
package processing package processing
import ( import (
resources "oc-lib/models/resources"
"testing" "testing"
resources "cloud.o-forge.io/core/oc-lib/models/resources"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

4
models/resources/storage/storage.go
View File

@ -1,8 +1,8 @@
package storage package storage
import ( import (
resources "oc-lib/models/resources" resources "cloud.o-forge.io/core/oc-lib/models/resources"
"oc-lib/models/utils" "cloud.o-forge.io/core/oc-lib/models/utils"
) )
type URL struct { type URL struct {

10
models/resources/storage/storage_mongo_accessor.go
View File

@ -1,9 +1,9 @@
package storage package storage
import ( import (
"oc-lib/dbs/mongo" "cloud.o-forge.io/core/oc-lib/dbs/mongo"
"oc-lib/logs" "cloud.o-forge.io/core/oc-lib/logs"
"oc-lib/models/utils" "cloud.o-forge.io/core/oc-lib/models/utils"
) )
type StorageMongoAccessor struct { type StorageMongoAccessor struct {
@ -19,7 +19,7 @@ func (dma *StorageMongoAccessor) UpdateOne(set map[string]interface{}, id string
} }
func (dma *StorageMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject { func (dma *StorageMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject {
id, err := mongo.StoreOne(data.(*Storage), "data") id, err := mongo.MONGOService.StoreOne(data.(*Storage), "data")
if err != nil { if err != nil {
dma.Logger.Error().Msg("Could not store " + data.GetName() + " to db. Error: " + err.Error()) dma.Logger.Error().Msg("Could not store " + data.GetName() + " to db. Error: " + err.Error())
return &Storage{} return &Storage{}
@ -31,7 +31,7 @@ func (schedulema *StorageMongoAccessor) LoadOne(id string) utils.DBObject {
var storage Storage var storage Storage
res_mongo, err := mongo.LoadOne(id, "storage") res_mongo, err := mongo.MONGOService.LoadOne(id, "storage")
if err != nil { if err != nil {
l := logs.CreateLogger("oclib", "") l := logs.CreateLogger("oclib", "")
l.Error().Msg("Could not retrieve " + id + " from db. Error: " + err.Error()) l.Error().Msg("Could not retrieve " + id + " from db. Error: " + err.Error())

3
models/resources/storage/storage_test.go
View File

@ -1,9 +1,10 @@
package storage package storage
import ( import (
resources "oc-lib/models/resources"
"testing" "testing"
resources "cloud.o-forge.io/core/oc-lib/models/resources"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

11
models/utils/abstracts.go
View File

@ -1,9 +1,8 @@
package utils package utils
import ( import (
oclib "oc-lib" "cloud.o-forge.io/core/oc-lib/dbs/mongo"
"oc-lib/dbs/mongo" "cloud.o-forge.io/core/oc-lib/logs"
"github.com/rs/zerolog" "github.com/rs/zerolog"
) )
@ -12,11 +11,11 @@ type AbstractAccessor struct {
} }
func (dma *AbstractAccessor) SetLogger() { func (dma *AbstractAccessor) SetLogger() {
dma.Logger = oclib.CreateLogger("oclib", "") dma.Logger = logs.CreateLogger("oclib", "")
} }
func (dma *AbstractAccessor) GenericDeleteOne(id string, accessor Accessor) DBObject { func (dma *AbstractAccessor) GenericDeleteOne(id string, accessor Accessor) DBObject {
res := accessor.LoadOne(id) res := accessor.LoadOne(id)
_, err := mongo.DeleteOne(id, "data") _, err := mongo.MONGOService.DeleteOne(id, "data")
if err != nil { if err != nil {
dma.Logger.Error().Msg("Could not delete " + id + " to db. Error: " + err.Error()) dma.Logger.Error().Msg("Could not delete " + id + " to db. Error: " + err.Error())
} }
@ -24,7 +23,7 @@ func (dma *AbstractAccessor) GenericDeleteOne(id string, accessor Accessor) DBOb
} }
func (dma *AbstractAccessor) GenericUpdateOne(set map[string]interface{}, id string, accessor Accessor) DBObject { func (dma *AbstractAccessor) GenericUpdateOne(set map[string]interface{}, id string, accessor Accessor) DBObject {
id, err := mongo.UpdateOne(set, id, "data") id, err := mongo.MONGOService.UpdateOne(set, id, "data")
if err != nil { if err != nil {
dma.Logger.Error().Msg("Could not update " + id + " to db. Error: " + err.Error()) dma.Logger.Error().Msg("Could not update " + id + " to db. Error: " + err.Error())
} }

14
models/workflow/workflow.go
View File

@ -1,13 +1,13 @@
package oclib package oclib
import ( import (
"oc-lib/models/resources" "cloud.o-forge.io/core/oc-lib/models/resources"
"oc-lib/models/resources/data" "cloud.o-forge.io/core/oc-lib/models/resources/data"
"oc-lib/models/resources/datacenter" "cloud.o-forge.io/core/oc-lib/models/resources/datacenter"
"oc-lib/models/resources/processing" "cloud.o-forge.io/core/oc-lib/models/resources/processing"
"oc-lib/models/resources/storage" "cloud.o-forge.io/core/oc-lib/models/resources/storage"
"oc-lib/models/utils" "cloud.o-forge.io/core/oc-lib/models/utils"
"oc-lib/models/workflow/graph" "cloud.o-forge.io/core/oc-lib/models/workflow/graph"
) )
const WORKFLOW = "workflow" const WORKFLOW = "workflow"

10
models/workflow/workflow_mongo_accessor.go
View File

@ -1,9 +1,9 @@
package oclib package oclib
import ( import (
"oc-lib/dbs/mongo" "cloud.o-forge.io/core/oc-lib/dbs/mongo"
"oc-lib/logs" "cloud.o-forge.io/core/oc-lib/logs"
"oc-lib/models/utils" "cloud.o-forge.io/core/oc-lib/models/utils"
) )
type WorkflowMongoAccessor struct { type WorkflowMongoAccessor struct {
@ -19,7 +19,7 @@ func (dma *WorkflowMongoAccessor) UpdateOne(set map[string]interface{}, id strin
} }
func (dma *WorkflowMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject { func (dma *WorkflowMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject {
id, err := mongo.StoreOne(data.(*Workflow), "data") id, err := mongo.MONGOService.StoreOne(data.(*Workflow), "data")
if err != nil { if err != nil {
dma.Logger.Error().Msg("Could not store " + data.GetName() + " to db. Error: " + err.Error()) dma.Logger.Error().Msg("Could not store " + data.GetName() + " to db. Error: " + err.Error())
return &Workflow{} return &Workflow{}
@ -30,7 +30,7 @@ func (dma *WorkflowMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject {
func (wfa *WorkflowMongoAccessor) LoadOne(id string) utils.DBObject { func (wfa *WorkflowMongoAccessor) LoadOne(id string) utils.DBObject {
var workflow Workflow var workflow Workflow
res_mongo, err := mongo.LoadOne(id, "workflow") res_mongo, err := mongo.MONGOService.LoadOne(id, "workflow")
if err != nil { if err != nil {
l := logs.CreateLogger("oclib", "") l := logs.CreateLogger("oclib", "")
l.Error().Msg("Could not retrieve " + id + " from db. Error: " + err.Error()) l.Error().Msg("Could not retrieve " + id + " from db. Error: " + err.Error())

3
models/workflow/workflow_test.go
View File

@ -1,9 +1,10 @@
package oclib package oclib
import ( import (
"oc-lib/models/resources"
"testing" "testing"
"cloud.o-forge.io/core/oc-lib/models/resources"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )