rancher/norman
1
0
Fork 0
mirror of https://github.com/rancher/norman.git synced 2025-09-25 06:26:50 +00:00
Code Issues Releases Wiki Activity

Many enhancements

Browse Source
This commit is contained in:
Darren Shepherd
2017-12-11 20:58:43 -07:00
parent eef2c6ee6e
commit 406c0d9999
12 changed files with 63 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/handler/create.go
View File

@@ -9,7 +9,7 @@ import (
func CreateHandler(apiContext *types.APIContext) error {
var err error
data, err := ParseAndValidateBody(apiContext)
data, err := ParseAndValidateBody(apiContext, true)
if err != nil {
return err
}

2
api/handler/update.go
View File

@@ -7,7 +7,7 @@ import (
)
func UpdateHandler(apiContext *types.APIContext) error {
data, err := ParseAndValidateBody(apiContext)
data, err := ParseAndValidateBody(apiContext, false)
if err != nil {
return err
}

8
api/handler/validate.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/rancher/norman/types"
)
func ParseAndValidateBody(apiContext *types.APIContext) (map[string]interface{}, error) {
func ParseAndValidateBody(apiContext *types.APIContext, create bool) (map[string]interface{}, error) {
data, err := parse.Body(apiContext.Request)
if err != nil {
return nil, err
@@ -14,7 +14,11 @@ func ParseAndValidateBody(apiContext *types.APIContext) (map[string]interface{},
b := builder.NewBuilder(apiContext)
data, err = b.Construct(apiContext.Schema, data, builder.Create)
op := builder.Create
if !create {
op = builder.Update
}
data, err = b.Construct(apiContext.Schema, data, op)
if err != nil {
return nil, err
}