Merge pull request #4104 from Joshua-Anderson/add-certs

feat(client-go): add certs endpoint

Author: Matthew Fisher

client-go/cmd/certs.go

@@ -0,0 +1,143 @@
+package cmd
+
+import (
+	"fmt"
+	"io/ioutil"
+	"strings"
+
+	"github.com/deis/deis/pkg/prettyprint"
+
+	"github.com/deis/deis/client-go/controller/client"
+	"github.com/deis/deis/client-go/controller/models/certs"
+)
+
+// CertsList lists certs registered with the controller.
+func CertsList() error {
+	c, err := client.New()
+
+	if err != nil {
+		return err
+	}
+
+	certList, err := certs.List(c)
+
+	if err != nil {
+		return err
+	}
+
+	if len(certList) == 0 {
+		fmt.Println("No certs")
+		return nil
+	}
+
+	certMap := make(map[string]string)
+	nameMax := 0
+	expiresMax := 0
+	for _, cert := range certList {
+		certMap[cert.Name] = cert.Expires
+
+		if len(cert.Name) > nameMax {
+			nameMax = len(cert.Name)
+		}
+		if len(cert.Expires) > nameMax {
+			expiresMax = len(cert.Expires)
+		}
+	}
+
+	nameHeader := "Common Name"
+	expiresHeader := "Expires"
+	tabSpaces := 5
+	bufferSpaces := tabSpaces
+
+	if nameMax < len(nameHeader) {
+		tabSpaces += len(nameHeader) - nameMax
+		nameMax = len(nameHeader)
+	} else {
+		bufferSpaces += nameMax - len(nameHeader)
+	}
+
+	if expiresMax < len(expiresHeader) {
+		expiresMax = len(expiresHeader)
+	}
+
+	fmt.Printf("%s%s%s\n", nameHeader, strings.Repeat(" ", bufferSpaces), expiresHeader)
+	fmt.Printf("%s%s%s\n", strings.Repeat("-", nameMax), strings.Repeat(" ", 5),
+		strings.Repeat("-", expiresMax))
+	fmt.Print(prettyprint.PrettyTabs(certMap, tabSpaces))
+	return nil
+}
+
+// CertAdd adds a cert to the controller.
+func CertAdd(cert, key, commonName, sans string) error {
+	c, err := client.New()
+
+	if err != nil {
+		return err
+	}
+
+	fmt.Print("Adding SSL endpoint... ")
+	quit := progress()
+	err = processCertsAdd(c, cert, key, commonName, sans)
+	quit <- true
+	<-quit
+
+	if err != nil {
+		return err
+	}
+
+	fmt.Println("done")
+	return nil
+}
+
+func processCertsAdd(c *client.Client, cert, key, commonName, sans string) error {
+	if sans != "" {
+		for _, san := range strings.Split(sans, ",") {
+			if err := doCertAdd(c, cert, key, san); err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+
+	return doCertAdd(c, cert, key, commonName)
+}
+
+func doCertAdd(c *client.Client, cert string, key string, commonName string) error {
+	certFile, err := ioutil.ReadFile(cert)
+
+	if err != nil {
+		return err
+	}
+
+	keyFile, err := ioutil.ReadFile(key)
+
+	if err != nil {
+		return err
+	}
+
+	_, err = certs.New(c, string(certFile), string(keyFile), commonName)
+	return err
+}
+
+// CertRemove deletes a cert from the controller.
+func CertRemove(commonName string) error {
+	c, err := client.New()
+
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf("Removing %s... ", commonName)
+	quit := progress()
+
+	certs.Delete(c, commonName)
+
+	quit <- true
+	<-quit
+
+	if err == nil {
+		fmt.Println("done")
+	}
+
+	return err
+}

client-go/controller/api/certs.go

@@ -0,0 +1,28 @@
+package api
+
+// Cert is the definition of the cert object.
+// Some fields are omtempty because they are only
+// returned when creating or getting a cert.
+type Cert struct {
+	Updated string `json:"updated,omitempty"`
+	Created string `json:"created,omitempty"`
+	Name    string `json:"common_name"`
+	Expires string `json:"expires"`
+	Owner   string `json:"owner,omitempty"`
+	ID      int    `json:"id,omitempty"`
+}
+
+// Certs is the definition of GET /v1/certs/.
+type Certs struct {
+	Count    int    `json:"count"`
+	Next     int    `json:"next"`
+	Previous int    `json:"previous"`
+	Certs    []Cert `json:"results"`
+}
+
+// CertCreateRequest is the definition of POST /v1/certs/.
+type CertCreateRequest struct {
+	Certificate string `json:"certificate"`
+	Key         string `json:"key"`
+	Name        string `json:"common_name,omitempty"`
+}

client-go/controller/models/certs/certs.go

@@ -0,0 +1,74 @@
+package certs
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+
+	"github.com/deis/deis/client-go/controller/api"
+	"github.com/deis/deis/client-go/controller/client"
+)
+
+// List certs registered with the controller.
+func List(c *client.Client) ([]api.Cert, error) {
+	body, status, err := c.BasicRequest("GET", "/v1/certs/", nil)
+
+	if err != nil {
+		return []api.Cert{}, err
+	}
+
+	if status != 200 {
+		return []api.Cert{}, errors.New(body)
+	}
+
+	res := api.Certs{}
+	if err = json.Unmarshal([]byte(body), &res); err != nil {
+		return []api.Cert{}, err
+	}
+
+	return res.Certs, nil
+}
+
+// New creates a new cert.
+func New(c *client.Client, cert string, key string, commonName string) (api.Cert, error) {
+	req := api.CertCreateRequest{Certificate: cert, Key: key, Name: commonName}
+	reqBody, err := json.Marshal(req)
+
+	if err != nil {
+		return api.Cert{}, err
+	}
+
+	resBody, status, err := c.BasicRequest("POST", "/v1/certs/", reqBody)
+
+	if err != nil {
+		return api.Cert{}, err
+	}
+
+	if status != 201 {
+		return api.Cert{}, errors.New(resBody)
+	}
+
+	resCert := api.Cert{}
+	if err = json.Unmarshal([]byte(resBody), &resCert); err != nil {
+		return api.Cert{}, err
+	}
+
+	return resCert, nil
+}
+
+// Delete removes a cert.
+func Delete(c *client.Client, commonName string) error {
+	u := fmt.Sprintf("/v1/certs/%s", commonName)
+
+	resBody, status, err := c.BasicRequest("DELETE", u, nil)
+
+	if err != nil {
+		return err
+	}
+
+	if status != 204 {
+		return errors.New(resBody)
+	}
+
+	return nil
+}