ref(pkg/time): move pkg/time to sdk to avoid depending on the heavy deis/pkg repo (#8)

Author: Joshua-Anderson

Makefile

@@ -10,7 +10,7 @@ DEV_ENV_PREFIX_CGO_ENABLED := docker run --rm -e GO15VENDOREXPERIMENT=1 -e CGO_E
 DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
 
 GO_FILES = $(wildcard *.go)
-GO_PACKAGES = api apps auth builds certs config domains keys perms ps releases users
+GO_PACKAGES = api apps auth builds certs config domains keys perms ps releases users pkg/time
 GO_PACKAGES_REPO_PATH = $(addprefix $(repo_path)/,$(GO_PACKAGES))
 GOFMT = gofmt -e -l -s
 GOTEST = go test --cover --race -v

api/certs.go

@@ -1,6 +1,6 @@
 package api
 
-import "github.com/deis/pkg/time"
+import "github.com/deis/controller-sdk-go/pkg/time"
 
 // Cert is the definition of the cert object.
 // Some fields are omtempty because they are only

api/ps.go

@@ -1,6 +1,6 @@
 package api
 
-import "github.com/deis/pkg/time"
+import "github.com/deis/controller-sdk-go/pkg/time"
 
 // Pods defines the structure of a process.
 type Pods struct {

certs/certs_test.go

@@ -10,7 +10,7 @@ import (
 
 	client "github.com/deis/controller-sdk-go"
 	"github.com/deis/controller-sdk-go/api"
-	"github.com/deis/pkg/time"
+	"github.com/deis/controller-sdk-go/pkg/time"
 )
 
 const certsFixture string = `

glide.lock

@@ -1,6 +1,3 @@
 package: github.com/deis/controller-sdk-go
 import:
-- package: github.com/deis/pkg
-  subpackages:
-  - time
 - package: github.com/goware/urlx

glide.yaml

@@ -0,0 +1,54 @@
+package time
+
+import "time"
+
+// DeisDatetimeFormat is the standard date/time representation used in Deis.
+const DeisDatetimeFormat = "2006-01-02T15:04:05MST"
+
+// Different format to deal with the pyopenssl formatting
+// http://www.pyopenssl.org/en/stable/api/crypto.html#OpenSSL.crypto.X509.get_notAfter
+const PyOpenSSLTimeDateTimeFormat = "2006-01-02T15:04:05"
+
+// Time represents the standard datetime format used across the Deis Platform.
+type Time struct {
+	*time.Time
+}
+
+func (t *Time) format() string {
+	return t.Format(DeisDatetimeFormat)
+}
+
+// MarshalJSON implements the json.Marshaler interface.
+// The time is a quoted string in Deis' datetime format.
+func (t *Time) MarshalJSON() ([]byte, error) {
+	return []byte(t.Format(`"` + DeisDatetimeFormat + `"`)), nil
+}
+
+// UnmarshalText implements the encoding.TextUnmarshaler interface.
+// The time is expected to be in Deis' datetime format.
+func (t *Time) UnmarshalText(data []byte) error {
+	tt, err := time.Parse(time.RFC3339, string(data))
+	if _, ok := err.(*time.ParseError); ok {
+		tt, err = time.Parse(DeisDatetimeFormat, string(data))
+		if _, ok := err.(*time.ParseError); ok {
+			tt, err = time.Parse(PyOpenSSLTimeDateTimeFormat, string(data))
+		}
+	}
+	*t = Time{&tt}
+	return err
+}
+
+// UnmarshalJSON implements the json.Unmarshaler interface.
+// The time is expected to be a quoted string in Deis' datetime format.
+func (t *Time) UnmarshalJSON(data []byte) error {
+	// Fractional seconds are handled implicitly by Parse.
+	tt, err := time.Parse(`"`+time.RFC3339+`"`, string(data))
+	if _, ok := err.(*time.ParseError); ok {
+		tt, err = time.Parse(`"`+DeisDatetimeFormat+`"`, string(data))
+		if _, ok := err.(*time.ParseError); ok {
+			tt, err = time.Parse(`"`+PyOpenSSLTimeDateTimeFormat+`"`, string(data))
+		}
+	}
+	*t = Time{&tt}
+	return err
+}

pkg/time/time.go

@@ -0,0 +1,45 @@
+package time
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestUnMarshalText(t *testing.T) {
+	dummyTime := Time{}
+
+	standardTimeFormats := []string{
+		"2006-01-02T15:04:05MST",
+		"2006-01-02T15:04:05UTC",
+		"2006-01-02T15:04:05PST",
+		"2006-01-02T15:04:05Z",
+	}
+	for _, goodTime := range standardTimeFormats {
+		if dummyTime.UnmarshalText([]byte(goodTime)) != nil {
+			t.Error("expected " + goodTime + " to be marshal-able.")
+		}
+		if dummyTime.Year() != 2006 {
+			t.Error(fmt.Sprintf("expected year to be 2006; got %d.", dummyTime.Year()))
+		}
+	}
+
+	alternateTimeFormats := []string{
+		"2007-01-02T15:04:05",
+		"2007-01-02T15:04:05",
+		"2007-01-02T15:04:05",
+	}
+
+	for _, goodTime := range alternateTimeFormats {
+		if dummyTime.UnmarshalText([]byte(goodTime)) != nil {
+			t.Error("expected " + goodTime + " to be marshal-able.")
+		}
+		if dummyTime.Year() != 2007 {
+			t.Error(fmt.Sprintf("expected year to be 2007; got %d.", dummyTime.Year()))
+		}
+	}
+
+	badTime := "this is a bad time, isn't it?"
+	if dummyTime.UnmarshalText([]byte(badTime)) == nil {
+		t.Error("expected " + badTime + "to be unmarshal-able.")
+	}
+}

pkg/time/time_test.go

@@ -10,7 +10,7 @@ import (
 
 	client "github.com/deis/controller-sdk-go"
 	"github.com/deis/controller-sdk-go/api"
-	"github.com/deis/pkg/time"
+	"github.com/deis/controller-sdk-go/pkg/time"
 )
 
 const processesFixture string = `