Merge lp:~jtv/gwacl/storage-keys into lp:gwacl

[Jeroen T. Vermeulen]

Support retrieval of a storage account's access keys.

This was a very straightforward job. I also ran a live test by editing the live management-API example to retrieve the keys, and running it against the real Azure service.

However I didn't bother adding the operation permanently to the live example because, while it would serve relatively little purpose when all the hard parts are in reusable code that's already covered, the change would have had to be right in a spot where we're making important changes.

I'm already expecting a small semantic conflict: this branch uses composeURL, and another branch I have proposed turns that function into a method.

Jeroen

[Raphaël Badin (rvb)]

Looks good.

[0]

51 + body := fmt.Sprintf(`<StorageService>
52 + <Url>%s</Url>

I think the first line should be two lines:
body := fmt.Sprintf(
`<StorageService>

this way, the XML is more readable (if there is such thing as readable XML) because it appears as a "block".

review: Approve

[lp:~jtv/gwacl/storage-keys]

74. By Jeroen T. Vermeulen on 2013-03-29

Review change: formatted test XML differently.

[Jeroen T. Vermeulen (jtv)]

Done. I was a bit hesitant because it would misalign the opening tag's "<" with the closing tag's, but all in all it's better this way.

[Julian Edwards (julian-edwards)]

On Friday 29 Mar 2013 05:44:21 you wrote:
> +
> + c.Check(keys.Primary, Equals, primaryKey)
> + c.Check(keys.Secondary, Equals, secondaryKey)
> + c.Check(keys.Url, Equals, url)
> +}

You can do this as a single check if you set up an "expected" struct and do a
DeepEquals. See the storage tests (some of which do this).

=== modified file 'managementapi.go'
--- managementapi.go	2013-03-29 08:45:30 +0000
+++ managementapi.go	2013-03-29 12:09:20 +0000
@@ -146,6 +146,22 @@
     return api.blockUntilCompleted(response)
 }
 
+// GetStorageAccountKeys retrieves a storage account's primary and secondary
+// access keys from the Azure service.
+func (api *ManagementAPI) GetStorageAccountKeys(accountName string) (*StorageAccountKeys, error) {
+    url := "services/storageservices/" + accountName + "/keys"
+    res, err := api.session.get(url)
+    if err != nil {
+        return nil, err
+    }
+    keys := StorageAccountKeys{}
+    err = keys.Deserialize(res.Body)
+    if err != nil {
+        return nil, err
+    }
+    return &keys, nil
+}
+
 // Perform an operation on the specified role (as defined by serviceName, deploymentName and
 // roleName)
 // This is an asynchronous operation, it blocks until the operation is completed.

=== modified file 'managementapi_test.go'
--- managementapi_test.go	2013-03-29 08:45:30 +0000
+++ managementapi_test.go	2013-03-29 12:09:20 +0000
@@ -4,6 +4,7 @@
 package gwacl
 
 import (
+    "fmt"
     . "launchpad.net/gocheck"
     "net/http"
     "time"
@@ -219,6 +220,36 @@
     checkOneRequest(c, &recordedRequests, expectedURL, expectedPayload, "POST")
 }
 
+func (suite *managementAPISuite) TestGetStorageAccountKeys(c *C) {
+    const (
+        accountName  = "accountname"
+        primaryKey   = "primarykey"
+        secondaryKey = "secondarykey"
+    )
+    api := suite.makeAPI(c)
+    url := composeURL("services/storageservices/"+accountName, api.session.subscriptionId)
+    body := fmt.Sprintf(
+        `<StorageService>
+            <Url>%s</Url>
+            <StorageServiceKeys>
+                <Primary>%s</Primary>
+                <Secondary>%s</Secondary>
+            </StorageServiceKeys>
+        </StorageService>`,
+        url, primaryKey, secondaryKey)
+    rigFixedResponseDispatcher(&x509Response{
+        StatusCode: http.StatusOK,
+        Body:       []byte(body),
+    })
+
+    keys, err := api.GetStorageAccountKeys("account")
+    c.Assert(err, IsNil)
+
+    c.Check(keys.Primary, Equals, primaryKey)
+    c.Check(keys.Secondary, Equals, secondaryKey)
+    c.Check(keys.Url, Equals, url)
+}
+
 func (suite *managementAPISuite) TestPerformNodeOperation(c *C) {
     api := suite.makeAPI(c)
     recordedRequests := setUpDispatcher("operationID")