Merge lp:~julian-edwards/gwacl/delete-container into lp:gwacl

[Julian Edwards]

Add the DeleteContainer storage call.

[Jeroen T. Vermeulen (jtv)]

Looks good, given the difficulties with unit-testing in Go. Maybe in addition to testing that deliberately induced errors come out as non-nil, you could also cursorily check their contents.

Use the ErrorMatches checker to verify that an error matches a given regex:

    // Don't care what else is in the error, but the original error message
    // must be in there somewhere.
    c.Check(err, ErrorMatches, ".*canned error.*")

review: Approve

[lp:~julian-edwards/gwacl/delete-container]

204. By Julian Edwards on 2013-07-29

improve test

=== modified file 'storage_base.go'
--- storage_base.go	2013-07-26 08:49:56 +0000
+++ storage_base.go	2013-07-29 00:23:26 +0000
@@ -439,6 +439,25 @@
     return nil
 }
 
+// Send a request to the storage service to delete a container.  It will also
+// delete all the blobs inside it.
+func (context *StorageContext) DeleteContainer(container string) error {
+    uri := addURLQueryParams(
+        context.getContainerURL(container),
+        "restype", "container")
+    _, err := context.performRequest(requestParams{
+        Method:         "DELETE",
+        URL:            uri,
+        APIVersion:     "2012-02-12",
+        ExpectedStatus: http.StatusAccepted,
+    })
+    if err != nil {
+        msg := fmt.Sprintf("failed to delete container %s: ", container)
+        return extendError(err, msg)
+    }
+    return nil
+}
+
 type PutBlobRequest struct {
     Container string // Container name in the storage account
     BlobType  string // Pass "page" or "block"
 
=== modified file 'storage_base_test.go'
--- storage_base_test.go	2013-07-26 08:49:56 +0000
+++ storage_base_test.go	2013-07-29 00:23:26 +0000
@@ -688,6 +688,61 @@
     c.Check(serverError.HTTPStatus.StatusCode(), Equals, http.StatusNotFound)
 }
 
+type TestDeleteContainer struct{}
+
+var _ = Suite(&TestDeleteContainer{})
+
+// The DeleteContainer Storage API call returns without error when the
+// container has been created successfully.
+func (suite *TestDeleteContainer) Test(c *C) {
+    response := makeHttpResponse(http.StatusAccepted, "")
+    transport := &TestTransport{Response: response}
+    context := makeStorageContext(transport)
+    containerName := MakeRandomString(10)
+    err := context.DeleteContainer(containerName)
+    c.Assert(err, IsNil)
+    c.Check(transport.Request.URL.String(), Equals, fmt.Sprintf(
+        "http://%s.blob.core.windows.net/%s?restype=container",
+        context.Account, containerName))
+    c.Check(transport.Request.Method, Equals, "DELETE")
+    c.Check(transport.Request.Header.Get("Authorization"), Not(Equals), "")
+}
+
+// Client-side errors from the HTTP client are propagated back to the caller.
+func (suite *TestDeleteContainer) TestError(c *C) {
+    error := fmt.Errorf("canned-error")
+    context := makeStorageContext(&TestTransport{Error: error})
+    err := context.DeleteContainer("container")
+    c.Assert(err, ErrorMatches, ".*canned-error.*")
+}
+
+// Server-side errors are propagated back to the caller.
+func (suite *TestDeleteContainer) TestErrorResponse(c *C) {
+    response := makeHttpResponse(http.StatusNotFound, "not found")
+    context := makeStorageContext(&TestTransport{Response: response})
+    err := context.DeleteContainer("container")
+    c.Assert(err, ErrorMatches, ".*Not Found.*")
+}
+
+// Server-side errors are propagated back to the caller.
+func (suite *TestDeleteContainer) TestNotCreatedResponse(c *C) {
+    response := makeHttpResponse(http.StatusOK, "")
+    context := makeStorageContext(&TestTransport{Response: response})
+    err := context.DeleteContainer("container")
+    c.Assert(err, ErrorMatches, ".*Azure request failed.*")
+}
+
+// Azure HTTP errors (for instance 404 responses) are propagated back to
+// the caller as ServerError objects.
+func (suite *TestDeleteContainer) TestServerError(c *C) {
+    response := makeHttpResponse(http.StatusNotFound, "not found")
+    context := makeStorageContext(&TestTransport{Response: response})
+    err := context.DeleteContainer("container")
+    serverError, ok := err.(*ServerError)
+    c.Check(ok, Equals, true)
+    c.Check(serverError.HTTPStatus.StatusCode(), Equals, http.StatusNotFound)
+}
+
 type TestPutPage struct{}
 
 var _ = Suite(&TestPutPage{})