Merge lp:~julian-edwards/gwacl/fix-get-container-props into lp:gwacl

[Julian Edwards]

Allow for optional headers in the GetContainerProperties response.

[Raphaël Badin (rvb)]

review: Approve

=== modified file 'storage_base.go'
--- storage_base.go	2013-07-31 06:31:36 +0000
+++ storage_base.go	2013-07-31 11:35:33 +0000
@@ -468,11 +468,11 @@
     }
 
     props := &Properties{
-        LastModified:  headers[http.CanonicalHeaderKey("Last-Modified")][0],
-        ETag:          headers[http.CanonicalHeaderKey("ETag")][0],
-        LeaseStatus:   headers[http.CanonicalHeaderKey("X-Ms-Lease-Status")][0],
-        LeaseState:    headers[http.CanonicalHeaderKey("X-Ms-Lease-State")][0],
-        LeaseDuration: headers[http.CanonicalHeaderKey("X-Ms-Lease-Duration")][0],
+        LastModified:  headers.Get(http.CanonicalHeaderKey("Last-Modified")),
+        ETag:          headers.Get(http.CanonicalHeaderKey("ETag")),
+        LeaseStatus:   headers.Get(http.CanonicalHeaderKey("X-Ms-Lease-Status")),
+        LeaseState:    headers.Get(http.CanonicalHeaderKey("X-Ms-Lease-State")),
+        LeaseDuration: headers.Get(http.CanonicalHeaderKey("X-Ms-Lease-Duration")),
     }
 
     return props, nil

=== modified file 'storage_base_test.go'
--- storage_base_test.go	2013-07-31 06:21:01 +0000
+++ storage_base_test.go	2013-07-31 11:35:33 +0000
@@ -781,6 +781,27 @@
     c.Check(props.LeaseDuration, Equals, "duration")
 }
 
+func (suite *TestGetContainerProperties) TestWithoutAllHeaders(c *C) {
+    response := &http.Response{
+        Status:     fmt.Sprintf("%d", http.StatusOK),
+        StatusCode: http.StatusOK,
+        Body:       makeResponseBody(""),
+    }
+
+    transport := &TestTransport{Response: response}
+    context := makeStorageContext(transport)
+    containerName := MakeRandomString(10)
+    props, err := context.GetContainerProperties(containerName)
+    c.Assert(err, IsNil)
+
+    c.Check(props.LastModified, Equals, "")
+    c.Check(props.ETag, Equals, "")
+    c.Check(props.LeaseStatus, Equals, "")
+    c.Check(props.LeaseState, Equals, "")
+    c.Check(props.LeaseDuration, Equals, "")
+}
+
+
 // Client-side errors from the HTTP client are propagated back to the caller.
 func (suite *TestGetContainerProperties) TestError(c *C) {
     error := fmt.Errorf("canned-error")