change all time fields to have type time.Time (#190)
* add Volume.Unmarshal
* add volumetenants.VolumeExt.Unmarshal
* create servers.Server time.Time fields
* json.Unmarshal can correctly handle time.RFC3339 (Server time fields)
* add v3 Token UnmarshalJSON method
* check for empty string when unmarshaling time
* add Member UnmarshalJSON
* v3 tokens.Token ExtractInto
* v3 trust.Trust UnmarshalJSON
* time.Time fields swift response objects
* time.Time fields for orchestration response objects
* time.Time fields for shared file systems response objects
* if we don't use pointers for the custom time fields, we don't need to check if they're nil
* style guide fixes: 'r' for receiver, 's' for struct
* remove unnecessary pointers from UnmarshalJSON methods
diff --git a/openstack/imageservice/v2/images/results.go b/openstack/imageservice/v2/images/results.go
index 653c68c..ae674de 100644
--- a/openstack/imageservice/v2/images/results.go
+++ b/openstack/imageservice/v2/images/results.go
@@ -66,10 +66,10 @@
Properties map[string]string `json:"properties"`
// CreatedAt is the date when the image has been created.
- CreatedAt time.Time `json:"-"`
+ CreatedAt time.Time `json:"created_at"`
// UpdatedAt is the date when the last change has been made to the image or it's properties.
- UpdatedAt time.Time `json:"-"`
+ UpdatedAt time.Time `json:"updated_at"`
// File is the trailing path after the glance endpoint that represent the location
// of the image or the path to retrieve it.
@@ -79,36 +79,29 @@
Schema string `json:"schema"`
}
-func (s *Image) UnmarshalJSON(b []byte) error {
+func (r *Image) UnmarshalJSON(b []byte) error {
type tmp Image
- var p *struct {
+ var s struct {
tmp
SizeBytes interface{} `json:"size"`
- CreatedAt string `json:"created_at"`
- UpdatedAt string `json:"updated_at"`
}
- err := json.Unmarshal(b, &p)
+ err := json.Unmarshal(b, &s)
if err != nil {
return err
}
- *s = Image(p.tmp)
+ *r = Image(s.tmp)
- switch t := p.SizeBytes.(type) {
+ switch t := s.SizeBytes.(type) {
case nil:
return nil
case float32:
- s.SizeBytes = int64(t)
+ r.SizeBytes = int64(t)
case float64:
- s.SizeBytes = int64(t)
+ r.SizeBytes = int64(t)
default:
return fmt.Errorf("Unknown type for SizeBytes: %v (value: %v)", reflect.TypeOf(t), t)
}
- s.CreatedAt, err = time.Parse(time.RFC3339, p.CreatedAt)
- if err != nil {
- return err
- }
- s.UpdatedAt, err = time.Parse(time.RFC3339, p.UpdatedAt)
return err
}
diff --git a/openstack/imageservice/v2/members/results.go b/openstack/imageservice/v2/members/results.go
index 1d2a9c0..d3cc1ce 100644
--- a/openstack/imageservice/v2/members/results.go
+++ b/openstack/imageservice/v2/members/results.go
@@ -1,7 +1,6 @@
package members
import (
- "encoding/json"
"time"
"github.com/gophercloud/gophercloud"
@@ -10,33 +9,12 @@
// Member model
type Member struct {
- CreatedAt time.Time `json:"-"`
+ CreatedAt time.Time `json:"created_at"`
ImageID string `json:"image_id"`
MemberID string `json:"member_id"`
Schema string `json:"schema"`
Status string `json:"status"`
- UpdatedAt time.Time `json:"-"`
-}
-
-func (s *Member) UnmarshalJSON(b []byte) error {
- type tmp Member
- var p *struct {
- tmp
- CreatedAt string `json:"created_at"`
- UpdatedAt string `json:"updated_at"`
- }
- err := json.Unmarshal(b, &p)
- if err != nil {
- return err
- }
-
- *s = Member(p.tmp)
- s.CreatedAt, err = time.Parse(time.RFC3339, p.CreatedAt)
- if err != nil {
- return err
- }
- s.UpdatedAt, err = time.Parse(time.RFC3339, p.UpdatedAt)
- return err
+ UpdatedAt time.Time `json:"updated_at"`
}
// Extract Member model from request if possible