Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Storage change #106

Merged
merged 1 commit into from
Jun 7, 2018
Merged

Storage change #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/storage/consul/client_template.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package consul

import (
"github.com/pkg/errors"

"github.com/solo-io/gloo/pkg/api/types/v1"
"github.com/solo-io/gloo/pkg/storage"
"github.com/solo-io/gloo/pkg/storage/base"
Expand Down
8 changes: 8 additions & 0 deletions pkg/storage/consul/roles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package consul

import (
"github.com/pkg/errors"

"github.com/solo-io/gloo/pkg/api/types/v1"
"github.com/solo-io/gloo/pkg/storage"
"github.com/solo-io/gloo/pkg/storage/base"
Expand All @@ -11,6 +13,9 @@ type rolesClient struct {
}

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

func (c *rolesClient) Update(item *v1.Role) (*v1.Role, error) {
if item.Name == "" {
return nil, errors.Errorf("name required")
}
out, err := c.base.Update(&base.StorableItem{Role: item})
if err != nil {
return nil, err
Expand Down
8 changes: 8 additions & 0 deletions pkg/storage/consul/upstreams.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package consul

import (
"github.com/pkg/errors"

"github.com/solo-io/gloo/pkg/api/types/v1"
"github.com/solo-io/gloo/pkg/storage"
"github.com/solo-io/gloo/pkg/storage/base"
Expand All @@ -11,6 +13,9 @@ type upstreamsClient struct {
}

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

func (c *upstreamsClient) Update(item *v1.Upstream) (*v1.Upstream, error) {
if item.Name == "" {
return nil, errors.Errorf("name required")
}
out, err := c.base.Update(&base.StorableItem{Upstream: item})
if err != nil {
return nil, err
Expand Down
8 changes: 8 additions & 0 deletions pkg/storage/consul/virtual_services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package consul

import (
"github.com/pkg/errors"

"github.com/solo-io/gloo/pkg/api/types/v1"
"github.com/solo-io/gloo/pkg/storage"
"github.com/solo-io/gloo/pkg/storage/base"
Expand All @@ -11,6 +13,9 @@ type virtualServicesClient struct {
}

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

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

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

func (c *rolesClient) Update(item *v1.Role) (*v1.Role, 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
6 changes: 6 additions & 0 deletions pkg/storage/file/upstreams.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ type upstreamsClient struct {
}

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

func (c *upstreamsClient) Update(item *v1.Upstream) (*v1.Upstream, 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
6 changes: 6 additions & 0 deletions pkg/storage/file/virtual_services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ type virtualServicesClient struct {
}

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

func (c *virtualServicesClient) Update(item *v1.VirtualService) (*v1.VirtualService, 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