Merge lp:~allenap/gwacl/storage-send-thing into lp:gwacl

[Gavin Panella]

Some tweaks to StorageContext's fields and methods.

[Gavin Panella (allenap)]

review: Approve

[lp:~allenap/gwacl/storage-send-thing]

40. By Gavin Panella on 2013-03-21

Allow any 2xx status code in StorageContext.send().

=== modified file 'storage.go'
--- storage.go	2013-03-20 07:53:57 +0000
+++ storage.go	2013-03-21 01:21:24 +0000
@@ -190,16 +190,16 @@
 type StorageContext struct {
     Account string
     Key     string
-    Client  *http.Client
+    client  *http.Client
 }
 
 // getClient is used when sending a request.  If called with an existing client
 // it will replace the once in the context structure which is useful for tests.
 func (context *StorageContext) getClient() *http.Client {
-    if context.Client == nil {
+    if context.client == nil {
         return http.DefaultClient
     }
-    return context.Client
+    return context.client
 }
 
 // Any object that deserializes XML must meet this interface.
@@ -210,28 +210,32 @@
 // Send a request to the storage service and process the response.
 // The "res" parameter is typically an XML struct that will deserialize the
 // raw XML into the struct data.
-func (context *StorageContext) Send(req *http.Request, res Deserializer) error {
+func (context *StorageContext) send(req *http.Request, res Deserializer) (*http.Response, error) {
     client := context.getClient()
     resp, err := client.Do(req)
     if err != nil {
-        return fmt.Errorf("request failed: %s", err)
-    }
-
-    if resp.StatusCode != http.StatusOK {
-        return fmt.Errorf("request failed with status %d", resp.StatusCode)
+        return resp, fmt.Errorf("request failed: %s", err)
+    }
+
+    if resp.StatusCode < 200 || resp.StatusCode > 299 {
+        return resp, fmt.Errorf("request failed with status %d", resp.StatusCode)
+    }
+
+    if res == nil {
+        return resp, nil
     }
 
     data, err := ioutil.ReadAll(resp.Body)
     if err != nil {
-        return fmt.Errorf("Failed to read response data: %s", err)
+        return resp, fmt.Errorf("Failed to read response data: %s", err)
     }
 
     err = res.Deserialize(data)
     if err != nil {
-        return fmt.Errorf("Failed to deserialize data: %s", err)
+        return resp, fmt.Errorf("Failed to deserialize data: %s", err)
     }
 
-    return nil
+    return resp, nil
 }
 
 // Send a request to the storage service to list the containers in the
@@ -245,7 +249,8 @@
     }
     addStandardHeaders(req, context.Account, context.Key, "2012-02-12")
     containers := &ContainerEnumerationResults{}
-    return containers, context.Send(req, containers)
+    _, err = context.send(req, containers)
+    return containers, err
 }
 
 // Send a request to the storage service to list the blobs in a container.
@@ -259,5 +264,6 @@
     }
     addStandardHeaders(req, context.Account, context.Key, "2012-02-12")
     blob := &BlobEnumerationResults{}
-    return blob, context.Send(req, blob)
+    _, err = context.send(req, blob)
+    return blob, err
 }

=== modified file 'storage_test.go'
--- storage_test.go	2013-03-21 00:17:55 +0000
+++ storage_test.go	2013-03-21 01:21:24 +0000
@@ -228,14 +228,14 @@
 var _ = Suite(&TestStorageContext{})
 
 func (suite *TestStorageContext) TestGetClientReturnsDefaultClient(c *C) {
-    context := &StorageContext{Client: nil}
+    context := &StorageContext{client: nil}
     c.Assert(context.getClient(), Equals, http.DefaultClient)
 }
 
 func (suite *TestStorageContext) TestGetClientReturnsSpecifiedClient(c *C) {
-    context := &StorageContext{Client: &http.Client{}}
+    context := &StorageContext{client: &http.Client{}}
     c.Assert(context.getClient(), Not(Equals), http.DefaultClient)
-    c.Assert(context.getClient(), Equals, context.Client)
+    c.Assert(context.getClient(), Equals, context.client)
 }
 
 // TestTransport is used as an http.Client.Transport for testing. The only
@@ -298,7 +298,7 @@
         Body:       ioutil.NopCloser(strings.NewReader(response_body)),
     }
     transport := &TestTransport{Response: response}
-    context.Client = &http.Client{Transport: transport}
+    context.client = &http.Client{Transport: transport}
     results, err := context.ListContainers()
     c.Assert(err, IsNil)
     c.Check(transport.Request.URL.String(), Equals, fmt.Sprintf(
@@ -313,7 +313,7 @@
     error := fmt.Errorf("canned-error")
     transport := &TestTransport{Error: error}
     context := makeStorageContext()
-    context.Client = &http.Client{Transport: transport}
+    context.client = &http.Client{Transport: transport}
     _, err := context.ListContainers()
     c.Assert(err, Not(IsNil))
 }
@@ -326,7 +326,7 @@
     }
     transport := &TestTransport{Response: response}
     context := makeStorageContext()
-    context.Client = &http.Client{Transport: transport}
+    context.client = &http.Client{Transport: transport}
     _, err := context.ListContainers()
     c.Assert(err, Not(IsNil))
 }
@@ -389,7 +389,7 @@
         Body:       ioutil.NopCloser(strings.NewReader(response_body)),
     }
     transport := &TestTransport{Response: response}
-    context.Client = &http.Client{Transport: transport}
+    context.client = &http.Client{Transport: transport}
     results, err := context.ListBlobs("container")
     c.Assert(err, IsNil)
     c.Check(transport.Request.URL.String(), Equals, fmt.Sprintf(
@@ -404,7 +404,7 @@
     error := fmt.Errorf("canned-error")
     transport := &TestTransport{Error: error}
     context := makeStorageContext()
-    context.Client = &http.Client{Transport: transport}
+    context.client = &http.Client{Transport: transport}
     _, err := context.ListBlobs("container")
     c.Assert(err, Not(IsNil))
 }
@@ -417,7 +417,7 @@
     }
     transport := &TestTransport{Response: response}
     context := makeStorageContext()
-    context.Client = &http.Client{Transport: transport}
+    context.client = &http.Client{Transport: transport}
     _, err := context.ListBlobs("container")
     c.Assert(err, Not(IsNil))
 }