diff --git a/README.md b/README.md
index ab730f2..33cbd2a 100644
--- a/README.md
+++ b/README.md
@@ -8,5 +8,5 @@ To build :
bee run -gendoc=true -downdoc=true
If default Swagger page is displayed instead of tyour api, change url in swagger/index.html file to :
-
+<>
url: "swagger.json"
\ No newline at end of file
diff --git a/controllers/version.go b/controllers/version.go
index 4e50e5f..1f7ae37 100644
--- a/controllers/version.go
+++ b/controllers/version.go
@@ -27,10 +27,6 @@ func (c *VersionController) Status() {
errStr := ""
api := tools.API{}
state, code, err := api.GetState()
-
- if state == tools.ALIVE {
- state, _, err = api.CheckRemoteAPIs(map[string]string{})
- }
if err != nil {
errStr = err.Error()
}
diff --git a/go.mod b/go.mod
index 19e6d52..5a46659 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.22.0
toolchain go1.22.4
require (
- cloud.o-forge.io/core/oc-lib v0.0.0-20241002120813-a09a04e1a71e
+ cloud.o-forge.io/core/oc-lib v0.0.0-20241015083538-9f5e6d60185a
github.com/beego/beego/v2 v2.3.1
github.com/smartystreets/goconvey v1.7.2
go.mongodb.org/mongo-driver v1.17.1
@@ -15,7 +15,7 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
- github.com/gabriel-vasile/mimetype v1.4.5 // indirect
+ github.com/gabriel-vasile/mimetype v1.4.6 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.22.1 // indirect
@@ -25,7 +25,7 @@ require (
github.com/goraz/onion v0.1.3 // indirect
github.com/hashicorp/golang-lru v1.0.2 // indirect
github.com/jtolds/gls v4.20.0+incompatible // indirect
- github.com/klauspost/compress v1.17.10 // indirect
+ github.com/klauspost/compress v1.17.11 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
@@ -50,11 +50,11 @@ require (
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
- golang.org/x/crypto v0.27.0 // indirect
- golang.org/x/net v0.29.0 // indirect
+ golang.org/x/crypto v0.28.0 // indirect
+ golang.org/x/net v0.30.0 // indirect
golang.org/x/sync v0.8.0 // indirect
- golang.org/x/sys v0.25.0 // indirect
- golang.org/x/text v0.18.0 // indirect
- google.golang.org/protobuf v1.34.2 // indirect
+ golang.org/x/sys v0.26.0 // indirect
+ golang.org/x/text v0.19.0 // indirect
+ google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/go.sum b/go.sum
index 1810f83..c3978e1 100644
--- a/go.sum
+++ b/go.sum
@@ -2,6 +2,8 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20240904135449-4f0ab6a3760f h1:v9mw3uNg/DJsw
cloud.o-forge.io/core/oc-lib v0.0.0-20240904135449-4f0ab6a3760f/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
cloud.o-forge.io/core/oc-lib v0.0.0-20241002120813-a09a04e1a71e h1:77QHk5JSf0q13B/Ai3xjcsGSS7nX+9AfxcsYz5oDo/A=
cloud.o-forge.io/core/oc-lib v0.0.0-20241002120813-a09a04e1a71e/go.mod h1:t+zpCTVKVdHH/BImwtMYY2QIWLMXKgY4n/JhFm3Vpu8=
+cloud.o-forge.io/core/oc-lib v0.0.0-20241015083538-9f5e6d60185a h1:2mBMc36WKh1/Dpomktx9dVXGxK0agFr7RdgvHTtyn2w=
+cloud.o-forge.io/core/oc-lib v0.0.0-20241015083538-9f5e6d60185a/go.mod h1:t+zpCTVKVdHH/BImwtMYY2QIWLMXKgY4n/JhFm3Vpu8=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/beego/beego/v2 v2.3.0 h1:iECVwzm6egw6iw6tkWrEDqXG4NQtKLQ6QBSYqlM6T/I=
github.com/beego/beego/v2 v2.3.0/go.mod h1:Ob/5BJ9fIKZLd4s9ZV3o9J6odkkIyL83et+p98gyYXo=
@@ -25,6 +27,8 @@ github.com/etcd-io/etcd v3.3.17+incompatible/go.mod h1:cdZ77EstHBwVtD6iTgzgvogwc
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4=
github.com/gabriel-vasile/mimetype v1.4.5/go.mod h1:ibHel+/kbxn9x2407k1izTA1S81ku1z/DlgOW2QE0M4=
+github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc=
+github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc=
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
@@ -57,6 +61,8 @@ github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2
github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0=
github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -143,6 +149,8 @@ golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
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=
@@ -153,6 +161,8 @@ golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
@@ -169,6 +179,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -177,6 +189,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -184,6 +198,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
diff --git a/oc-scheduler b/oc-scheduler
deleted file mode 100755
index 851a950..0000000
Binary files a/oc-scheduler and /dev/null differ
diff --git a/routers/router.go b/routers/router.go
index e75398a..735e883 100644
--- a/routers/router.go
+++ b/routers/router.go
@@ -15,10 +15,8 @@ import (
func init() {
ns := beego.NewNamespace("/oc/",
- beego.NSNamespace("/workflow_execution",
- beego.NSInclude(
- &controllers.WorkflowExecutionController{},
- ),
+ beego.NSInclude(
+ &controllers.WorkflowExecutionController{},
),
beego.NSNamespace("/version",
beego.NSInclude(
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 1885774..8ea4d22 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -15,6 +15,50 @@
},
"basePath": "/oc/",
"paths": {
+ "/": {
+ "get": {
+ "tags": [
+ "oc-scheduler/controllersWorkflowExecutionController"
+ ],
+ "description": "find workflow by workflowid\n\u003cbr\u003e",
+ "operationId": "WorkflowExecutionController.GetAll",
+ "responses": {
+ "200": {
+ "description": "{workflow} models.workflow"
+ }
+ }
+ }
+ },
+ "/search/{start_date}/{end_date}": {
+ "get": {
+ "tags": [
+ "oc-scheduler/controllersWorkflowExecutionController"
+ ],
+ "description": "search workspace\n\u003cbr\u003e",
+ "operationId": "WorkflowExecutionController.Search",
+ "parameters": [
+ {
+ "in": "path",
+ "name": "start_date",
+ "description": "the word search you want to get",
+ "required": true,
+ "type": "string"
+ },
+ {
+ "in": "path",
+ "name": "end_date",
+ "description": "the word search you want to get",
+ "required": true,
+ "type": "string"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "{workspace} models.workspace"
+ }
+ }
+ }
+ },
"/version/": {
"get": {
"tags": [
@@ -43,54 +87,10 @@
}
}
},
- "/workflow_execution/": {
+ "/{id}": {
"get": {
"tags": [
- "workflow_execution"
- ],
- "description": "find workflow by workflowid\n\u003cbr\u003e",
- "operationId": "WorkflowExecutionController.GetAll",
- "responses": {
- "200": {
- "description": "{workflow} models.workflow"
- }
- }
- }
- },
- "/workflow_execution/search/{start_date}/{end_date}": {
- "get": {
- "tags": [
- "workflow_execution"
- ],
- "description": "search workspace\n\u003cbr\u003e",
- "operationId": "WorkflowExecutionController.Search",
- "parameters": [
- {
- "in": "path",
- "name": "start_date",
- "description": "the word search you want to get",
- "required": true,
- "type": "string"
- },
- {
- "in": "path",
- "name": "end_date",
- "description": "the word search you want to get",
- "required": true,
- "type": "string"
- }
- ],
- "responses": {
- "200": {
- "description": "{workspace} models.workspace"
- }
- }
- }
- },
- "/workflow_execution/{id}": {
- "get": {
- "tags": [
- "workflow_execution"
+ "oc-scheduler/controllersWorkflowExecutionController"
],
"description": "find workflow by workflowid\n\u003cbr\u003e",
"operationId": "WorkflowExecutionController.Get",
@@ -113,7 +113,7 @@
},
"tags": [
{
- "name": "workflow_execution",
+ "name": "oc-scheduler/controllersWorkflowExecutionController",
"description": "Operations about workflow\n"
},
{
diff --git a/swagger/swagger.yml b/swagger/swagger.yml
index c1bdc0a..08bb435 100644
--- a/swagger/swagger.yml
+++ b/swagger/swagger.yml
@@ -12,6 +12,56 @@ info:
url: https://opensource.org/license/mit
basePath: /oc/
paths:
+ /:
+ get:
+ tags:
+ - oc-scheduler/controllersWorkflowExecutionController
+ description: |-
+ find workflow by workflowid
+
+ operationId: WorkflowExecutionController.GetAll
+ responses:
+ "200":
+ description: '{workflow} models.workflow'
+ /{id}:
+ get:
+ tags:
+ - oc-scheduler/controllersWorkflowExecutionController
+ description: |-
+ find workflow by workflowid
+
+ operationId: WorkflowExecutionController.Get
+ parameters:
+ - in: path
+ name: id
+ description: the workflowid you want to get
+ required: true
+ type: string
+ responses:
+ "200":
+ description: '{workflow} models.workflow'
+ /search/{start_date}/{end_date}:
+ get:
+ tags:
+ - oc-scheduler/controllersWorkflowExecutionController
+ description: |-
+ search workspace
+
+ operationId: WorkflowExecutionController.Search
+ parameters:
+ - in: path
+ name: start_date
+ description: the word search you want to get
+ required: true
+ type: string
+ - in: path
+ name: end_date
+ description: the word search you want to get
+ required: true
+ type: string
+ responses:
+ "200":
+ description: '{workspace} models.workspace'
/version/:
get:
tags:
@@ -34,58 +84,8 @@ paths:
responses:
"200":
description: ""
- /workflow_execution/:
- get:
- tags:
- - workflow_execution
- description: |-
- find workflow by workflowid
-
- operationId: WorkflowExecutionController.GetAll
- responses:
- "200":
- description: '{workflow} models.workflow'
- /workflow_execution/{id}:
- get:
- tags:
- - workflow_execution
- description: |-
- find workflow by workflowid
-
- operationId: WorkflowExecutionController.Get
- parameters:
- - in: path
- name: id
- description: the workflowid you want to get
- required: true
- type: string
- responses:
- "200":
- description: '{workflow} models.workflow'
- /workflow_execution/search/{start_date}/{end_date}:
- get:
- tags:
- - workflow_execution
- description: |-
- search workspace
-
- operationId: WorkflowExecutionController.Search
- parameters:
- - in: path
- name: start_date
- description: the word search you want to get
- required: true
- type: string
- - in: path
- name: end_date
- description: the word search you want to get
- required: true
- type: string
- responses:
- "200":
- description: '{workspace} models.workspace'
tags:
-- name: workflow_execution
+- name: oc-scheduler/controllersWorkflowExecutionController
description: |
Operations about workflow
- name: version