Skip to content

Commit

Permalink
error on storage client if name is not set
Browse files Browse the repository at this point in the history
Signed-off-by: Scott Weiss <sdw35@cornell.edu>
  • Loading branch information
ilackarms authored and yuval-k committed Jun 7, 2018
1 parent 4fdc578 commit 4c951ad
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
6 changes: 6 additions & 0 deletions pkg/storage/consul/client_template.go.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ type {{ .LowercasePluralName }}Client struct {
}

func (c *{{ .LowercasePluralName }}Client) Create(item *v1.{{ .UppercaseName }}) (*v1.{{ .UppercaseName }}, error) {
if item.Name == "" {
return nil, errors.Errorf("name required")
}
out, err := c.base.Create(&base.StorableItem{{"{"}}{{ .UppercaseName }}: item})
if err != nil {
return nil, err
Expand All @@ -19,6 +22,9 @@ func (c *{{ .LowercasePluralName }}Client) Create(item *v1.{{ .UppercaseName }})
}

func (c *{{ .LowercasePluralName }}Client) Update(item *v1.{{ .UppercaseName }}) (*v1.{{ .UppercaseName }}, error) {
if item.Name == "" {
return nil, errors.Errorf("name required")
}
out, err := c.base.Update(&base.StorableItem{{"{"}}{{ .UppercaseName }}: item})
if err != nil {
return nil, err
Expand Down
6 changes: 6 additions & 0 deletions pkg/storage/file/client_template.go.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ type {{ .LowercasePluralName }}Client struct {
}

func (c *{{ .LowercasePluralName }}Client) Create(item *v1.{{ .UppercaseName }}) (*v1.{{ .UppercaseName }}, error) {
if item.Name == "" {
return nil, errors.Errorf("name required")
}
// set resourceversion on clone
{{ .LowercaseName }}Clone, ok := proto.Clone(item).(*v1.{{ .UppercaseName }})
if !ok {
Expand Down Expand Up @@ -53,6 +56,9 @@ func (c *{{ .LowercasePluralName }}Client) Create(item *v1.{{ .UppercaseName }})
}

func (c *{{ .LowercasePluralName }}Client) Update(item *v1.{{ .UppercaseName }}) (*v1.{{ .UppercaseName }}, error) {
if item.Name == "" {
return nil, errors.Errorf("name required")
}
if item.Metadata == nil || item.Metadata.ResourceVersion == "" {
return nil, errors.New("resource version must be set for update operations")
}
Expand Down

0 comments on commit 4c951ad

Please sign in to comment.