Merge lp:~julian-edwards/gwacl/putblocklist into lp:gwacl

[Julian Edwards]

Add a PutBlockList method for piecing together block uploads.

[Gavin Panella (allenap)]

Here and elsewhere we're not checking that the HTTP method is correct in the request.

review: Approve

[lp:~julian-edwards/gwacl/putblocklist]

47. By Julian Edwards on 2013-03-21

check request method

=== modified file 'storage.go'
--- storage.go	2013-03-21 06:58:25 +0000
+++ storage.go	2013-03-21 07:49:22 +0000
@@ -341,3 +341,28 @@
     }
     return nil
 }
+
+// Send a request to piece together blocks into a list that specifies a blob.
+func (context *StorageContext) PutBlockList(container, filename string, blocklist *BlockList) error {
+    uri := fmt.Sprintf(
+        "http://%s.blob.core.windows.net/%s/%s?comp=blocklist",
+        context.Account, container, filename)
+    data, err := blocklist.Serialize()
+    if err != nil {
+        return err
+    }
+    data_reader := bytes.NewReader(data)
+    req, err := http.NewRequest("PUT", uri, data_reader)
+    if err != nil {
+        return err
+    }
+    addStandardHeaders(req, context.Account, context.Key, "2012-02-12")
+    resp, err := context.send(req, nil)
+    if err != nil {
+        return err
+    }
+    if resp.StatusCode != http.StatusCreated {
+        return fmt.Errorf("failed to put blocklist: %s", resp.Status)
+    }
+    return nil
+}

=== modified file 'storage_test.go'
--- storage_test.go	2013-03-21 06:58:25 +0000
+++ storage_test.go	2013-03-21 07:49:22 +0000
@@ -9,6 +9,7 @@
     "fmt"
     "io/ioutil"
     . "launchpad.net/gocheck"
+    "launchpad.net/gwacl/dedent"
     "net/http"
     "net/url"
     "strings"
@@ -593,3 +594,62 @@
     err := context.PutBlock("container", "blobname", "blockid", data_reader)
     c.Assert(err.Error(), Equals, "failed to put block: 202 Frotzed")
 }
+
+type TestPutBlockList struct{}
+
+var _ = Suite(&TestPutBlockList{})
+
+func (suite *TestPutBlockList) Test(c *C) {
+    context := makeStorageContext()
+    response := &http.Response{
+        Status:     fmt.Sprintf("%d", http.StatusCreated),
+        StatusCode: http.StatusCreated,
+    }
+    transport := &TestTransport{Response: response}
+    context.client = &http.Client{Transport: transport}
+    blocklist := &BlockList{}
+    blocklist.Add(BlockListLatest, "b1")
+    blocklist.Add(BlockListLatest, "b2")
+    err := context.PutBlockList("container", "blobname", blocklist)
+    c.Assert(err, IsNil)
+
+    c.Check(transport.Request.Method, Equals, "PUT")
+    c.Check(transport.Request.URL.String(), Equals, fmt.Sprintf(
+        "http://%s.blob.core.windows.net/container/blobname?comp=blocklist",
+        context.Account))
+    c.Check(transport.Request.Header.Get("Authorization"), Not(Equals), "")
+
+    data, err := ioutil.ReadAll(transport.Request.Body)
+    c.Assert(err, IsNil)
+    expected := dedent.Dedent(`
+        <BlockList>
+          <Latest>b1</Latest>
+          <Latest>b2</Latest>
+        </BlockList>`)
+    c.Check(string(data), Equals, expected)
+}
+
+// Client-side errors from the HTTP client are propagated back to the caller.
+func (suite *TestPutBlockList) TestError(c *C) {
+    error := fmt.Errorf("canned-error")
+    transport := &TestTransport{Error: error}
+    context := makeStorageContext()
+    context.client = &http.Client{Transport: transport}
+    blocklist := &BlockList{}
+    err := context.PutBlockList("container", "blobname", blocklist)
+    c.Assert(err, Not(IsNil))
+}
+
+// Server-side errors are propagated back to the caller.
+func (suite *TestPutBlockList) TestErrorResponse(c *C) {
+    response := &http.Response{
+        Status:     "202 Frotzed",
+        StatusCode: 202,
+    }
+    transport := &TestTransport{Response: response}
+    context := makeStorageContext()
+    context.client = &http.Client{Transport: transport}
+    blocklist := &BlockList{}
+    err := context.PutBlockList("container", "blobname", blocklist)
+    c.Assert(err.Error(), Equals, "failed to put blocklist: 202 Frotzed")
+}