Merge pull request #311 from jrperritt/object-storage-fixes
[RFR] Object storage fixes
diff --git a/openstack/objectstorage/v1/objects/requests.go b/openstack/objectstorage/v1/objects/requests.go
index 4ac1e03..7b96fa2 100644
--- a/openstack/objectstorage/v1/objects/requests.go
+++ b/openstack/objectstorage/v1/objects/requests.go
@@ -18,6 +18,10 @@
// ListOpts is a structure that holds parameters for listing objects.
type ListOpts struct {
+ // Full is a true/false value that represents the amount of object information
+ // returned. If Full is set to true, then the content-type, number of bytes, hash
+ // date last modified, and name are returned. If set to false or not set, then
+ // only the object names are returned.
Full bool
Limit int `q:"limit"`
Marker string `q:"marker"`
@@ -146,7 +150,7 @@
Metadata map[string]string
ContentDisposition string `h:"Content-Disposition"`
ContentEncoding string `h:"Content-Encoding"`
- ContentLength int `h:"Content-Length"`
+ ContentLength int64 `h:"Content-Length"`
ContentType string `h:"Content-Type"`
CopyFrom string `h:"X-Copy-From"`
DeleteAfter int `h:"X-Delete-After"`
diff --git a/openstack/objectstorage/v1/objects/results.go b/openstack/objectstorage/v1/objects/results.go
index 102d94c..b51b840 100644
--- a/openstack/objectstorage/v1/objects/results.go
+++ b/openstack/objectstorage/v1/objects/results.go
@@ -14,11 +14,22 @@
// Object is a structure that holds information related to a storage object.
type Object struct {
- Bytes int `json:"bytes" mapstructure:"bytes"`
- ContentType string `json:"content_type" mapstructure:"content_type"`
- Hash string `json:"hash" mapstructure:"hash"`
+ // Bytes is the total number of bytes that comprise the object.
+ Bytes int64 `json:"bytes" mapstructure:"bytes"`
+
+ // ContentType is the content type of the object.
+ ContentType string `json:"content_type" mapstructure:"content_type"`
+
+ // Hash represents the MD5 checksum value of the object's content.
+ Hash string `json:"hash" mapstructure:"hash"`
+
+ // LastModified is the RFC3339Milli time the object was last modified, represented
+ // as a string. For any given object (obj), this value may be parsed to a time.Time:
+ // lastModified, err := time.Parse(gophercloud.RFC3339Milli, obj.LastModified)
LastModified string `json:"last_modified" mapstructure:"last_modified"`
- Name string `json:"name" mapstructure:"name"`
+
+ // Name is the unique name for the object.
+ Name string `json:"name" mapstructure:"name"`
}
// ObjectPage is a single page of objects that is returned from a call to the