Fix unmarshalling of OriginCACertificate (#387)

* Fix unmarshalling of OriginCACertificate

* Linter and test fixes

* Use aliasing to override just a single field for unmarshalling

Author: player-two

origin_ca.go

@@ -22,6 +22,38 @@ type OriginCACertificate struct {
 	CSR             string    `json:"csr"`
 }
 
+// UnmarshalJSON handles custom parsing from an API response to an OriginCACertificate
+// http://choly.ca/post/go-json-marshalling/
+func (c *OriginCACertificate) UnmarshalJSON(data []byte) error {
+	type alias OriginCACertificate
+
+	aux := &struct {
+		ExpiresOn string `json:"expires_on"`
+		*alias
+	}{
+		alias: (*alias)(c),
+	}
+
+	var err error
+
+	if err = json.Unmarshal(data, &aux); err != nil {
+		return err
+	}
+
+	// This format comes from time.Time.String() source
+	c.ExpiresOn, err = time.Parse("2006-01-02 15:04:05.999999999 -0700 MST", aux.ExpiresOn)
+
+	if err != nil {
+		c.ExpiresOn, err = time.Parse(time.RFC3339, aux.ExpiresOn)
+	}
+
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // OriginCACertificateListOptions represents the parameters used to list Cloudflare-issued certificates.
 type OriginCACertificateListOptions struct {
 	ZoneID string

origin_ca_test.go

@@ -1,6 +1,7 @@
 package cloudflare
 
 import (
+	"encoding/json"
 	"fmt"
 	"net/http"
 	"testing"
@@ -9,6 +10,40 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+var (
+	payloadTemplate = `{"expires_on":"%s"}`
+	unmarshalTime   = time.Now().UTC().Round(time.Second)
+)
+
+func TestOriginCA_UnmarshalRFC3339(t *testing.T) {
+	payload := fmt.Sprintf(payloadTemplate, unmarshalTime.Format(time.RFC3339))
+
+	var cert OriginCACertificate
+	err := json.Unmarshal([]byte(payload), &cert)
+	if assert.NoError(t, err) {
+		assert.Equal(t, unmarshalTime, cert.ExpiresOn)
+	}
+}
+
+func TestOriginCA_UnmarshalString(t *testing.T) {
+	payload := fmt.Sprintf(payloadTemplate, unmarshalTime.String())
+
+	var cert OriginCACertificate
+	err := json.Unmarshal([]byte(payload), &cert)
+	if assert.NoError(t, err) {
+		assert.Equal(t, unmarshalTime, cert.ExpiresOn)
+	}
+}
+
+func TestOriginCA_UnmarshalOther(t *testing.T) {
+	payload := fmt.Sprintf(payloadTemplate, unmarshalTime.Format(time.RFC1123))
+
+	var cert OriginCACertificate
+	err := json.Unmarshal([]byte(payload), &cert)
+	assert.Error(t, err)
+	assert.Equal(t, OriginCACertificate{}, cert)
+}
+
 func TestOriginCA_CreateOriginCertificate(t *testing.T) {
 	setup()
 	defer teardown()