51 changed files with 317 additions and 1373 deletions
--- a/3
+++ b/3
@ -4,8 +4,7 @@ WORKDIR /app

 COPY . .

-RUN go get github.com/beego/bee/v2 && \
-    go install github.com/beego/bee/v2@master
+RUN go get github.com/beego/bee/v2 && go install github.com/beego/bee/v2@master

 # Generating routers/commentsRouter.go
 RUN bee generate routers
--- a/README.md
+++ b/README.md
@ -31,30 +31,6 @@ const ui = SwaggerUIBundle({

 This issue is fixed in the Dockerfile build with two `sed` to change the value of the swagger file URL.

-## Deployment with Docker compose
-## Running the app locally 
-In order to run the application we need to correct some errors that beego generates.
-
-**Router generation**
-
-Beego generates the routers from the comment of the controllers methods. However, there seems to be some errors when we let beego generate th routers from `bee run`. 
-
-We need to use `bee generate routers` to have a working router file.
-
-**Swagger generation**
-
-Using `bee run -downdoc=true -gendoc=true` beego download a swagger template and generate the JSON file (swagger.json) in `swagger/`. However the swagger template in `swagger/index.html` does not change the exemple's url for our current JSON file. When running locally we have to edit the call to construct the object holding the swagger information, with the parameter url set with the relative path to our JSON swagger file :
-
-```
-const ui = SwaggerUIBundle({
-        url: "swagger.json",
-        ...
-        ...
-      });
-```
-
-This issue is fixed in the Dockerfile build with two `sed` to change the value of the swagger file URL.
-
 ## Deployment with Docker compose

 Deploy with docker:
@ -73,54 +49,14 @@ or out of docker `./scripts/populate_models.sh ./scripts/demo.json`

 ### Multinode

-Deploy : 
-### Multinode
-
 Deploy : 

 `docker-compose -f docker-compose.yml -f docker-compose.backend.yml -f docker-compose.multi.yml up --build`

 ## Populating the MongoDB database

-On the machine running the mongoDB container, from the root of the project run this line :
+From the root of the projet run :

-`./scripts/populate_models.sh ./scripts/demo.json`
+`./scripts/multinode.sh ./scripts/demo.json`

-This script should be updated to be ran from anywhere. 
-
-# More documentation
-
-[Visit the docs/ directory](/docs/)
-
-## UML
-
-We are currently using  [goplantuml](https://github.com/jfeliu007/goplantuml/) to generate the oject diagrams directly from the go files. This tools creates `.plums` files directly from the directory where the go files are located. These UML files can then be visualized using plantuml and the VS Code extensions plantuml.
-
-**Setting up the plantuml environment** :
-
-```
-# Downloading the go tool goplantuml
-go get github.com/jfeliu007/goplantuml/parser
-go install github.com/jfeliu007/goplantuml/cmd/goplantuml@latest
-
-# Install the plantuml environment
-sudo apt install default-jre
-sudo apt install plantuml
-
-```
-**Rich PlantUML extension Link**: https://marketplace.visualstudio.com/items?itemName=jebbs.plantuml or search it in the marketplace panel of VS Code
-
-**Generate and view an UML diagram**
-
-```
-goplantuml path/to/code/directory > path/to/dest/file.puml
-```
-
- open the .puml file generated
- alt + d to have the extension preview the plantUML code
- right click inside the .puml and select 'Export Current Diagram' to create an image file
- the output will be generated in a `out/` directory in the current path
-
-### Note 
-
-Only `.puml` files ought to be commited to the git repository, because their nature allows to track changes, while image file do not fit the purpose of versioning. 
+This script should be updated to be ran from anywhere. 
--- a/controllers/computing.go
+++ b/controllers/computing.go
@ -1,7 +1,7 @@
 package controllers

 import (
-	"cloud.o-forge.io/core/deprecated-oc-catalog/models"
+	"cloud.o-forge.io/core/oc-catalog/models"

 	beego "github.com/beego/beego/v2/server/web"
 )
--- a/controllers/data.go
+++ b/controllers/data.go
@ -1,7 +1,7 @@
 package controllers

 import (
-	"cloud.o-forge.io/core/deprecated-oc-catalog/models"
+	"cloud.o-forge.io/core/oc-catalog/models"

 	beego "github.com/beego/beego/v2/server/web"
 	"github.com/go-playground/validator/v10"
--- a/controllers/datacenter.go
+++ b/controllers/datacenter.go
@ -1,7 +1,7 @@
 package controllers

 import (
-	"cloud.o-forge.io/core/deprecated-oc-catalog/models"
+	"cloud.o-forge.io/core/oc-catalog/models"

 	beego "github.com/beego/beego/v2/server/web"
 	"github.com/go-playground/validator/v10"
--- a/controllers/schedule.go
+++ b/controllers/schedule.go
@ -3,7 +3,7 @@ package controllers
 import (
 	"time"

-	"cloud.o-forge.io/core/deprecated-oc-catalog/models"
+	"cloud.o-forge.io/core/oc-catalog/models"
 	"github.com/beego/beego/v2/core/logs"
 	beego "github.com/beego/beego/v2/server/web"
 )
--- a/controllers/search.go
+++ b/controllers/search.go
@ -1,7 +1,7 @@
 package controllers

 import (
-	"cloud.o-forge.io/core/deprecated-oc-catalog/models"
+	"cloud.o-forge.io/core/oc-catalog/models"

 	beego "github.com/beego/beego/v2/server/web"
 )
--- a/controllers/storage.go
+++ b/controllers/storage.go
@ -1,7 +1,7 @@
 package controllers

 import (
-	"cloud.o-forge.io/core/deprecated-oc-catalog/models"
+	"cloud.o-forge.io/core/oc-catalog/models"

 	beego "github.com/beego/beego/v2/server/web"
 )
--- a/controllers/user.go
+++ b/controllers/user.go
@ -1,7 +1,7 @@
 package controllers

 import (
-	"cloud.o-forge.io/core/deprecated-oc-catalog/models"
+	"cloud.o-forge.io/core/oc-catalog/models"
 	beego "github.com/beego/beego/v2/server/web"
 )

--- a/controllers/workflow.go
+++ b/controllers/workflow.go
@ -3,7 +3,7 @@ package controllers
 import (
 	"time"

-	"cloud.o-forge.io/core/deprecated-oc-catalog/models"
+	"cloud.o-forge.io/core/oc-catalog/models"
 	"github.com/beego/beego/v2/core/logs"
 	beego "github.com/beego/beego/v2/server/web"
 	"github.com/vk496/cron"
--- a/controllers/workspace.go
+++ b/controllers/workspace.go
@ -1,7 +1,7 @@
 package controllers

 import (
-	"cloud.o-forge.io/core/deprecated-oc-catalog/models"
+	"cloud.o-forge.io/core/oc-catalog/models"
 	beego "github.com/beego/beego/v2/server/web"
 )

--- a/docs/UML/diag_class_links.puml
+++ b/docs/UML/diag_class_links.puml
@ -1,47 +0,0 @@
-@startuml class_links
-
-class LinkGraph {
-
-    + []Link links
-
-    + void AddLinkToGraph(Link link)
-    + boolean,str HasPrevious(Link)
-    + boolean,str HasNext(Link) 
-
-}
-
-class Link {
-    + str source
-    + str destination
-    + boolean DCLink
-
-    + *Link NewLink(interface{} src, interface{} dst)  
-    + void AddLinkToDataCenter()
-} 
-
-
-note left of LinkGraph::HasPrevious
-    checks if the component whose ID is in src is the dst of 
-    any other Link of the list on Link 
-end note 
-
-note top of Link 
-    Links need to be redefined in the sense that they are currently used
-    both : 
-    - to connect a component to a DC
-    - to represent the interractions between components 
-end note
-
-note right of Link::DCLink
-    set at construction of the object and used to order the links
-end note
-
-
-note left of Link::NewLink 
-    Must test if the parameters check the type constraints
-    and raise errors for the GUI if necessary 
-end note 
-
-LinkGraph*--"links"Link
-
-@enduml
--- a/docs/UML/diag_class_workflow.jpg
+++ b/docs/UML/diag_class_workflow.jpg
--- a/docs/UML/mxgraph.puml
+++ b/docs/UML/mxgraph.puml
@ -1,54 +0,0 @@
-@startuml mxgraph
-package MxGraph {
-
-    class MxGraphModel {
-        - XMLName xml.Name
-        + Root : RootStruct
-        + createLinks()
-    }
-
-    class RootStruct {
-        - XMLName xml.Name
-        - MxCell[] MxCell
-        - MxObject[] MxObject
-        - MxLink[] MxLink
-    }
-
-    class MxCell {
-        - XMLName xml.Name
-        + ID string
-        + RID *string
-        + Rtype string
-        + Parent *string
-        + Edge *string
-        + Source *string
-        + Target *string
-        + processLinks()
-    }
-
-    class MxLink {
-        + ID string
-        + Source string
-        + Target string
-    }
-
-    class MxObject {
-        - XMLName xml.Name
-        + ID string
-        + Settings []xml.Attr
-        + MxCell MxCell
-    }
-
-    class mxissue {
-        - msg string
-        + Error() string
-    }
-
-    MxGraphModel *-- RootStruct : Root
-    RootStruct *-- MxCell : MxCell
-    RootStruct *-- MxObject : MxObject
-    RootStruct *-- MxLink : MxLink
-    MxObject *-- MxCell : MxCell
-}
-
-@enduml
--- a/docs/UML/plantuml/diagram_object_controllers.puml
+++ b/docs/UML/plantuml/diagram_object_controllers.puml
@ -1,77 +0,0 @@
-@startuml
-namespace controllers {
-    class ComputingController << (S,Aquamarine) >> {
-        + GetOneComputing(ID string) 
-        + PostComputing(body models.ComputingNEWModel) 
-        + GetMultipleComputing(IDs []string) 
-
-    }
-    class DataController << (S,Aquamarine) >> {
-        + GetOneData(ID string) 
-        + GetMultipleData(IDs []string) 
-        + PostData(body models.DataNEWModel) 
-
-    }
-    class DatacenterController << (S,Aquamarine) >> {
-        + GetMultipleDatacenter(IDs []string) 
-        + GetOneDatacenter(ID string) 
-        + PostDatacenter(body models.DatacenterNEWModel) 
-
-    }
-    class ScheduleController << (S,Aquamarine) >> {
-        + CreateSchedule(dcName string, workflowName string, cron string, duration uint, startDate time.Time, stopDate time.Time, requirements models.ExecutionRequirementsModel) 
-        + CheckSchedule(cron string, duration uint, startDate time.Time, stopDate time.Time, requirements models.ExecutionRequirementsModel) 
-        + GetSchedules(startDate time.Time, stopDate time.Time) 
-        + GetNextSchedules(baseDate time.Time) 
-        + GetPreviousSchedules(baseDate time.Time) 
-
-    }
-    class SearchController << (S,Aquamarine) >> {
-        + FindByWord(word string) 
-
-    }
-    class StorageController << (S,Aquamarine) >> {
-        + GetOneStorage(ID string) 
-        + GetMultipleStorage(IDs []string) 
-        + PostStorage(body models.StorageNEWModel) 
-
-    }
-    class UserController << (S,Aquamarine) >> {
-        + Login() 
-        + Logout() 
-
-    }
-    class WorkflowController << (S,Aquamarine) >> {
-        + CreateWorkflow(workflowName string) 
-        + ListWorkflows() 
-        + GetWorkflow(workflowName string) 
-        + AddElementWorkflow(workflowName string, rID string) 
-        + MxGraphParser(workflowName string, xmlData string) 
-        + MxGraphParserConsume(workflowName string) 
-        + LinkElementsWorkflow(workflowName string, rObjIDsource string, rObjIDtarger string, isInput bool) 
-        + GetWorkflowSchedule(workflowName string) 
-        + SetWorkflowSchedule(workflowName string, cronString string, events string, isService bool, startDate time.Time, stopDate time.Time, duration uint) 
-        + CheckWorkflowSchedule(workflowName string) 
-        + BookWorkflowSchedule(workflowName string) 
-
-    }
-    class WorkspaceController << (S,Aquamarine) >> {
-        + AddModel(id string, rtype string) 
-        + ListWorkspace() 
-        + ListWorkspaceModel() 
-        + DeleteElement(id string, rtype string) 
-
-    }
-}
-"web.Controller" *-- "controllers.ComputingController"
-"web.Controller" *-- "controllers.DataController"
-"web.Controller" *-- "controllers.DatacenterController"
-"web.Controller" *-- "controllers.ScheduleController"
-"web.Controller" *-- "controllers.SearchController"
-"web.Controller" *-- "controllers.StorageController"
-"web.Controller" *-- "controllers.UserController"
-"web.Controller" *-- "controllers.WorkflowController"
-"web.Controller" *-- "controllers.WorkspaceController"
-
-
-@enduml
--- a/docs/UML/plantuml/diagram_object_models.puml
+++ b/docs/UML/plantuml/diagram_object_models.puml
@ -1,347 +0,0 @@
-@startuml
-namespace models {
-    class ComputingModel << (S,Aquamarine) >> {
-        + ID string
-
-        - getRtype() rtype.Rtype
-        - getName() string
-
-        + AddUserInput(inputs <font color=blue>map</font>[string]<font color=blue>interface</font>{}) 
-
-    }
-    class ComputingNEWModel << (S,Aquamarine) >> {
-        + Name string
-        + Description string
-        + ShortDescription string
-        + Logo string
-        + Type string
-        + Owner string
-        + License string
-        + Price uint
-        + ExecutionRequirements ExecutionRequirementsModel
-        + Dinputs []string
-        + Doutputs []string
-        + Image string
-        + Command string
-        + Arguments []string
-        + Environment []string
-        + Ports []string
-
-    }
-    class ComputingObject << (S,Aquamarine) >> {
-        + ReferenceID primitive.ObjectID
-        + Inputs []string
-        + Outputs []string
-        + DataCenterID string
-
-        - getHost() *string
-        - setReference(rID primitive.ObjectID) 
-        - getReference() primitive.ObjectID
-        - getRtype() rtype.Rtype
-        - getModel() (ResourceModel, error)
-        - getName() *string
-        - isLinked(rObjID string) LinkingState
-        - addLink(direction LinkingState, rID string) 
-
-    }
-    class DCstatus << (S,Aquamarine) >> {
-        + DCname string
-        + DCobjID string
-        + IsReachable bool
-        + IsAvailable bool
-        + Booked *ScheduleInfo
-        + ErrorMessage string
-
-    }
-    class DataIO << (S,Aquamarine) >> {
-        + Counter uint
-
-    }
-    class DataModel << (S,Aquamarine) >> {
-        + ID string
-
-        - getRtype() rtype.Rtype
-        - getName() string
-
-    }
-    class DataNEWModel << (S,Aquamarine) >> {
-        + Name string
-        + Description string
-        + ShortDescription string
-        + Logo string
-        + Dtype string
-        + Type string
-        + Example string
-        + Protocol []string
-        + Location string
-
-    }
-    class DataObject << (S,Aquamarine) >> {
-        + ReferenceID primitive.ObjectID
-
-        - getHost() *string
-        - getModel() (ResourceModel, error)
-        - setReference(rID primitive.ObjectID) 
-        - getReference() primitive.ObjectID
-        - getRtype() rtype.Rtype
-        - getName() *string
-        - isLinked(rID string) LinkingState
-        - addLink(direction LinkingState, rObjID string) 
-
-    }
-    class DatacenterCpuModel << (S,Aquamarine) >> {
-        + Cores uint
-        + Architecture string
-        + Shared bool
-        + MinimumMemory uint
-        + Platform string
-
-    }
-    class DatacenterGpuModel << (S,Aquamarine) >> {
-        + CudaCores uint
-        + Model string
-        + Memory uint
-        + TensorCores uint
-
-    }
-    class DatacenterMemoryModel << (S,Aquamarine) >> {
-        + Size uint
-        + Ecc bool
-
-    }
-    class DatacenterModel << (S,Aquamarine) >> {
-        + ID string
-
-        - getRtype() rtype.Rtype
-        - getName() string
-
-        + GetTotalCPUs() uint
-        + GetTotalGPUs() uint
-        + GetTotalRAM() uint
-
-    }
-    class DatacenterNEWModel << (S,Aquamarine) >> {
-        + Name string
-        + Type string
-        + Acronym string
-        + Hosts []string
-        + Description string
-        + ShortDescription string
-        + Logo string
-        + CPU DatacenterCpuModel
-        + RAM DatacenterMemoryModel
-        + GPU []DatacenterGpuModel
-        + Owner string
-        + BookingPrice int
-
-    }
-    class DatacenterObject << (S,Aquamarine) >> {
-        + ReferenceID primitive.ObjectID
-
-        - setReference(rID primitive.ObjectID) 
-        - getModel() (ResourceModel, error)
-        - getReference() primitive.ObjectID
-        - getHost() *string
-        - getRtype() rtype.Rtype
-        - getName() *string
-        - isLinked(rID string) LinkingState
-        - addLink(direction LinkingState, rObjID string) 
-
-    }
-    class ExecutionRequirementsModel << (S,Aquamarine) >> {
-        + CPUs uint
-        + GPUs uint
-        + RAM uint
-        + Parallel bool
-        + ScalingModel uint
-        + DiskIO string
-
-    }
-    class MxCell << (S,Aquamarine) >> {
-        + XMLName xml.Name
-        + ID string
-        + Parent *string
-        + RID *string
-        + Source *string
-        + Target *string
-
-    }
-    class MxGraphModel << (S,Aquamarine) >> {
-        + XMLName xml.Name
-        + Root <font color=blue>struct</font>{xml.Name, []MxCell, *[]Object}
-
-    }
-    class Object << (S,Aquamarine) >> {
-        + XMLName xml.Name
-        + ID string
-        + Command *string
-        + Args *string
-        + Env *string
-        + MxCell MxCell
-
-    }
-    class RepositoryModel << (S,Aquamarine) >> {
-        + Credentials string
-        + Url string
-
-    }
-    interface ResourceModel  {
-        - getRtype() rtype.Rtype
-        - getName() string
-
-    }
-    interface ResourceObject  {
-        - getHost() *string
-        - getName() *string
-        - getModel() (ResourceModel, error)
-        - getRtype() rtype.Rtype
-        - setReference(rObjID primitive.ObjectID) 
-        - getReference() primitive.ObjectID
-        - isLinked(rObjID string) LinkingState
-        - addLink(direction LinkingState, rObjID string) 
-
-    }
-    class ScheduleDB << (S,Aquamarine) >> {
-        + StartDate time.Time
-        + StopDate time.Time
-        + Workflow string
-        + ResourceQty ExecutionRequirementsModel
-
-    }
-    class ScheduleInfo << (S,Aquamarine) >> {
-        + Total int
-        + NextExecutions []string
-
-    }
-    class SearchResult << (S,Aquamarine) >> {
-        + Computing []ComputingModel
-        + Datacenter []DatacenterModel
-        + Storage []StorageModel
-        + Data []DataModel
-
-    }
-    class StorageModel << (S,Aquamarine) >> {
-        + ID string
-
-        - getRtype() rtype.Rtype
-        - getName() string
-
-        + AddUserInput(inputs <font color=blue>map</font>[string]<font color=blue>interface</font>{}) 
-
-    }
-    class StorageNEWModel << (S,Aquamarine) >> {
-        + Name string
-        + Description string
-        + ShortDescription string
-        + Logo string
-        + Type string
-        + DCacronym string
-        + URL string
-        + Size uint
-        + Encryption bool
-        + Redundancy string
-        + Throughput string
-        + BookingPrice uint
-
-    }
-    class StorageObject << (S,Aquamarine) >> {
-        + ReferenceID primitive.ObjectID
-        + Inputs []string
-        + Outputs []string
-
-        - getHost() *string
-        - getModel() (ResourceModel, error)
-        - setReference(rID primitive.ObjectID) 
-        - getReference() primitive.ObjectID
-        - getRtype() rtype.Rtype
-        - getName() *string
-        - isLinked(rObjID string) LinkingState
-        - addLink(direction LinkingState, rObjID string) 
-
-    }
-    class UserModel << (S,Aquamarine) >> {
-        + ID string
-        + Username string
-        + Password string
-        + Email string
-
-    }
-    class Workflow << (S,Aquamarine) >> {
-        + Data <font color=blue>map</font>[string]DataObject
-        + Computing <font color=blue>map</font>[string]ComputingObject
-        + Storage <font color=blue>map</font>[string]StorageObject
-        + Datacenter <font color=blue>map</font>[string]DatacenterObject
-        + Schedules WorkflowSchedule
-        + MxgraphXML string
-
-        + GetExecutionRequirements(dcIDobj string) (ExecutionRequirementsModel, error)
-        + GetResource(rObjID *string) ResourceObject
-        + GetResourceMapByRtype(rt rtype.Rtype) <font color=blue>interface</font>{}
-        + CreateResourceObject(rt rtype.Rtype) ResourceObject
-        + AddObj(robj ResourceObject) *primitive.ObjectID
-        + UpdateDB(userID string, workflowName string) error
-        + UpdateObj(robj ResourceObject, objID string) 
-
-    }
-    class WorkflowSchedule << (S,Aquamarine) >> {
-        + IsService bool
-        + StartDate time.Time
-        + StopDate time.Time
-        + Cron string
-        + Duration uint
-        + Events string
-        + IsBooked bool
-
-    }
-    class Workspace << (S,Aquamarine) >> {
-        + UserID string
-        + Workflows <font color=blue>map</font>[string]Workflow
-        + Data []string
-        + Computing []string
-        + Datacenter []string
-        + Storage []string
-
-        - getRtype(rID string) rtype.Rtype
-        - updateDB() error
-
-        + ConsumeMxGraphModel(xmlmodel MxGraphModel) (*Workflow, error, []error)
-        + GetResources() <font color=blue>map</font>[rtype.Rtype][]string
-        + GetWorkflow(workflowName string) *Workflow
-        + GetWorkflows() []string
-        + NewResource(rID string, rType string) error
-        + GetAllWorkspacesProjects() <font color=blue>chan</font> *Workflow
-
-    }
-    class WorkspaceModel << (S,Aquamarine) >> {
-        + UserID string
-        + Data []DataModel
-        + Computing []ComputingModel
-        + Datacenter []DatacenterModel
-        + Storage []StorageModel
-
-    }
-    class models.LinkingState << (T, #FF7700) >>  {
-    }
-    class mxissue << (S,Aquamarine) >> {
-        - msg string
-
-        + Error() string
-
-    }
-}
-"models.ComputingNEWModel" *-- "models.ComputingModel"
-"models.DataNEWModel" *-- "models.DataModel"
-"models.DatacenterNEWModel" *-- "models.DatacenterModel"
-"models.StorageNEWModel" *-- "models.StorageModel"
-
-"models.ResourceModel" <|-- "models.ComputingModel"
-"models.ResourceObject" <|-- "models.ComputingObject"
-"models.ResourceModel" <|-- "models.DataModel"
-"models.ResourceObject" <|-- "models.DataObject"
-"models.ResourceModel" <|-- "models.DatacenterModel"
-"models.ResourceObject" <|-- "models.DatacenterObject"
-"models.ResourceModel" <|-- "models.StorageModel"
-"models.ResourceObject" <|-- "models.StorageObject"
-
-"__builtin__.uint" #.. "models.LinkingState"
-@enduml
--- a/docs/UML/plantuml/diagram_object_routers.puml
+++ b/docs/UML/plantuml/diagram_object_routers.puml
@ -1,2 +0,0 @@
-@startuml
-@enduml
--- a/docs/components/components_specification.md
+++ b/docs/components/components_specification.md
@ -1,70 +0,0 @@
-This documents aims to describe the role of each component in the catalog. It textually describes their attributes in order for anyone involved in the development to grasp their role and also identify some missing features/attributes.
-
-This document should be accompanied of a diagram that summarizes it.
-
-# Components description
-
-As a user of oc-catalog I want to be able to create a workflow, which represents the flow of data between different components : computing, datacenter, data and storage.
-
-Each component has a name, a logo, a short and a long description.
-
-## Computing
-
-A computing component is used to execute the docker image in it's **command** attribute. A computing component **must** be linked with a datacenter component, where it will be executed. 
-
-It has two required fields **CPU** and **RAM** which describe the minimum amount of calculating ressources needed to execute it.   
-
-Optionnaly, it can have a value in the **GPU** field.
-
-For each instance of a computing component we can specify : 
- an other entrypoint to the image : this must be specified after the name of the image in **command**. 
- **arguments**, which will be passed to the entrypoint
- **Environment variables**
-
-The fields **input** and **output** list the different links coming in and out of the computing components.
-> [!] This is redundant with the Links object that we create when parsing the XML in oc-scheduler, might be better to remove them if proved redundant
-
-
-## Datacenter
-
-A datacenter is identified by its **DC acronym** which is a very short form of its name.
-
-**Note** : as of now, this dc cronym field is used a primary key in order to link other components to a datacenter. This might be a sign that using a NoSQL db in the future might not be the best option.
-
-Each datacenter must declare  :
- its **Memory**, composed of two field : **ecc** (error-correcting code) and **size** (in MB)
- its **CPU** which is composed of :
-    - its **cores** number
-    - a boolean to declare if the cores are **shared** or not
-    - its **architecture** 
-    - its **pltaform**
-    - the **minimum memory** needed
-
-Finally, we can add **GPU**s to a datacenter, they are characterized by :
- Their number of **couda cores**
- number of **tensor cores**
- their **size** (Mb)
- their **model**
-
-## Data
-
-This component represent a data source, we want to know what **type** of data they produce. They have a base64 encoded **example** of the final data structure.
-
-The source **URL** must be specified, as well as the **protocol**. 
-
-> !  Hence, maybe these two field should merged, and only have an URL that indicates its protocol.
-
-## Storage
-
-Storage components are linked to a datacenter, and used to store the result of a computing component.
-
-Storage component are associated with a datacenter with its **dc acronyme**. They also have an **URL** to reach them. A storage component has a storage **size** and some optionnal field :
- **crypted** storage
- the type of **redundancy** 
- its **throughput**
-
-Finally they have a **price** 
-
-# Diagram
-
-![](models_oc-catalog.jpg)
--- a/docs/components/models_oc-catalog.jpg
+++ b/docs/components/models_oc-catalog.jpg
--- a/docs/graph_construction.md
+++ b/docs/graph_construction.md
@ -1,5 +0,0 @@
-For an easier parsing and constrution of dependencies we decided that :
-
- Computing elements must be linked between one another, to represent the chaining of events
- A storage component can be shared by several computing component, the direction of the arrow will determine if it's for writting or reading
-
--- a/docs/identified_problems.md
+++ b/docs/identified_problems.md
@ -1,13 +0,0 @@
-# Code 
-
- [ ] In most of the components from 'models/' we have a method to add  input and output to the model, however this linking of components is already done in oc-schedule when parsing the MxGraph. We need to determine if adding relations between components inside the objects themself is necessary.
-    - When running in debug mode with a breakpoint inside the first line of computing.addLink it is only called once
-
-
-## MxGraph
-
- [ ] The ConsumeMxGraphModel is way too long, it should refactored and broken down in different sub methods
-    - mxcell are put inside an <object> tag when the settings have been opened, wether values have been set or not. Maybe we could find a way to make mxgraph add these whenever we add a component to the graph.
-    - then identify the links only 
- [ ] It is unclear what are the inputs and the ouputs. It seems like they were implemented to link two components, but it seems redundant with the identification of links
-    - This has been potentially tackled with the creation of a class to handle links between components. The components do no handle their own connections with other components, this task is delegated to the Link and Worlflow classes.  
--- a/docs/lexicon.md
+++ b/docs/lexicon.md
@ -1,6 +0,0 @@
- rType : ressource type, can only be :
-    - rtype.DATA
-    - rtype.COMPUTING
-    - rtype.STORAGE
-    - rtype.DATACENTER
-    - rtype.INVALID if it doesn't match with any of the previous type
--- a/docs/linking_errors.md
+++ b/docs/linking_errors.md
@ -1,25 +0,0 @@
-# Handling errors during workflows' post
-
-Every time an user modify a worflow through oc-search's GUI its representation is sent through an XML to oc-catalog API.
-
-To ensure a correct execution of the workflow we must look for irregularities in the workflow's design. Of course an error can be the result of a workflow being currently built by the user, with the corrective action coming.
-
-This document aims at laying down all the requirements that each component must respect and show wether they have been implemented in the code or not.
-
-## Computing
-
- [x] A computing component must be paired with a datacenter component
-
-## Data
-
- [x] A data component must be linked to at least one computing component
-
-## Datacenter
-
- [x] A datacenter component must be linked to at least one computing component
-
-## Storage
-
- [x] A storage component must have at least one target or be the source of another component 
- 
-
--- a/go.mod
+++ b/go.mod
@ -1,18 +1,16 @@
-module cloud.o-forge.io/core/deprecated-oc-catalog
+module cloud.o-forge.io/core/oc-catalog

 go 1.15

 require github.com/beego/beego/v2 v2.0.1

 require (
-	github.com/Klathmon/StructToMap v0.0.0-20140724123129-3d0229e2dce7
 	github.com/antihax/optional v1.0.0
 	github.com/aws/aws-sdk-go v1.36.29 // indirect
-	github.com/beego/beego v1.12.12
+	github.com/beego/bee/v2 v2.0.2
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/go-playground/validator/v10 v10.4.1
 	github.com/golang/snappy v0.0.2 // indirect
-	github.com/goraz/onion v0.1.3
 	github.com/klauspost/compress v1.11.7 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
 	github.com/mitchellh/mapstructure v1.4.1 // indirect
@ -21,13 +19,13 @@ require (
 	github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
 	github.com/vk496/cron v1.2.0
 	go.mongodb.org/mongo-driver v1.4.5
+	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
 	golang.org/x/mod v0.4.1 // indirect
 	golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
 	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect
 	golang.org/x/text v0.3.5 // indirect
 	golang.org/x/tools v0.1.0 // indirect
-	google.golang.org/appengine v1.6.1 // indirect
 	google.golang.org/protobuf v1.25.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
--- a/go.sum
+++ b/go.sum
@ -1,10 +1,21 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Klathmon/StructToMap v0.0.0-20140724123129-3d0229e2dce7 h1:n0MD6UkwbgGHtXsmfgVzC2+ZbHzIsScpbq9ZGI18074=
-github.com/Klathmon/StructToMap v0.0.0-20140724123129-3d0229e2dce7/go.mod h1:xdrQDwHlKUmv8yiElMx6W0W10cLkqpeSEUUib8KGtv4=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
@ -30,8 +41,8 @@ github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/
 github.com/aws/aws-sdk-go v1.36.29 h1:lM1G3AF1+7vzFm0n7hfH8r2+750BTo+6Lo6FtPB7kzk=
 github.com/aws/aws-sdk-go v1.36.29/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
-github.com/beego/beego v1.12.12 h1:ARY1sNVSS23N0mEQIhSqRDTyyDlx95JY0V3GogBbZbQ=
-github.com/beego/beego v1.12.12/go.mod h1:QURFL1HldOcCZAxnc1cZ7wrplsYR5dKPHFjmk6WkLAs=
+github.com/beego/bee/v2 v2.0.2 h1:xWARyIqdnnbNMDBDUdb6Gvr9S/yGXC6Ni43kKdS1/eg=
+github.com/beego/bee/v2 v2.0.2/go.mod h1:rfZa899qLAF8SYBRvE7mWNPZTU7/qysOBhaCLmZrMX4=
 github.com/beego/beego/v2 v2.0.1 h1:07a7Z0Ok5vbqyqh+q53sDPl9LdhKh0ZDy3gbyGrhFnE=
 github.com/beego/beego/v2 v2.0.1/go.mod h1:8zyHi1FnWO1mZLwTn62aKRIZF/aIKvkCBB2JYs+eqQI=
 github.com/beego/goyaml2 v0.0.0-20130207012346-5545475820dd/go.mod h1:1b+Y/CofkYwXMUU0OhQqGvsY2Bvgr4j6jfT699wyZKQ=
@ -41,11 +52,14 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
 github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60=
 github.com/casbin/casbin v1.7.0/go.mod h1:c67qKN6Oum3UF5Q1+BByfFxkwKvhwW57ITjqwtzR1KE=
 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
@ -53,28 +67,31 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
-github.com/coreos/etcd v3.3.17+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
+github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/etcd v3.3.25+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/cosiner/argv v0.1.0/go.mod h1:EusR6TucWKX+zFgtdUsKT2Cvg45K5rtpCcWz4hK06d8=
 github.com/couchbase/go-couchbase v0.0.0-20200519150804-63f3cdb75e0d/go.mod h1:TWI8EKQMs5u5jLKW/tsb9VwauIrMIxQG1r5fMsswK5U=
-github.com/couchbase/go-couchbase v0.0.0-20201216133707-c04035124b17/go.mod h1:+/bddYDxXsf9qt0xpDUtRR47A2GjaXmGGAqQ/k3GJ8A=
 github.com/couchbase/gomemcached v0.0.0-20200526233749-ec430f949808/go.mod h1:srVSlQLB8iXBVXHgnqemxUXqN6FCvClgCMPCsjBDR7c=
-github.com/couchbase/gomemcached v0.1.2-0.20201224031647-c432ccf49f32/go.mod h1:mxliKQxOv84gQ0bJWbI+w9Wxdpt9HjDvgW9MjCym5Vo=
 github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs=
-github.com/couchbase/goutils v0.0.0-20210118111533-e33d3ffb5401/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs=
+github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76/go.mod h1:vYwsqCOLxGiisLwp9rITslkFNpZD5rz43tf41QFkTWY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
@ -87,13 +104,18 @@ github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo
 github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/etcd-io/etcd v3.3.17+incompatible/go.mod h1:cdZ77EstHBwVtD6iTgzgvogwcjo9m4iOqoijouPJ4bs=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nIgbVgp3rreNmTged+9HrbNTIQf1PsaIiTA=
+github.com/flosch/pongo2 v0.0.0-20200529170236-5abacdfa4915/go.mod h1:fB4mx6dzqFinCxIf3a7Mf5yLk+18Bia9mPAnuejcvDA=
 github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
 github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/glendc/gopher-json v0.0.0-20170414221815-dc4743023d0c/go.mod h1:Gja1A+xZ9BoviGJNA2E9vFkPjjsl+CoJxSXiQM1UXtw=
+github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
+github.com/go-delve/delve v1.5.0/go.mod h1:c6b3a1Gry6x8a4LGCe/CWzrocrfaHvkUxCj3k4bvSUQ=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o=
@ -145,8 +167,11 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@ -174,22 +199,30 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-dap v0.2.0/go.mod h1:5q8aYQFnHOAZEMP+6vmq25HKYAEwE+LF5yh7JKrrhSQ=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/goraz/onion v0.1.3 h1:KhyvbDA2b70gcz/d5izfwTiOH8SmrvV43AsVzpng3n0=
-github.com/goraz/onion v0.1.3/go.mod h1:XEmz1XoBz+wxTgWB8NwuvRm4RAu3vKxvrmYtzK+XCuQ=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
 github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE=
+github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
@ -207,13 +240,13 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
 github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
-github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
@ -228,8 +261,12 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q=
+github.com/juju/errors v0.0.0-20190930114154-d42613fe1ab9/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q=
+github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U=
+github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
@ -253,17 +290,20 @@ github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgx
 github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
 github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.7.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
 github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
 github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
 github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
+github.com/mattn/go-colorable v0.0.0-20170327083344-ded68f7a9561/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
@ -293,9 +333,9 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/ogier/pflag v0.0.1/go.mod h1:zkFki7tvTa0tafRvTBIZTvzYyAu6kQhPZFnshFFPE+g=
 github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
+github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@ -318,10 +358,11 @@ github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIw
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys=
+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
 github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
 github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
+github.com/peterh/liner v0.0.0-20170317030525-88609521dc4b/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
 github.com/peterh/liner v1.0.1-0.20171122030339-3681c2a91233/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
 github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
@ -335,6 +376,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
+github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
 github.com/prometheus/client_golang v1.7.0/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
@ -348,7 +390,9 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
 github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
@ -356,17 +400,20 @@ github.com/prometheus/common v0.15.0 h1:4fgOnadei3EZvgRwxJ7RMpG1k1pOZth5Pc13tysp
 github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.3.0 h1:Uehi/mxLK0eiUc0H0++5tpMGTexB8wZ598MIgU8VpDM=
 github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
@ -383,17 +430,21 @@ github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/skarademir/naturalsort v0.0.0-20150715044055-69a5d87bef62/go.mod h1:oIdVclZaltY1Nf7OQUkg1/2jImBJ+ZfKZuDIRSwk3p0=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
+github.com/smartwalle/pongo2render v1.0.1/go.mod h1:MGnTzND7nEMz7g194kjlnw8lx/V5JJlb1hr5kDXEO0I=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cobra v0.0.0-20170417170307-b6cb39589372/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/pflag v0.0.0-20170417173400-9e4c21054fa1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/ssdb/gossdb v0.0.0-20180723034631-88f6b59b84ec/go.mod h1:QBvMkMya+gXctz3kmljlUCu/yB3GZ6oee+dUozsezQE=
 github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
 github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
@ -405,18 +456,19 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
 github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
 github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/vk496/cron v1.2.0 h1:fDxb4qNi6Rmxh3h9snW1sKJ0nHgjpg3fYc0Oq+igbvk=
 github.com/vk496/cron v1.2.0/go.mod h1:f8lpm+SIXbjvujp8Dix4S2B+GGva/q0yrRPQ8hwTtOc=
 github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
-github.com/wendal/errors v0.0.0-20181209125328-7f31f4b264ec/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
 github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc h1:n+nNi93yXLkJvKwXNP9d55HC7lGK4H/SRcwB5IaUZLo=
@ -424,6 +476,7 @@ github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHM
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU=
+go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
 go.etcd.io/etcd v3.3.25+incompatible/go.mod h1:yaeTdrJi5lOmYerz05bd8+V7KubZs8YSFZfzsF9A6aI=
@ -431,8 +484,12 @@ go.mongodb.org/mongo-driver v1.4.5 h1:TLtO+iD8krabXxvY1F1qpBOHgOxhLWR7XsT7kQeRmM
 go.mongodb.org/mongo-driver v1.4.5/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.starlark.net v0.0.0-20190702223751-32f345186213/go.mod h1:c1/X6cHgvdXj6pUlmWKMkuqRnW4K8x2vwt6JAaaircg=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
@ -442,6 +499,7 @@ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9E
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
 go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
+golang.org/x/arch v0.0.0-20190927153633-4e8777c89be4/go.mod h1:flIaEI6LNU6xOCD5PaJvn9wGP0agmIOqjrtsKGRguv4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@ -451,18 +509,28 @@ golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY=
 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY=
@ -479,6 +547,8 @@ golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@ -513,18 +583,22 @@ golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@ -539,31 +613,44 @@ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191127201027-ecd32218bd7f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
@ -576,22 +663,34 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
@ -618,6 +717,8 @@ gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qS
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
+gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
@ -635,8 +736,12 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
--- a/main.go
+++ b/main.go
@ -3,9 +3,9 @@ package main
 import (
 	"os"

-	"cloud.o-forge.io/core/deprecated-oc-catalog/conf"
-	"cloud.o-forge.io/core/deprecated-oc-catalog/routers"
-	"cloud.o-forge.io/core/deprecated-oc-catalog/services"
+	"cloud.o-forge.io/core/oc-catalog/conf"
+	"cloud.o-forge.io/core/oc-catalog/routers"
+	"cloud.o-forge.io/core/oc-catalog/services"

 	"github.com/beego/beego/logs"
 	beego "github.com/beego/beego/v2/server/web"
--- a/models/computing.go
+++ b/models/computing.go
@ -1,13 +1,8 @@
 package models

 import (
-	"encoding/xml"
-	"fmt"
-	"strings"
-
-	"cloud.o-forge.io/core/deprecated-oc-catalog/models/rtype"
-	"cloud.o-forge.io/core/deprecated-oc-catalog/services"
-	structtomap "github.com/Klathmon/StructToMap"
+	"cloud.o-forge.io/core/oc-catalog/models/rtype"
+	"cloud.o-forge.io/core/oc-catalog/services"
 	"github.com/beego/beego/v2/core/logs"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )
@ -32,8 +27,8 @@ type RepositoryModel struct {
 }

 type ComputingNEWModel struct {
-	Name             string `json:"name,omitempty" required:"true" validate:"required" description:"Name of the computing"`
 	Description      string `json:"description,omitempty" required:"true"`
+	Name             string `json:"name,omitempty" required:"true" validate:"required" description:"Name of the computing"`
 	ShortDescription string `json:"short_description,omitempty" required:"true" validate:"required"`
 	Logo             string `json:"logo,omitempty" required:"true" validate:"required"`

@ -44,8 +39,8 @@ type ComputingNEWModel struct {

 	ExecutionRequirements ExecutionRequirementsModel `json:"execution_requirements,omitempty"`

-	Dinputs  []string `json:"dinputs,omitempty"`		// Possibly redundant with Links object	in oc-schedule
-	Doutputs []string `json:"doutputs,omitempty"`		// Possibly redundant with Links objects in oc-schedule
+	Dinputs  []string `json:"dinputs,omitempty"`
+	Doutputs []string `json:"doutputs,omitempty"`

 	Image       string   `json:"image,omitempty"`
 	Command     string   `json:"command,omitempty"`
@ -53,9 +48,9 @@ type ComputingNEWModel struct {
 	Environment []string `json:"environment,omitempty"`
 	Ports       []string `json:"ports,omitempty"`

-	// CustomDeployment string `json:"custom_deployment,omitempty"`
+	CustomDeployment string `json:"custom_deployment,omitempty"`

-	// Repository RepositoryModel `json:"repository,omitempty"`
+	Repository RepositoryModel `json:"repository,omitempty"`
 }

 type ComputingModel struct {
@ -77,15 +72,10 @@ func (model ComputingModel) getName() string {
 type ComputingObject struct {
 	ReferenceID primitive.ObjectID `json:"referenceID" description:"Computing model ID"`

-	Inputs  	[]string `json:"inputs"`
-	Outputs 	[]string `json:"outputs"`
-	Image       string   `json:"image,omitempty"`
-	Command     string   `json:"command,omitempty"`
-	Arguments   []string `json:"arguments,omitempty"`
-	Environment []string `json:"environment,omitempty"`
-	Ports       []string `json:"ports,omitempty"`
+	Inputs  []string `json:"inputs"`
+	Outputs []string `json:"outputs"`

-	DataCenterID string  `json:"datacenterID" description:"Datacenter where the computing will be executed"`
+	DataCenterID string `json:"datacenterID" description:"Datacenter where the computing will be executed"`
 }

 func (obj ComputingObject) getHost() *string {
@ -180,46 +170,3 @@ func GetMultipleComputing(IDs []string) (object *[]ComputingModel, err error) {
 func PostOneComputing(obj ComputingNEWModel) (ID string, err error) {
 	return postOneResource(obj, rtype.COMPUTING)
 }
-
-func (obj *ComputingObject) AddUserInput(inputs []xml.Attr){
-	
-	logs.Alert("AddUserInput() is going to throw some alerts while mxGraph GUI is not updated to adapt the inputs to the componant")
-	
-	// So far only a few input to handle so a switch with a case for each type of attribute
-	// is enough, to prevent too much complexity
-	
-	for _, j := range(inputs){
-		setting, _ := structtomap.Convert(j)
-		// fmt.Println(strings.ToLower(setting["Name"]))
-		name := setting["Name"].(xml.Name).Local
-		value := setting["Value"]
-		switch name {
-		case "command":
-			obj.Command = value.(string)
-		case "args":
-			empty, sliced_arguments := getSliceSettings(value.(string))
-			if (!empty){
-				obj.Arguments = sliced_arguments
-			}
-		case "env" :
-			empty, sliced_arguments := getSliceSettings(value.(string))
-			if (!empty){
-				obj.Environment = sliced_arguments
-			}
-		default:
-			logs.Alert(fmt.Printf("%s is not an attribute of computing componants", name))
-		}
-
-	}
-	
-	
-}
-
-func getSliceSettings(string_to_parse string)(empty bool, sliced_string []string){
-	if len(string_to_parse) == 0 {
-		return true, nil
- 	}
-	empty = false	
-	sliced_string = strings.Split(string_to_parse," ")
-	return
-}
--- a/models/data.go
+++ b/models/data.go
@ -1,8 +1,8 @@
 package models

 import (
-	"cloud.o-forge.io/core/deprecated-oc-catalog/models/rtype"
-	"cloud.o-forge.io/core/deprecated-oc-catalog/services"
+	"cloud.o-forge.io/core/oc-catalog/models/rtype"
+	"cloud.o-forge.io/core/oc-catalog/services"
 	"github.com/beego/beego/v2/core/logs"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )
@ -11,15 +11,28 @@ import (
 // TODO: review why swagger are not using the metadata when we do herarchy
 type DataNEWModel struct {
 	Name             string `json:"name,omitempty" required:"true" validate:"required" description:"Name of the data"`
-	Description      string `json:"description" required:"true" validate:"required"`
 	ShortDescription string `json:"short_description" required:"true" validate:"required"`
 	Logo             string `json:"logo" required:"true" validate:"required"`
+	Description      string `json:"description" required:"true" validate:"required"`

-	Dtype    string   `json:"dtype"`
 	Type     string   `json:"type,omitempty" required:"true" validate:"required" description:"Define type of data" example:"file"`
 	Example  string   `json:"example" required:"true" validate:"required" description:"base64 encoded data"`
-	Protocol []string `json:"protocol"` //TODO Enum type
 	Location string   `json:"location" required:"true" validate:"required"`
+	Dtype    string   `json:"dtype"`
+	Protocol []string `json:"protocol"` //TODO Enum type
+}
+
+type DataModel struct {
+	ID           string `json:"ID" bson:"_id" required:"true" validate:"required"`
+	DataNEWModel `bson:",inline"`
+}
+
+func (obj DataModel) getRtype() rtype.Rtype {
+	return rtype.DATA
+}
+
+func (model DataModel) getName() string {
+	return model.Name
 }

 type DataIO struct {
@ -30,18 +43,6 @@ type DataObject struct {
 	ReferenceID primitive.ObjectID `json:"referenceID" description:"Data model ID"`
 }

-type DataModel struct {
-	ID           string `json:"ID" bson:"_id" required:"true" validate:"required"`
-	DataNEWModel `bson:",inline"`
-}	
-
-func (obj DataModel) getRtype() rtype.Rtype {
-	return rtype.DATA
-}	
-
-func (model DataModel) getName() string {
-	return model.Name
-}	
 func (obj DataObject) getHost() *string {
 	return nil // Host is DC only attribute
 }
--- a/models/datacenter.go
+++ b/models/datacenter.go
@ -4,8 +4,8 @@ import (
 	"net"
 	"time"

-	"cloud.o-forge.io/core/deprecated-oc-catalog/models/rtype"
-	"cloud.o-forge.io/core/deprecated-oc-catalog/services"
+	"cloud.o-forge.io/core/oc-catalog/models/rtype"
+	"cloud.o-forge.io/core/oc-catalog/services"
 	"github.com/beego/beego/v2/core/logs"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )
--- a/models/generic.go
+++ b/models/generic.go
@ -3,8 +3,8 @@ package models
 import (
 	"errors"

-	"cloud.o-forge.io/core/deprecated-oc-catalog/models/rtype"
-	"cloud.o-forge.io/core/deprecated-oc-catalog/services"
+	"cloud.o-forge.io/core/oc-catalog/models/rtype"
+	"cloud.o-forge.io/core/oc-catalog/services"
 	"github.com/beego/beego/v2/core/logs"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
--- a/models/links.go
+++ b/models/links.go
@ -1,53 +0,0 @@
-package models
-
-import (
-	"cloud.o-forge.io/core/deprecated-oc-catalog/models/rtype"
-)
-
-type Link struct {
-	// ID        		primitive.ObjectID	`json:"ID" bson:"_id" required:"true" example:"5099803df3f4948bd2f98391"`
-	Source 			string				`json:"source" description:"id in the workflow of the source object"`
-	Destination 	string				`json:"destination" description:"id in the workflow of the destination object"`
-	DCLink			bool				`json:"dcLink" description:"is this a link with a datacenter"`
-}
-
-// Use ResourceObject parameter to process certain components type differently
-// and Id's to identify each component as a node in an oriented graph
-
-// In the case of DCLink we choose to always consider the DC as the destination
-// in order to facilitate some logic
-
-func NewLink(src ResourceObject, srcId string, dst ResourceObject, dstId string) (link Link) {
-	link.Source = srcId
-	link.Destination = dstId
-
-	// If the link is between a DC and a component make sure that the DC is destination
-	// and if the component is computing, update the DataCenterID
-
-	if (src.getRtype() == rtype.DATACENTER || dst.getRtype() == rtype.DATACENTER){
-		var linked ResourceObject
-
-		link.DCLink = true
-
-		if src.getRtype() == rtype.DATACENTER {
-			linked = dst
-		} else {
-			linked = src
-		}
-		
-		if( link.DCLink && src.getRtype() == rtype.DATACENTER){
-			link.Destination = srcId
-			link.Source = dstId
-		} 
-		
-		if (linked.getRtype() == rtype.COMPUTING){
-			linked.(*ComputingObject).DataCenterID = link.Destination
-		}
-	}
-
-
-	return
-}
-
-
-
--- a/models/mxgraph.go
+++ b/models/mxgraph.go
@ -8,68 +8,18 @@ type MxGraphModel struct {
 	XMLName xml.Name `xml:"mxGraphModel"`

 	Root struct {
-		XMLName 	xml.Name 	`xml:"root"`
-		MxCell		[]MxCell	`xml:"mxCell"`
-		MxObject	*[]MxObject	`xml:"object"`
-		MxLink		[]MxLink
+		XMLName xml.Name `xml:"root"`
+		MxCell  []MxCell `xml:"mxCell"`
 	}
 }

 type MxCell struct {
-	XMLName xml.Name	`xml:"mxCell"` 	
-	ID      string  	`xml:"id,attr"`
-	RID     *string 	`xml:"rID,attr"`
-	Rtype	string  	`xml:"rType,attr"`
-	Parent  *string 	`xml:"parent,attr"`
-	Edge	*string		`xml:"edge,attr"`
-	Source  *string 	`xml:"source,attr"`
-	Target  *string 	`xml:"target,attr"`
-}
-
-type MxLink struct {
-	ID      string   	`xml:"id,attr"`
-	Source	string		`xml:"source,attr"`
-	Target	string		`xml:"target,attr"`
-}
-
-type MxObject struct {
-	XMLName xml.Name 	`xml:"object"`
-	ID		string		`xml:"id,attr"`
-	Settings []xml.Attr	`xml:",any,attr"`
-	MxCell	MxCell		`xml:"mxCell"`	
-}
-
-// Didn't manage to differentiate Links and cells containing components using 
-// only structures and unmarshal, so we use this method post-umarshalling
-func (g *MxGraphModel) createLinks()  {
-	var cells_without_links []MxCell 
-
-	
-	for i, mxcell := range g.Root.MxCell {
-		
-		if mxcell.Edge != nil {	
-			mxcell.processLinks()
-			newLink := MxLink{mxcell.ID,*mxcell.Source,*mxcell.Target}
-			g.Root.MxLink = append(g.Root.MxLink,newLink)
-		} else {
-			cells_without_links = append(cells_without_links,g.Root.MxCell[i])
-		}
-	}
-
-	
-	g.Root.MxCell = nil
-	g.Root.MxCell = cells_without_links
-
-}
-
-func (cell *MxCell) processLinks() {
-	v := ""
-	if cell.Source == nil {
-		cell.Source = &v
-	}
-	if cell.Target == nil {
-		cell.Target = &v
-	}
+	XMLName xml.Name `xml:"mxCell"`
+	ID      string   `xml:"id,attr"`
+	Parent  *string  `xml:"parent,attr"`
+	RID     *string  `xml:"rID,attr"`
+	Source  *string  `xml:"source,attr"`
+	Target  *string  `xml:"target,attr"`
 }

 type mxissue struct {
@ -83,4 +33,3 @@ func (m *mxissue) Error() string {
 func newMxIssue(message string) error {
 	return &mxissue{message}
 }
-
--- a/models/rtype/rtype.go
+++ b/models/rtype/rtype.go
@ -1,7 +1,7 @@
 package rtype

 import (
-	"cloud.o-forge.io/core/deprecated-oc-catalog/services"
+	"cloud.o-forge.io/core/oc-catalog/services"
 	"github.com/beego/beego/v2/core/logs"
 	"go.mongodb.org/mongo-driver/mongo"
 )
--- a/models/schedule.go
+++ b/models/schedule.go
@ -4,7 +4,7 @@ import (
 	"errors"
 	"time"

-	"cloud.o-forge.io/core/deprecated-oc-catalog/services"
+	"cloud.o-forge.io/core/oc-catalog/services"
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/vk496/cron"
 	"go.mongodb.org/mongo-driver/bson/primitive"
@ -99,7 +99,7 @@ func CheckSchedule(cronString string, duration uint, cronFirstDate, cronLastDate
 		return errors.New("Bad cron message: " + err.Error())
 	}

- 	dcModel := GetDatacenterFromAcronym(services.DC_NAME)
+	dcModel := GetDatacenterFromAcronym(services.DC_NAME)
 	if dcModel == nil {
 		return errors.New("The DC " + services.DC_NAME + " doesn't have any DC model with that acronym")
 	}
--- a/models/search.go
+++ b/models/search.go
@ -3,7 +3,7 @@ package models
 import (
 	"strings"

-	"cloud.o-forge.io/core/deprecated-oc-catalog/services"
+	"cloud.o-forge.io/core/oc-catalog/services"
 	"github.com/beego/beego/v2/core/logs"

 	"go.mongodb.org/mongo-driver/bson"
--- a/models/storage.go
+++ b/models/storage.go
@ -1,11 +1,8 @@
 package models

 import (
-	"fmt"
-	"strings"
-
-	"cloud.o-forge.io/core/deprecated-oc-catalog/models/rtype"
-	"cloud.o-forge.io/core/deprecated-oc-catalog/services"
+	"cloud.o-forge.io/core/oc-catalog/models/rtype"
+	"cloud.o-forge.io/core/oc-catalog/services"
 	"github.com/beego/beego/v2/core/logs"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )
@ -18,7 +15,6 @@ type StorageNEWModel struct {
 	Type             string `json:"type,omitempty" required:"true"`

 	DCacronym string `json:"DCacronym" required:"true" description:"Unique ID of the DC where it is the storage"`
-	URL string `json:"URL"`

 	Size         uint   `json:"size" required:"true"`
 	Encryption   bool   `json:"encryption" `
@ -140,16 +136,3 @@ func GetMultipleStorage(IDs []string) (object *[]StorageModel, err error) {

 	return object, err
 }
-
-func (obj StorageModel) AddUserInput(inputs map[string]interface{} ){
-	// So far only a few input to handle so a switch with a case for each type of attribute
-	// is enough, to prevent too much complexity
-	for key, value := range inputs {
-		switch strings.ToLower(key) {
-		case "URL":
-			obj.URL = value.(string)
-		default:
-			logs.Alert(fmt.Printf("%s is not an attribute of storage componants", key))
-		}
-	}
-}
--- a/models/workflow.go
+++ b/models/workflow.go
@ -4,14 +4,12 @@ import (
 	"context"
 	"encoding/xml"
 	"errors"
-	"net/url"
-	"os"
 	"sort"
 	"time"

-	"cloud.o-forge.io/core/deprecated-oc-catalog/models/rtype"
-	swagger "cloud.o-forge.io/core/deprecated-oc-catalog/selfapi"
-	"cloud.o-forge.io/core/deprecated-oc-catalog/services"
+	"cloud.o-forge.io/core/oc-catalog/models/rtype"
+	swagger "cloud.o-forge.io/core/oc-catalog/selfapi"
+	"cloud.o-forge.io/core/oc-catalog/services"
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/vk496/cron"
 	"go.mongodb.org/mongo-driver/bson/primitive"
@ -56,15 +54,12 @@ type Workflow struct {
 	Computing  map[string]ComputingObject  `json:"computing"`
 	Storage    map[string]StorageObject    `json:"storage"`
 	Datacenter map[string]DatacenterObject `json:"datacenter"` //TODO: Decide if there should be multiple objects of a datacenter
-	Links      map[string]Link             `json:"link"`

 	Schedules WorkflowSchedule `json:"schedules"`

 	MxgraphXML string `description:"State of the mxgraph"`
 }

-// TODO : describe what use case this interface satisfies
-
 type ResourceObject interface {
 	getHost() *string
 	getName() *string
@ -76,25 +71,18 @@ type ResourceObject interface {
 	addLink(direction LinkingState, rObjID string)
 }

-// This type allows to process computing and storage component
-// which can get input from the user
-type EditableResourceObject interface {
-	ResourceObject
-	addUserInput(map[string]interface{})
-}
-
 // Get a sum of all execution requirements attached to a DC obj
-func (wf Workflow) GetExecutionRequirements(dcIDobj string) (ret ExecutionRequirementsModel, err error) {
+func (w Workflow) GetExecutionRequirements(dcIDobj string) (ret ExecutionRequirementsModel, err error) {

 	// Find the id of the DC obj

-	if _, ok := wf.Datacenter[dcIDobj]; !ok {
+	if _, ok := w.Datacenter[dcIDobj]; !ok {
 		return ExecutionRequirementsModel{}, errors.New("DC obj" + dcIDobj + " doesn't exist in the Workflow")
 	}

 	// Get all elements that are attached to the DC

-	for _, computingObj := range wf.Computing {
+	for _, computingObj := range w.Computing {
 		if computingObj.DataCenterID == dcIDobj {
 			mymodel, err := computingObj.getModel()
 			if err != nil {
@ -119,13 +107,13 @@ func (w *Workflow) GetResource(rObjID *string) (retObj ResourceObject) {
 		return nil
 	}

-	if datVal, ok := w.Data[*rObjID]; ok {
-		retObj = &datVal
+	if storVal, ok := w.Data[*rObjID]; ok {
+		retObj = &storVal
 		return
 	}

-	if compVal, ok := w.Computing[*rObjID]; ok {
-		retObj = &compVal
+	if storVal, ok := w.Computing[*rObjID]; ok {
+		retObj = &storVal
 		return
 	}

@ -134,8 +122,8 @@ func (w *Workflow) GetResource(rObjID *string) (retObj ResourceObject) {
 		return
 	}

-	if dcVal, ok := w.Datacenter[*rObjID]; ok {
-		retObj = &dcVal
+	if storVal, ok := w.Datacenter[*rObjID]; ok {
+		retObj = &storVal
 		return
 	}

@ -171,7 +159,6 @@ func (w *Workflow) CreateResourceObject(rt rtype.Rtype) ResourceObject {
 	default:
 		res = nil
 	}
-
 	return res
 }

@ -182,13 +169,6 @@ func (w *Workflow) AddObj(robj ResourceObject) *primitive.ObjectID {
 	return &outputID
 }

-func (w *Workflow) AddLinkToWorkflow(link Link, id string) {
-	if w.Links == nil {
-		w.Links = make(map[string]Link)
-	}
-	w.Links[id] = link
-}
-
 func (w *Workflow) UpdateDB(userID, workflowName string) error {

 	_, err := services.MngoCollWorkspace.UpdateOne(services.MngoCtx,
@ -530,14 +510,6 @@ func ParseMxGraph(username, workflowName, xmlData string) (err error, mxissues [
 		//return errors.New("Can't modify a booked workflow"), nil
 	}

-	decodedValue, err := url.QueryUnescape(xmlData)
-	if err != nil {
-		return err, nil
-	}
-
-	// TEMPORARY test the xml created
-	os.WriteFile("graph.xml", []byte(decodedValue), 0660)
-
 	var xmlModel MxGraphModel

 	// logs.Debug(xmlData)
@ -546,15 +518,13 @@ func ParseMxGraph(username, workflowName, xmlData string) (err error, mxissues [
 		return err, nil
 	}

-	xmlModel.createLinks()
-
 	targetWorkspaceWorkflow, err, mxissues := userWorkspace.ConsumeMxGraphModel(xmlModel)
 	if err != nil {
 		return err, nil
 	}

 	targetWorkspaceWorkflow.MxgraphXML = xmlData
-	targetWorkspaceWorkflow.Schedules = currentWorkflow.Schedules //TODO: Probably we should move schedules outside the workflow
+	targetWorkspaceWorkflow.Schedules = currentWorkflow.Schedules //TODO: Probably we should move schudles outside the workflow

 	_, err = services.MngoCollWorkspace.UpdateOne(services.MngoCtx,
 		primitive.M{"_id": username},
@ -594,9 +564,9 @@ func FindSliceInSlice(slice1 []string, slice2 []string) (int, int, bool) {
 	return -1, -1, false
 }

-func (ws Workspace) ConsumeMxGraphModel(xmlmodel MxGraphModel) (returned_wf *Workflow, err error, issues []error) {
+func (w Workspace) ConsumeMxGraphModel(xmlmodel MxGraphModel) (ret *Workflow, err error, issues []error) {

-	returned_wf = &Workflow{}
+	ret = &Workflow{}

 	// When we will iterate over the full array of cells, we first will register the resources
 	// and after the linkage between them
@ -604,44 +574,31 @@ func (ws Workspace) ConsumeMxGraphModel(xmlmodel MxGraphModel) (returned_wf *Wor
 		return xmlmodel.Root.MxCell[i].RID != nil
 	})

-	// Create the object and add it to the appropriate list
-	// for all the components with setting, which are identified
-	// by a MxObject tag in the xml
-	if ok := xmlmodel.Root.MxObject != nil; ok {
-		for _, object := range *xmlmodel.Root.MxObject {
-	
-			resObj, err, mxissues := returned_wf.mxCellToComponent(object.MxCell, ws)
-			if err != nil {
-				issues = append(issues, mxissues...)
-			}
-	
-			// add the component to the worflow's attribute that stores
-			// all components in a map[string]Component where the key
-			// is the component's ID in the mxGraph and the value the Component object
-			returned_wf.UpdateObj(resObj, object.ID)
-	
-			// Construct the object corresponding to the componant's type and use its addUserInput method
-			if resObj.getRtype() == rtype.COMPUTING {
-				comp_obj := returned_wf.GetResource(&object.ID).(*ComputingObject)
-				comp_obj.AddUserInput(object.Settings)
-				returned_wf.UpdateObj(comp_obj, object.ID)
-			}
-			// if(resObj.getRtype() == rtype.DATA){
-			// }
-		}
-	}
-
 	for _, cell := range xmlmodel.Root.MxCell {

 		switch {
 		case cell.RID != nil:
-			resObj, err, mxissues := returned_wf.mxCellToComponent(cell, ws)
-			if err != nil {
-				issues = append(issues, mxissues...)
+			// Case of a Resource
+			rType := w.getRtype(*cell.RID)
+
+			if rType == rtype.INVALID {
+				return nil,
+					errors.New("Refering to a rID that is not in the workflow"),
+					nil
 			}

-			returned_wf.UpdateObj(resObj, cell.ID)
+			// Generate ObjectID for the reference ID
+			rIDObj, err := primitive.ObjectIDFromHex(*cell.RID)
+			if err != nil {
+				return nil,
+					errors.New("Bad ID format: " + *cell.RID),
+					nil
+			}

+			resObj := ret.CreateResourceObject(rType)
+			resObj.setReference(rIDObj)
+
+			ret.UpdateObj(resObj, cell.ID)
 		case cell.ID == "0" || cell.ID == "1":
 			// ID 0 and 1 are special cases of mxeditor
 			continue
@ -649,8 +606,8 @@ func (ws Workspace) ConsumeMxGraphModel(xmlmodel MxGraphModel) (returned_wf *Wor

 		default:
 			// Not root nor resource. Should be only links
-			sourceObj := returned_wf.GetResource(cell.Source)
-			targetObj := returned_wf.GetResource(cell.Target)
+			sourceObj := ret.GetResource(cell.Source)
+			targetObj := ret.GetResource(cell.Target)

 			if sourceObj == nil || targetObj == nil {
 				if sourceObj == nil && targetObj == nil {
@ -665,72 +622,91 @@ func (ws Workspace) ConsumeMxGraphModel(xmlmodel MxGraphModel) (returned_wf *Wor
 				continue
 			}

-			// Not root nor resource. Should be only links
-			// If is a invalid link, we can't save it in the DB
-			// We should always get a ID because we already registered resources and discarded which doesn't correspond to existent models
-			// save back
-			// If we have a relationship of:
-			//     Source ----> Target
-			//
-			// The Source will be in the INPUTs of the Target.
-			// But we also must make sure that the Target will be in the OUTPUTs of the Source
+			if sourceObj.getRtype() == rtype.DATACENTER || targetObj.getRtype() == rtype.DATACENTER {
+				var datacenter, datacenterLinked *string
+
+				if sourceObj.getRtype() == rtype.DATACENTER {
+					datacenter = cell.Source
+					datacenterLinked = cell.Target
+				} else {
+					datacenter = cell.Target
+					datacenterLinked = cell.Source
+				}
+
+				switch ret.GetResource(datacenterLinked).getRtype() {
+				case rtype.COMPUTING:
+					computingObj := ret.GetResource(datacenterLinked).(*ComputingObject)
+
+					// We should always get a ID because we already registered resources and discarded which doesn't correspond to existent models
+					computingObj.DataCenterID = *datacenter
+					ret.UpdateObj(computingObj, *datacenterLinked)
+				}
+
+			} else {
+				targetObj.addLink(INPUT, *cell.Source)
+				ret.UpdateObj(targetObj, *cell.Target) // save back
+
+				// If we have a relationship of:
+				//     Source ----> Target
+				//
+				// The Source will be in the INPUTs of the Target.
+				// But we also must make sure that the Target will be in the OUTPUTs of the Source
+
+				sourceObj.addLink(OUTPUT, *cell.Target)
+				ret.UpdateObj(sourceObj, *cell.Source)
+			}

 		}
 	}

-	issues = returned_wf.createLinks(xmlmodel.Root.MxLink, issues)
-	issues = returned_wf.checkLinks(issues)
+	dcslist := make(map[string]bool)
+	dataslist := make(map[string]bool)
+	// datalist := make(map[string]bool)

-	// dcslist := make(map[string]bool)
-	// dataslist := make(map[string]bool)
-	// // datalist := make(map[string]bool)
+	for _, comp := range ret.Computing {
+		if comp.DataCenterID == "" {
+			issues = append(issues, errors.New("Computing "+*comp.getName()+" without a Datacenter"))
+		} else {
+			// If doesn't exist in the list, means is new element to register as used
+			dcslist[comp.DataCenterID] = true

+		}

-	// // Test wether the computing components are linked with a DC
-	// for _, comp := range returned_wf.Computing {
-	// 	if comp.DataCenterID == "" {
-	// 		issues = append(issues, errors.New("Computing "+*comp.getName()+" without a Datacenter"))
-	// 	} else {
-	// 		// If doesn't exist in the list, means is new element to register as used
-	// 		dcslist[comp.DataCenterID] = true
+		for _, dcin := range comp.Inputs {
+			switch ret.GetResource(&dcin).getRtype() {
+			case rtype.DATA:
+				dataslist[dcin] = true
+			}
+		}

-	// 	}
+		for _, dcout := range comp.Outputs {
+			switch ret.GetResource(&dcout).getRtype() {
+			case rtype.DATA:
+				dataslist[dcout] = true
+			}
+		}

-	// 	for _, dcin := range comp.Inputs {
-	// 		switch returned_wf.GetResource(&dcin).getRtype() {
-	// 		case rtype.DATA:
-	// 			dataslist[dcin] = true
-	// 		}
-	// 	}
+	}

-	// 	for _, dcout := range comp.Outputs {
-	// 		switch returned_wf.GetResource(&dcout).getRtype() {
-	// 		case rtype.DATA:
-	// 			dataslist[dcout] = true
-	// 		}
-	// 	}
+	for _, va := range ret.Storage {
+		if va.Inputs == nil && va.Outputs == nil {
+			issues = append(issues, errors.New("Storage "+*va.getName()+" without compatible inputs and outputs"))
+		}
+	}

-	// }
+	for dcID, va := range ret.Datacenter {
+		// if rID doesn't exist in the list, it means that it's not used
+		if _, ok := dcslist[dcID]; !ok {
+			issues = append(issues, errors.New("DC "+*va.getName()+" not atached to any Computing"))
+		}
+	}

-	// for _, storage_component := range returned_wf.Storage {
-	// 	if storage_component.Inputs == nil && storage_component.Outputs == nil {
-	// 		issues = append(issues, errors.New("Storage "+*storage_component.getName()+" without compatible inputs and outputs"))
-	// 	}
-	// }
-
-	// for dcID, dc_component := range returned_wf.Datacenter {
-	// 	// if rID doesn't exist in the list, it means that it's not used
-	// 	if _, ok := dcslist[dcID]; !ok {
-	// 		issues = append(issues, errors.New("DC "+*dc_component.getName()+" not attached to any Computing"))
-	// 	}
-	// }
-
-	// for dcID, data_component := range returned_wf.Data {
-	// 	// if rID doesn't exist in the list, it means that it's not used
-	// 	if _, ok := dataslist[dcID]; !ok {
-	// 		issues = append(issues, errors.New("Data "+*data_component.getName()+" not attached to any Computing"))
-	// 	}
-	// }
+	for dcID, va := range ret.Data {
+		// if rID doesn't exist in the list, it means that it's not used
+		if _, ok := dataslist[dcID]; !ok {
+			issues = append(issues, errors.New("Data "+*va.getName()+" not atached to any Computing"))
+		}
+	}

 	//////////////////////////////////////////////////////////
 	//														//
@ -746,7 +722,7 @@ func (ws Workspace) ConsumeMxGraphModel(xmlmodel MxGraphModel) (returned_wf *Wor
 	// inputs AND Comp2 inputs with Comp1 outputs, since we are
 	// iterating over all existent Computing models in the Graph

-	for _, comp := range returned_wf.Computing {
+	for _, comp := range ret.Computing {

 		compModel, err2 := comp.getModel()
 		if err = err2; err != nil {
@ -768,7 +744,7 @@ func (ws Workspace) ConsumeMxGraphModel(xmlmodel MxGraphModel) (returned_wf *Wor

 		//TODO: We should allow heterogenous inputs?
 		for _, objIn := range comp.Inputs {
-			resIn := returned_wf.GetResource(&objIn)
+			resIn := ret.GetResource(&objIn)
 			resInType := resIn.getRtype()
 			switch resInType {
 			case rtype.DATA:
@ -805,7 +781,7 @@ func (ws Workspace) ConsumeMxGraphModel(xmlmodel MxGraphModel) (returned_wf *Wor

 		//TODO: We should allow heterogenous outputs?
 		for _, objOut := range comp.Outputs {
-			resOut := returned_wf.GetResource(&objOut)
+			resOut := ret.GetResource(&objOut)
 			resOutType := resOut.getRtype()
 			switch resOutType {
 			case rtype.COMPUTING:
@ -833,115 +809,6 @@ func (ws Workspace) ConsumeMxGraphModel(xmlmodel MxGraphModel) (returned_wf *Wor
 	return
 }

-func (w *Workflow) createLinks(links []MxLink, issues []error) []error {
-	
-	for _, link := range links {	
-		if (len(link.Source) > 0 && len(link.Target) > 0){
-			sourceObj := w.GetResource(&link.Source)
-			targetObj := w.GetResource(&link.Target)
-			link_object := NewLink(sourceObj, link.Source, targetObj, link.Target)
-			w.AddLinkToWorkflow(link_object, link.ID)
-		} else {
-			issues = append(issues, w.processLinkErrors(link))
-		}
-	}
-	return issues
-}
-
-func (w *Workflow) processLinkErrors(link MxLink) (issue error) {
-	if len(link.Source) == 0 && len(link.Target) == 0 {
-		issue = errors.New("Arrow " + link.ID + " is alone")
-	} else if len(link.Source) == 0 {
-		targetObj := w.GetResource(&link.Target)
-		issue = errors.New("Arrow (" + link.ID + ") to " + *targetObj.getName() + " without parent")
-	} else {
-		sourceObj := w.GetResource(&link.Source)
-		issue = errors.New("Arrow " + link.ID + " from " + *sourceObj.getName() + " without target")
-	}
-
-	return issue
-}
-
-func (w *Workflow) checkLinks(issues []error) []error {
-	
-	// Check that storage components have a valid link
-	for id, storage := range w.Storage {
-		if(!w.isComponentSrc(id) && !w.isComponentDst(id)){
-			issues = append(issues, errors.New("Storage "+*storage.getName()+" without compatible inputs and outputs"))
-		}
-	}
-
-	// Check that data components are linked to a computing component
-	for id, data := range w.Data {
-		if(!w.isLinkedToComputing(id)){
-			issues = append(issues, errors.New("Data "+*data.getName()+" not attached to any Computing"))
-		}
-	}
-
-	// Check that DC is linked to a computing component
-	for id, dc:= range w.Datacenter {
-		if(!w.isLinkedToComputing(id)){
-			issues = append(issues, errors.New("Datacenter "+*dc.getName()+" not attached to any Computing"))
-		}
-
-	}
-
-	// Check that all data computing components are linked to a DC
-	for id,comp:= range w.Computing {
-		if(!w.isLinkedToDC(id)){
-			issues = append(issues, errors.New("Computing "+*comp.getName()+" not attached to any datacenter"))
-		}
-
-	}
-
-	return issues
-}
-
-func (w *Workflow) isComponentSrc(id string) bool {
-	
-	for _, link := range w.Links{
-		if(link.Source == id && link.Source != ""){
-			return true
-		}
-	}
-
-	return false
-}
-
-func (w *Workflow) isComponentDst(id string) bool {
-	
-	for _, link := range w.Links{
-		if(link.Destination == id && link.Source != ""){
-			return true
-		}
-	}
-
-	return false
-}
-
-func (w *Workflow) isLinkedToComputing(id string) bool {
-
-	for idComputing, _ := range w.Computing {
-		if( (w.isComponentSrc(id) && w.isComponentDst(idComputing)) || (w.isComponentSrc(idComputing) && w.isComponentDst(id))){
-			return true
-		}
-
-	}
-
-	return false
-}
-
-func (w *Workflow) isLinkedToDC(id string) bool {
-
-	for _, link := range w.Links {
-		if link.Source == id && link.DCLink {
-			return true
-		}
-	}
-
-	return false
-}
-
 func sumExecutionReqs(exeqReq ...ExecutionRequirementsModel) (ret ExecutionRequirementsModel) {
 	for _, v := range exeqReq {
 		ret.CPUs += v.CPUs
@ -1129,28 +996,3 @@ func CheckAndBookWorkflowSchedule(username, workflowName string, book bool) (myR

 	return myRet, nil
 }
-
-// Not sure if this method handles error propagation well
-func (wf Workflow) mxCellToComponent(cell MxCell, ws Workspace) (resObj ResourceObject, err error, issues []error) {
-	rType := ws.getRtype(*cell.RID)
-
-	if rType == rtype.INVALID {
-		return nil,
-			errors.New("Refering to a rID that is not in the workflow"),
-			nil
-	}
-
-	// Generate ObjectID for the reference ID
-	rIDObj, err := primitive.ObjectIDFromHex(*cell.RID)
-	if err != nil {
-		return nil,
-			errors.New("Bad ID format: " + *cell.RID),
-			nil
-	}
-
-	resObj = wf.CreateResourceObject(rType)
-	resObj.setReference(rIDObj)
-
-	return
-}
-
--- a/models/workspace.go
+++ b/models/workspace.go
@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"

-	"cloud.o-forge.io/core/deprecated-oc-catalog/models/rtype"
-	"cloud.o-forge.io/core/deprecated-oc-catalog/services"
+	"cloud.o-forge.io/core/oc-catalog/models/rtype"
+	"cloud.o-forge.io/core/oc-catalog/services"
 	"github.com/beego/beego/v2/core/logs"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
--- a/routers/auth.go
+++ b/routers/auth.go
@ -4,8 +4,8 @@ import (
 	"reflect"
 	"strings"

-	"cloud.o-forge.io/core/deprecated-oc-catalog/controllers"
-	"cloud.o-forge.io/core/deprecated-oc-catalog/models"
+	"cloud.o-forge.io/core/oc-catalog/controllers"
+	"cloud.o-forge.io/core/oc-catalog/models"
 	"github.com/beego/beego/v2/core/logs"
 	beego "github.com/beego/beego/v2/server/web"
 	"github.com/beego/beego/v2/server/web/context"
--- a/routers/router.go
+++ b/routers/router.go
@ -12,8 +12,8 @@ import (
 	"os"
 	"strings"

-	"cloud.o-forge.io/core/deprecated-oc-catalog/controllers"
-	"cloud.o-forge.io/core/deprecated-oc-catalog/services"
+	"cloud.o-forge.io/core/oc-catalog/controllers"
+	"cloud.o-forge.io/core/oc-catalog/services"

 	"github.com/beego/beego/v2/core/logs"

--- a/scripts/demo.json
+++ b/scripts/demo.json
@ -148,115 +148,6 @@
                    "license": "GPLv3",
                    "inputs": [],
                    "outputs": []
-                },
-                {
-                    "name": "CURL",
-                    "image" : "curlimages/curl:7.88.1",
-                    "short_description": "Transfer or retrieve information from or to a server ",
-                    "logo": "./local_imgs/curl-logo.png",
-                    "description": "curl  is  a tool for transferring data from or to a server. It supports these protocols: DICT, FILE, FTP, FTPS, GOPHER, GOPHERS,  HTTP,  HTTPS, IMAP,  IMAPS,  LDAP,  LDAPS, MQTT, POP3, POP3S, RTMP, RTMPS, RTSP, SCP, SFTP, SMB, SMBS, SMTP, SMTPS, TELNET, TFTP, WS and WSS.",
-                    "type": "computing",
-                    "owner": "IRT",
-                    "price": 300,
-                    "license": "GPLv2",
-                    "execution_requirements": {
-                        "cpus": 1,
-                        "ram": 1024,
-                        "storage": 300,
-                        "gpus": 1,
-                        "disk_io": "30 MB/s",
-                        "parallel": true,
-                        "scaling_model": 2
-                    },
-                    "inputs": [],
-                    "outputs": []
-                },
-                {
-                    "name": "alpine",
-                    "image" : "alpine:3.7",
-                    "short_description": "A minimal Docker image ",
-                    "logo": "./local_imgs/alpine-logo.png",
-                    "description": "Alpine Linux is a Linux distribution built around musl libc and BusyBox. The image is only 5 MB in size and has access to a package repository that is much more complete than other BusyBox based images. This makes Alpine Linux a great image base for utilities and even production applications",
-                    "type": "computing",
-                    "owner": "IRT",
-                    "price": 300,
-                    "license": "GPLv2",
-                    "execution_requirements": {
-                        "cpus": 1,
-                        "ram": 1024,
-                        "storage": 300,
-                        "gpus": 1,
-                        "disk_io": "30 MB/s",
-                        "parallel": true,
-                        "scaling_model": 2
-                    },
-                    "inputs": [],
-                    "outputs": []
-                },
-                {
-                    "name": "alpr",
-                    "image" : "openalpr/openalpr",
-                    "short_description": "Open source Automatic License Plate Recognition library.",
-                    "logo": "./local_imgs/alpr-logo.png",
-                    "description": "Deploy license plate and vehicle recognition with Rekor’s OpenALPR suite of solutions designed to provide invaluable vehicle intelligence which enhances business capabilities, automates tasks, and increases overall community safety!",
-                    "type": "computing",
-                    "owner": "IRT",
-                    "price": 300,
-                    "license": "GPLv2",
-                    "execution_requirements": {
-                        "cpus": 1,
-                        "ram": 1024,
-                        "storage": 300,
-                        "gpus": 1,
-                        "disk_io": "30 MB/s",
-                        "parallel": true,
-                        "scaling_model": 2
-                    },
-                    "inputs": [],
-                    "outputs": []
-                },
-                {
-                    "name": "imagemagic",
-                    "image" : "dpokidov/imagemagick:7.1.0-62-2",
-                    "short_description": "ImageMagick® is a free, open-source software suite, used for editing and manipulating digital images.",
-                    "logo": "./local_imgs/imagemagic-logo.png",
-                    "description": "Use ImageMagick to create, edit, compose, and convert digital images. Resize an image, crop it, change its shades and colors, add captions, and more.",
-                    "type": "computing",
-                    "owner": "IRT",
-                    "price": 300,
-                    "license": "GPLv2",
-                    "execution_requirements": {
-                        "cpus": 1,
-                        "ram": 1024,
-                        "storage": 300,
-                        "gpus": 1,
-                        "disk_io": "30 MB/s",
-                        "parallel": true,
-                        "scaling_model": 2
-                    },
-                    "inputs": [],
-                    "outputs": []
-                },
-                {
-                    "name": "Mosquito server",
-                    "short_description": "open source message broker that implements the MQTT protocol versions 5.0, 3.1.1 and 3.1.",
-                    "logo": "./local_imgs/mosquitto-logo.png",
-                    "description": "A very long description of what this storage is",
-                    "type": "computing",
-                    "owner": "IRT",
-                    "price": 300,
-                    "license": "GPLv2",
-                    "execution_requirements": {
-                        "cpus": 1,
-                        "ram": 1024,
-                        "storage": 300,
-                        "gpus": 1,
-                        "disk_io": "30 MB/s",
-                        "parallel": true,
-                        "scaling_model": 2
-                    },
-                    "inputs": [],
-                    "outputs": []
                }
            ]
        },
@ -267,7 +158,7 @@
                    "name": "IRT risk database",
                    "short_description": "IRT Database instance",
                    "logo": "./local_imgs/IRT risk database.png",
-                    "description": "A very long description of what this storage is",
+                    "description": "A very long description of what this data is",
                    "type": "database",
                    "DCacronym": "DC_myDC",
                    "size": 4000,
@ -276,14 +167,13 @@
                    "throughput": "r:200,w:150",
                    "bookingPrice": 60,
                    "inputs": [],
-                    "outputs": [],
-                    "URL" : ""
+                    "outputs": []
                },
                {
                    "name": "IRT local file storage",
                    "short_description": "S3 compliant IRT file storage",
                    "logo": "./local_imgs/IRT local file storage.png",
-                    "description": "A very long description of what this storage is",
+                    "description": "A very long description of what this data is",
                    "type": "storage",
                    "DCacronym": "DC_myDC",
                    "size": 40000,
@ -292,8 +182,7 @@
                    "throughput": "r:300,w:350",
                    "bookingPrice": 90,
                    "inputs": [],
-                    "outputs": [],
-                    "URL" : ""
+                    "outputs": []
                }
            ]
        },
--- a/scripts/local_imgs/Thumbs.db:encryptable
+++ b/scripts/local_imgs/Thumbs.db:encryptable
--- a/scripts/local_imgs/alpine-logo.png
+++ b/scripts/local_imgs/alpine-logo.png
--- a/scripts/local_imgs/alpr-logo.png
+++ b/scripts/local_imgs/alpr-logo.png
--- a/scripts/local_imgs/curl-logo.png
+++ b/scripts/local_imgs/curl-logo.png
--- a/scripts/local_imgs/imagemagic-logo.png
+++ b/scripts/local_imgs/imagemagic-logo.png
--- a/scripts/local_imgs/mosquitto-logo.png
+++ b/scripts/local_imgs/mosquitto-logo.png
--- a/scripts/local_imgs/nginx.png
+++ b/scripts/local_imgs/nginx.png
--- a/services/discovery.go
+++ b/services/discovery.go
@ -3,9 +3,7 @@ package services
 import (
 	"os"

-	conf "cloud.o-forge.io/core/deprecated-oc-catalog/conf"
-
-	SelfAPI "cloud.o-forge.io/core/deprecated-oc-catalog/selfapi"
+	SelfAPI "cloud.o-forge.io/core/oc-catalog/selfapi"
 	"github.com/beego/beego/v2/core/logs"
 	beego "github.com/beego/beego/v2/server/web"
 )
@ -16,7 +14,6 @@ func GetSelfAPI(host string) *SelfAPI.APIClient {
 	return SelfAPI.NewAPIClient(&SelfAPI.Configuration{BasePath: "http://" + host + "/v1"})
 }

-// Need to understand why there are so many different DC name
 func Discoveryinit() {

 	dcNameOS := os.Getenv("DOCKER_DCNAME")
@ -35,7 +32,4 @@ func Discoveryinit() {
 	DC_NAME = "DC_DEFAULT"
 	logs.Warning("Default DC name is used")

-	// Quickfix for scheduling
-	DC_NAME = conf.GetConfig().DCNAME
-
 }
--- a/services/init.go
+++ b/services/init.go
@ -1,7 +1,7 @@
 package services

 import (
-	"cloud.o-forge.io/core/deprecated-oc-catalog/conf"
+	"cloud.o-forge.io/core/oc-catalog/conf"
 )

 func Init() {
--- a/services/mongo.go
+++ b/services/mongo.go
@ -4,7 +4,7 @@ import (
 	"context"
 	"time"

-	"cloud.o-forge.io/core/deprecated-oc-catalog/conf"
+	"cloud.o-forge.io/core/oc-catalog/conf"
 	"github.com/beego/beego/v2/core/logs"

 	"go.mongodb.org/mongo-driver/mongo"