Skip to content

Commit

Permalink
Refactor and test Get and Create
Browse files Browse the repository at this point in the history
  • Loading branch information
@glrf
glrf committed Jan 4, 2022
1 parent 2348994 commit b55ca40
Show file tree
Hide file tree
Showing 7 changed files with 356 additions and 27 deletions.
127 changes: 127 additions & 0 deletions apiserver/organization/mock/namespace.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 19 additions & 6 deletions apiserver/organization/namespace.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,25 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
)

// namespaceProvider is an abstraction for interacting with the Kubernetes API
//go:generate mockgen -source=$GOFILE -destination=./mock/$GOFILE
type namespaceProvider interface {
GetNamespace(ctx context.Context, name string, options *metav1.GetOptions) (*corev1.Namespace, error)
DeleteNamespace(ctx context.Context, name string, options *metav1.DeleteOptions) (*corev1.Namespace, error)
CreateNamespace(ctx context.Context, ns *corev1.Namespace, options *metav1.CreateOptions) error
UpdateNamespace(ctx context.Context, ns *corev1.Namespace, options *metav1.UpdateOptions) error
ListNamespaces(ctx context.Context, options *metainternalversion.ListOptions) (*corev1.NamespaceList, error)
WatchNamespaces(ctx context.Context, options *metainternalversion.ListOptions) (watch.Interface, error)
}

type loopbackNamespaceProvider struct {
initOnce sync.Once
client client.WithWatch
}

