diff --git a/controllers/workflow.go b/controllers/workflow.go index 9b26193..104a6b0 100644 --- a/controllers/workflow.go +++ b/controllers/workflow.go @@ -41,18 +41,6 @@ func (o *WorkflowController) Put() { utils.BOOKING.String(): { tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.BOOKING)) + "/oc/booking/", }, - utils.SHARED_WORKSPACE.String(): { - tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/:id", - tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/", - }, - utils.WORKSPACE.String(): { - tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.WORKSPACE)) + "/oc/workspace/:id", - tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.WORKSPACE)) + "/oc/workspace/", - }, - utils.WORKFLOW.String(): { - tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.WORKFLOW)) + "/oc/workflow/:id", - tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.WORKFLOW)) + "/oc/workflow/", - }, } // store and return Id or post with UUID var res map[string]interface{} @@ -107,18 +95,6 @@ func (o *WorkflowController) Post() { utils.BOOKING.String(): { tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.BOOKING)) + "/oc/booking/", }, - utils.SHARED_WORKSPACE.String(): { - tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/:id", - tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/", - }, - utils.WORKSPACE.String(): { - tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.WORKSPACE)) + "/oc/workspace/:id", - tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.WORKSPACE)) + "/oc/workspace/", - }, - utils.WORKFLOW.String(): { - tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.WORKFLOW)) + "/oc/workflow/:id", - tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.WORKFLOW)) + "/oc/workflow/", - }, } var res map[string]interface{} json.Unmarshal(o.Ctx.Input.CopyBody(10000), &res) diff --git a/main.go b/main.go index ddea474..5de7233 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,6 @@ package main import ( - "fmt" _ "oc-workflow/routers" oclib "cloud.o-forge.io/core/oc-lib" @@ -39,10 +38,6 @@ func main() { ) oclib.Init("oc-workflow") oclib.AddPath(oclib.LibDataEnum(oclib.BOOKING), o.GetStringDefault("BOOKING_URL", ":8092")) - fmt.Println(oclib.GetPath(oclib.LibDataEnum(oclib.BOOKING))) - oclib.AddPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), o.GetStringDefault("SHARED_WORKSPACE_URL", ":8091")) - oclib.AddPath(oclib.LibDataEnum(oclib.WORKSPACE), o.GetStringDefault("WORKSPACE_URL", ":8089")) - oclib.AddPath(oclib.LibDataEnum(oclib.WORKFLOW), o.GetStringDefault("WORKFLOW_URL", ":8088")) // Normal beego init //if beego.BConfig.RunMode == "dev" { beego.BConfig.WebConfig.DirectoryIndex = true diff --git a/oc-workflow b/oc-workflow index c85597d..f7c2652 100755 Binary files a/oc-workflow and b/oc-workflow differ