Cluster edit(patch) and delete

Makefile

@@ -52,5 +52,6 @@ ifndef HAS_GLIDE
 	brew install glide
 endif
 ifndef HAS_SWAGGER
+        brew tap go-swagger/go-swagger
 	brew install go-swagger
 endif

pkg/api/handlers/show_cluster.go

@@ -20,7 +20,7 @@ type showCluster struct {
 
 func (d *showCluster) Handle(params operations.ShowClusterParams, principal *models.Principal) middleware.Responder {
 	var tprCluster tprv1.Kluster
-	if err := d.rt.Clients.TPRClient().Get().Namespace("kubernikus").Resource(tprv1.KlusterResourcePlural).LabelsSelectorParam(accountSelector(principal)).Name(params.Name).Do().Into(&tprCluster); err != nil {
+	if err := d.rt.Clients.TPRClient().Get().Namespace("kubernikus").Resource(tprv1.KlusterResourcePlural).LabelsSelectorParam(accountSelector(principal)).Name(qualifiedName(params.Name,principal.Account)).Do().Into(&tprCluster); err != nil {
 		if apierrors.IsNotFound(err) {
 			return operations.NewShowClusterDefault(404).WithPayload(modelsError(err))
 		}

pkg/api/handlers/terminate_cluster.go

@@ -0,0 +1,34 @@
+package handlers
+
+import (
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/sapcc/kubernikus/pkg/api"
+	"github.com/sapcc/kubernikus/pkg/api/models"
+	"github.com/sapcc/kubernikus/pkg/api/rest/operations"
+
+	tprv1 "github.com/sapcc/kubernikus/pkg/tpr/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+)
+
+func NewTerminateCluster(rt *api.Runtime) operations.TerminateClusterHandler {
+	return &terminateCluster{rt: rt}
+}
+
+type terminateCluster struct {
+	rt *api.Runtime
+}
+
+func (d *terminateCluster) Handle(params operations.TerminateClusterParams, principal *models.Principal) middleware.Responder {
+
+	_,err := editCluster(d.rt.Clients.TPRClient(),principal,params.Name,func(kluster *tprv1.Kluster){
+		kluster.Status.State = tprv1.KlusterTerminating
+		kluster.Status.Message = "Cluster terminating"
+	})
+	if err != nil {
+		if apierrors.IsNotFound(err) {
+			return operations.NewTerminateClusterDefault(404).WithPayload(modelsError(err))
+		}
+		return operations.NewTerminateClusterDefault(0).WithPayload(modelsError(err))
+	}
+	return operations.NewTerminateClusterOK()
+}

pkg/api/handlers/update_cluster.go

@@ -0,0 +1,33 @@
+package handlers
+
+import (
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/sapcc/kubernikus/pkg/api"
+	"github.com/sapcc/kubernikus/pkg/api/models"
+	"github.com/sapcc/kubernikus/pkg/api/rest/operations"
+
+	tprv1 "github.com/sapcc/kubernikus/pkg/tpr/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+)
+
+func NewUpdateCluster(rt *api.Runtime) operations.UpdateClusterHandler {
+	return &updateCluster{rt: rt}
+}
+
+type updateCluster struct {
+	rt *api.Runtime
+}
+
+func (d *updateCluster) Handle(params operations.UpdateClusterParams, principal *models.Principal) middleware.Responder {
+
+	_, err := editCluster(d.rt.Clients.TPRClient(), principal, params.Name, func(kluster *tprv1.Kluster) {
+		//TODO: currently no field to update
+	})
+	if err != nil {
+		if apierrors.IsNotFound(err) {
+			return operations.NewUpdateClusterDefault(404).WithPayload(modelsError(err))
+		}
+		return operations.NewUpdateClusterDefault(0).WithPayload(modelsError(err))
+	}
+	return operations.NewUpdateClusterOK()
+}

pkg/api/handlers/util.go

@@ -4,6 +4,11 @@ import (
 	"github.com/go-openapi/swag"
 	"github.com/sapcc/kubernikus/pkg/api/models"
 	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/client-go/rest"
+
+	"fmt"
+	tprv1 "github.com/sapcc/kubernikus/pkg/tpr/v1"
+	"strings"
 )
 
 func modelsError(err error) *models.Error {
@@ -15,3 +20,26 @@ func modelsError(err error) *models.Error {
 func accountSelector(principal *models.Principal) labels.Selector {
 	return labels.SelectorFromSet(map[string]string{"account": principal.Account})
 }
+
+// qualifiedName returns <cluster_name>-<account_id>
+func qualifiedName(name string, accountId string) string {
+	if strings.Contains(name, accountId) {
+		return name
+	}
+	return fmt.Sprintf("%s-%s", name, accountId)
+}
+
+func editCluster(tprClient *rest.RESTClient, principal *models.Principal, name string, updateFunc func(k *tprv1.Kluster)) (*tprv1.Kluster, error) {
+	var kluster, updatedCluster tprv1.Kluster
+	if err := tprClient.Get().Namespace("kubernikus").Resource(tprv1.KlusterResourcePlural).LabelsSelectorParam(accountSelector(principal)).Name(qualifiedName(name, principal.Account)).Do().Into(&kluster); err != nil {
+		return nil, err
+	}
+
+	updateFunc(&kluster)
+
+	if err := tprClient.Put().Body(&kluster).Namespace("kubernikus").Resource(tprv1.KlusterResourcePlural).LabelsSelectorParam(accountSelector(principal)).Name(qualifiedName(name, principal.Account)).Do().Into(&updatedCluster); err != nil {
+		return nil, err
+	}
+	return &updatedCluster, nil
+
+}

pkg/api/rest/configure_kubernikus.go

@@ -52,6 +52,8 @@ func configureAPI(api *operations.KubernikusAPI) http.Handler {
 	api.ListClustersHandler = handlers.NewListClusters(rt)
 	api.CreateClusterHandler = handlers.NewCreateCluster(rt)
 	api.ShowClusterHandler = handlers.NewShowCluster(rt)
+	api.TerminateClusterHandler = handlers.NewTerminateCluster(rt)
+	api.UpdateClusterHandler = handlers.NewUpdateCluster(rt)
 
 	api.ServerShutdown = func() {}