func (p *loopbackNamespaceProvider) init() error {
// The LoopbackMasterClientConfig is initialized lazily by the runtime
// We initialize the client once from which ever method is called first
var err error
p.initOnce.Do(func() {
if p.client == nil {
Expand All @@ -28,7 +41,7 @@ func (p *loopbackNamespaceProvider) init() error {
return err
}

func (p *loopbackNamespaceProvider) getNamespace(ctx context.Context, name string, options *metav1.GetOptions) (*corev1.Namespace, error) {
func (p *loopbackNamespaceProvider) GetNamespace(ctx context.Context, name string, options *metav1.GetOptions) (*corev1.Namespace, error) {
err := p.init()
if err != nil {
return nil, err
Expand All @@ -38,7 +51,7 @@ func (p *loopbackNamespaceProvider) getNamespace(ctx context.Context, name strin
return &ns, err
}

func (p *loopbackNamespaceProvider) deleteNamespace(ctx context.Context, name string, options *metav1.DeleteOptions) (*corev1.Namespace, error) {
func (p *loopbackNamespaceProvider) DeleteNamespace(ctx context.Context, name string, options *metav1.DeleteOptions) (*corev1.Namespace, error) {
err := p.init()
if err != nil {
return nil, err
Expand All @@ -51,7 +64,7 @@ func (p *loopbackNamespaceProvider) deleteNamespace(ctx context.Context, name st
return &ns, err
}

func (p *loopbackNamespaceProvider) createNamespace(ctx context.Context, ns *corev1.Namespace, options *metav1.CreateOptions) error {
func (p *loopbackNamespaceProvider) CreateNamespace(ctx context.Context, ns *corev1.Namespace, options *metav1.CreateOptions) error {
err := p.init()
if err != nil {
return err
Expand All @@ -61,7 +74,7 @@ func (p *loopbackNamespaceProvider) createNamespace(ctx context.Context, ns *cor
})
}

func (p *loopbackNamespaceProvider) updateNamespace(ctx context.Context, ns *corev1.Namespace, options *metav1.UpdateOptions) error {
func (p *loopbackNamespaceProvider) UpdateNamespace(ctx context.Context, ns *corev1.Namespace, options *metav1.UpdateOptions) error {
err := p.init()
if err != nil {
return err
Expand All @@ -71,7 +84,7 @@ func (p *loopbackNamespaceProvider) updateNamespace(ctx context.Context, ns *cor
})
}

func (p *loopbackNamespaceProvider) listNamespaces(ctx context.Context, options *metainternalversion.ListOptions) (*corev1.NamespaceList, error) {
func (p *loopbackNamespaceProvider) ListNamespaces(ctx context.Context, options *metainternalversion.ListOptions) (*corev1.NamespaceList, error) {
err := p.init()
if err != nil {
return nil, err
Expand All @@ -89,7 +102,7 @@ func (p *loopbackNamespaceProvider) listNamespaces(ctx context.Context, options
return &nl, nil
}

func (p *loopbackNamespaceProvider) watchNamespaces(ctx context.Context, options *metainternalversion.ListOptions) (watch.Interface, error) {
func (p *loopbackNamespaceProvider) WatchNamespaces(ctx context.Context, options *metainternalversion.ListOptions) (watch.Interface, error) {
err := p.init()
if err != nil {
return nil, err
Expand Down
55 changes: 36 additions & 19 deletions apiserver/organization/organization.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@ package organization

import (
"context"
"errors"
"fmt"

orgv1 "github.com/appuio/control-api/apis/organization/v1"

corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/selection"
"k8s.io/apimachinery/pkg/watch"
genericregistry "k8s.io/apiserver/pkg/registry/generic"
Expand All @@ -30,14 +33,6 @@ func New() restbuilder.ResourceHandlerProvider {
type organizationStorage struct {
namepaces namespaceProvider
}
type namespaceProvider interface {
getNamespace(ctx context.Context, name string, options *metav1.GetOptions) (*corev1.Namespace, error)
deleteNamespace(ctx context.Context, name string, options *metav1.DeleteOptions) (*corev1.Namespace, error)
createNamespace(ctx context.Context, ns *corev1.Namespace, options *metav1.CreateOptions) error
updateNamespace(ctx context.Context, ns *corev1.Namespace, options *metav1.UpdateOptions) error
listNamespaces(ctx context.Context, options *metainternalversion.ListOptions) (*corev1.NamespaceList, error)
watchNamespaces(ctx context.Context, options *metainternalversion.ListOptions) (watch.Interface, error)
}

func (s organizationStorage) New() runtime.Object {
return &orgv1.Organization{}
Expand All @@ -52,13 +47,17 @@ func (s *organizationStorage) NamespaceScoped() bool {
var _ rest.Getter = &organizationStorage{}

func (s *organizationStorage) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
ns, err := s.namepaces.getNamespace(ctx, name, options)
org := &orgv1.Organization{}
ns, err := s.namepaces.GetNamespace(ctx, name, options)
if err != nil {
return nil, err
return nil, convertNamespaceError(err)
}

// TODO(glrf) Check that this is actually an organization and not a random namespace
return orgv1.NewOrganizationFromNS(ns), nil
org = orgv1.NewOrganizationFromNS(ns)
if org == nil {
// This namespace is not an organization
return nil, apierrors.NewNotFound(org.GetGroupVersionResource().GroupResource(), name)
}
return org, nil
}

var _ rest.Creater = &organizationStorage{}
Expand All @@ -74,8 +73,8 @@ func (s *organizationStorage) Create(ctx context.Context, obj runtime.Object, cr
return nil, err
}

if err := s.namepaces.createNamespace(ctx, org.ToNamespace(), options); err != nil {
return nil, err
if err := s.namepaces.CreateNamespace(ctx, org.ToNamespace(), options); err != nil {
return nil, convertNamespaceError(err)
}
return org, nil
}
Expand All @@ -92,7 +91,7 @@ func (s *organizationStorage) List(ctx context.Context, options *metainternalver
return nil, err
}
options.LabelSelector = options.LabelSelector.Add(*orgNamspace)
namespaces, err := s.namepaces.listNamespaces(ctx, options)
namespaces, err := s.namepaces.ListNamespaces(ctx, options)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -141,7 +140,7 @@ func (s *organizationStorage) Update(ctx context.Context, name string, objInfo r
}
}

return newOrg, false, s.namepaces.updateNamespace(ctx, newOrg.ToNamespace(), options)
return newOrg, false, s.namepaces.UpdateNamespace(ctx, newOrg.ToNamespace(), options)
}

var _ rest.GracefulDeleter = &organizationStorage{}
Expand All @@ -159,7 +158,7 @@ func (s *organizationStorage) Delete(ctx context.Context, name string, deleteVal
}
}

ns, err := s.namepaces.deleteNamespace(ctx, name, options)
ns, err := s.namepaces.DeleteNamespace(ctx, name, options)
return orgv1.NewOrganizationFromNS(ns), false, err
}

Expand All @@ -172,7 +171,7 @@ func (s *organizationStorage) Watch(ctx context.Context, options *metainternalve
}
options.LabelSelector = options.LabelSelector.Add(*orgNamspace)

nsWatcher, err := s.namepaces.watchNamespaces(ctx, options)
nsWatcher, err := s.namepaces.WatchNamespaces(ctx, options)
if err != nil {
return nil, err
}
Expand All @@ -194,3 +193,21 @@ func (s *organizationStorage) Watch(ctx context.Context, options *metainternalve
return in, true
}), nil
}

func convertNamespaceError(err error) error {
groupResource := schema.GroupResource{
Group: orgv1.GroupVersion.Group,
Resource: "organizations",
}
statusErr := &apierrors.StatusError{}

if errors.As(err, &statusErr) {
switch {
case apierrors.IsNotFound(err):
return apierrors.NewNotFound(groupResource, statusErr.ErrStatus.Details.Name)
case apierrors.IsAlreadyExists(err):
return apierrors.NewAlreadyExists(groupResource, statusErr.ErrStatus.Details.Name)
}
}
return err
}
Loading

0 comments on commit b55ca40

Please sign in to comment.