Fixed swagger doc

containerum · Aug 3, 2018 · bda3e93 · bda3e93
1 parent 4683ad8
commit bda3e93
Show file tree

Hide file tree

Showing 5 changed files with 212 additions and 204 deletions.
diff --git a/cmd/kube-api/main.go b/cmd/kube-api/main.go
@@ -7,10 +7,10 @@ import (
 	"github.com/urfave/cli"
 )
 
-//go:generate protoc --go_out=../../proto -I../../proto exec.proto
 //go:generate swagger generate spec -m -i ../../swagger-basic.yml -o ../../swagger.json
 //go:generate swagger flatten ../../swagger.json -o ../../swagger.json
 //go:generate swagger validate ../../swagger.json
+//go:generate protoc --go_out=../../proto -I../../proto exec.proto
 
 func main() {
 	app := cli.NewApp()

diff --git a/pkg/router/handlers/secret.go b/pkg/router/handlers/secret.go
@@ -101,7 +101,7 @@ func GetSecretList(ctx *gin.Context) {
 //  '200':
 //    description: secret
 //    schema:
-//      $ref: '#/definitions/SecretWithParam'
+//      $ref: '#/definitions/Secret'
 //  default:
 //    $ref: '#/responses/error'
 func GetSecret(ctx *gin.Context) {
@@ -153,12 +153,12 @@ func GetSecret(ctx *gin.Context) {
 //  - name: body
 //    in: body
 //    schema:
-//      $ref: '#/definitions/SecretWithParam'
+//      $ref: '#/definitions/Secret'
 // responses:
 //  '201':
 //    description: secret created
 //    schema:
-//      $ref: '#/definitions/SecretWithParam'
+//      $ref: '#/definitions/Secret'
 //  default:
 //    $ref: '#/responses/error'
 func CreateTLSSecret(ctx *gin.Context) {
@@ -219,12 +219,12 @@ func CreateTLSSecret(ctx *gin.Context) {
 //  - name: body
 //    in: body
 //    schema:
-//      $ref: '#/definitions/SecretWithParam'
+//      $ref: '#/definitions/Secret'
 // responses:
 //  '201':
 //    description: secret created
 //    schema:
-//      $ref: '#/definitions/SecretWithParam'
+//      $ref: '#/definitions/Secret'
 //  default:
 //    $ref: '#/responses/error'
 func CreateDockerSecret(ctx *gin.Context) {
@@ -293,12 +293,12 @@ func CreateDockerSecret(ctx *gin.Context) {
 //  - name: body
 //    in: body
 //    schema:
-//      $ref: '#/definitions/SecretWithParam'
+//      $ref: '#/definitions/Secret'
 // responses:
 //  '202':
 //    description: secret updated
 //    schema:
-//      $ref: '#/definitions/SecretWithParam'
+//      $ref: '#/definitions/Secret'
 //  default:
 //    $ref: '#/responses/error'
 func UpdateSecret(ctx *gin.Context) {

diff --git a/static/ab0x.go b/static/ab0x.go
diff --git a/static/b0x.yaml b/static/b0x.yaml
@@ -87,9 +87,6 @@ debug: false
 custom:
   # type: array of strings
   - files:
-    - "../vendor/github.com/containerum/kube-client/swagger.json"
-    - "../vendor/github.com/containerum/utils/httputil/swagger.json"
-    - "../vendor/github.com/containerum/cherry/swagger.json"
     - "../swagger.json"
     # base is the path that will be removed from all files' path
     # type: string