tests(certs): add tests to cert cmds (#209)

Author: Joshua-Anderson

cmd/certs.go

@@ -4,19 +4,21 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"os"
 	"strings"
 	"time"
 
 	"github.com/olekukonko/tablewriter"
 
 	"github.com/deis/controller-sdk-go"
 	"github.com/deis/controller-sdk-go/certs"
+	dtime "github.com/deis/controller-sdk-go/pkg/time"
 	"github.com/deis/workflow-cli/settings"
 )
 
+const dateFormat = "2 Jan 2006"
+
 // CertsList lists certs registered with the controller.
-func (d DeisCmd) CertsList(results int) error {
+func (d DeisCmd) CertsList(results int, now time.Time) error {
 	s, err := settings.Load(d.ConfigFile)
 
 	if err != nil {
@@ -37,57 +39,57 @@ func (d DeisCmd) CertsList(results int) error {
 		return nil
 	}
 
-	table := tablewriter.NewWriter(os.Stdout)
+	table := tablewriter.NewWriter(d.WOut)
 	table.SetAlignment(tablewriter.ALIGN_LEFT)
 	table.SetBorder(false)
 	table.SetAutoFormatHeaders(false)
 	table.SetHeaderLine(true)
 	table.SetHeader([]string{"Name", "Common Name", "SubjectAltName", "Expires", "Fingerprint", "Domains", "Updated", "Created"})
 	for _, cert := range certList {
-		domains := strings.Join(cert.Domains[:], ",")
-		san := strings.Join(cert.SubjectAltName[:], ",")
-
-		// Make dates more readable
-		now := time.Now()
-		expires := cert.Expires.Time.Format("2 Jan 2006")
-		created := cert.Created.Time.Format("2 Jan 2006")
-		updated := cert.Updated.Time.Format("2 Jan 2006")
-
-		if cert.Expires.Time.Before(now) {
-			expires += " (expired)"
-		} else {
-			// Ghetto solution
-			expires += " (in"
-			year := cert.Expires.Time.Year() - now.Year()
-			month := cert.Expires.Time.Month() - now.Month()
-			day := cert.Expires.Time.Day() - now.Day()
-
-			if year > 0 {
-				expires += fmt.Sprintf(" %d year", year)
-				if year > 1 {
-					expires += "s"
-				}
-			} else if month > 0 {
-				expires += fmt.Sprintf(" %d month", month)
-				if month > 1 {
-					expires += "s"
-				}
-			} else if day != 0 {
-				// special handling on negative days
-				if day < 0 {
-					day *= -1
-				}
-
-				expires += fmt.Sprintf(" %d day", day)
-				if day > 1 {
-					expires += "s"
+		domains := strings.Join(cert.Domains, ",")
+		san := strings.Join(cert.SubjectAltName, ",")
+
+		expires := "unknown"
+		if cert.Expires.Time != nil {
+			expires = cert.Expires.Format(dateFormat)
+
+			if cert.Expires.Time.Before(now) {
+				expires += " (expired)"
+			} else {
+				// Ghetto solution
+				expires += " (in"
+				year := cert.Expires.Time.Year() - now.Year()
+				month := cert.Expires.Time.Month() - now.Month()
+				day := cert.Expires.Time.Day() - now.Day()
+
+				if year > 0 {
+					expires += fmt.Sprintf(" %d year", year)
+					if year > 1 {
+						expires += "s"
+					}
+				} else if month > 0 {
+					expires += fmt.Sprintf(" %d month", month)
+					if month > 1 {
+						expires += "s"
+					}
+				} else if day != 0 {
+					expires += fmt.Sprintf(" %d day", day)
+					if day > 1 {
+						expires += "s"
+					}
 				}
+				expires += ")"
 			}
-			expires += ")"
 		}
 
+		created := safeGetTime(cert.Created)
+		updated := safeGetTime(cert.Updated)
+
 		// show a shorter version of the fingerprint
-		fingerprint := cert.Fingerprint[:5] + "[...]" + cert.Fingerprint[len(cert.Fingerprint)-5:]
+		fingerprint := cert.Fingerprint
+		if len(cert.Fingerprint) > 4 {
+			fingerprint = cert.Fingerprint[:5] + "[...]" + cert.Fingerprint[len(cert.Fingerprint)-5:]
+		}
 
 		table.Append([]string{cert.Name, cert.CommonName, san, expires, fingerprint, domains, updated, created})
 	}
@@ -176,19 +178,24 @@ func (d DeisCmd) CertInfo(name string) error {
 		san = "N/A"
 	}
 
+	expires := safeGetTime(cert.Expires)
+	starts := safeGetTime(cert.Starts)
+	created := safeGetTime(cert.Created)
+	updated := safeGetTime(cert.Updated)
+
 	d.Printf("=== %s Certificate\n", cert.Name)
 	d.Println("Common Name(s):    ", cert.CommonName)
-	d.Println("Expires At:        ", cert.Expires)
-	d.Println("Starts At:         ", cert.Starts)
+	d.Println("Expires At:        ", expires)
+	d.Println("Starts At:         ", starts)
 	d.Println("Fingerprint:       ", cert.Fingerprint)
 	d.Println("Subject Alt Name:  ", san)
 	d.Println("Issuer:            ", cert.Issuer)
 	d.Println("Subject:           ", cert.Subject)
 	d.Println()
 	d.Println("Connected Domains: ", domains)
 	d.Println("Owner:             ", cert.Owner)
-	d.Println("Created:           ", cert.Created)
-	d.Println("Updated:           ", cert.Updated)
+	d.Println("Created:           ", created)
+	d.Println("Updated:           ", updated)
 
 	return nil
 }
@@ -235,3 +242,12 @@ func (d DeisCmd) CertDetach(name, domain string) error {
 	d.Println("done")
 	return nil
 }
+
+func safeGetTime(t dtime.Time) string {
+	out := "unknown"
+	if t.Time != nil {
+		out = t.Format(dateFormat)
+	}
+
+	return out
+}