Merge lp:~jtv/gwacl/delete-storage-account into lp:gwacl

Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: 81
Merged at revision: 79
Proposed branch: lp:~jtv/gwacl/delete-storage-account
Merge into: lp:gwacl
Diff against target: 50 lines (+20/-0)
3 files modified
example/live_example_managementapi.go (+3/-0)
managementapi.go (+5/-0)
managementapi_test.go (+12/-0)
To merge this branch: bzr merge lp:~jtv/gwacl/delete-storage-account
Reviewer Review Type Date Requested Status
Raphaël Badin (community) Approve
Review via email: mp+156180@code.launchpad.net

Commit message

Support deletion of storage accounts.

Description of the change

This won't work yet unless we also delete a VM's disks when we delete the VM.

Jeroen

To post a comment you must log in.
lp:~jtv/gwacl/delete-storage-account updated
81. By Jeroen T. Vermeulen

Merge trunk, resolve conflict.

Revision history for this message
Raphaël Badin (rvb) wrote :

Clean and simple… nice!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'example/live_example_managementapi.go'
2--- example/live_example_managementapi.go 2013-03-29 08:45:30 +0000
3+++ example/live_example_managementapi.go 2013-03-29 16:06:20 +0000
4@@ -144,4 +144,7 @@
5 api.DeleteHostedService(hostServiceName)
6 fmt.Println("Done deleting hosted service\n")
7
8+ fmt.Printf("Deleting storage account %s...\n", storageAccount)
9+ api.DeleteStorageAccount(storageAccount)
10+ fmt.Println("Done deleting storage account\n")
11 }
12
13=== modified file 'managementapi.go'
14--- managementapi.go 2013-03-29 12:27:03 +0000
15+++ managementapi.go 2013-03-29 16:06:20 +0000
16@@ -149,6 +149,11 @@
17 return api.blockUntilCompleted(response)
18 }
19
20+// DeleteStorageAccount deletes a storage account.
21+func (api *ManagementAPI) DeleteStorageAccount(storageAccountName string) error {
22+ return api.session.delete("services/storageservices/" + storageAccountName)
23+}
24+
25 // GetStorageAccountKeys retrieves a storage account's primary and secondary
26 // access keys from the Azure service.
27 func (api *ManagementAPI) GetStorageAccountKeys(accountName string) (*StorageAccountKeys, error) {
28
29=== modified file 'managementapi_test.go'
30--- managementapi_test.go 2013-03-29 13:31:17 +0000
31+++ managementapi_test.go 2013-03-29 16:06:20 +0000
32@@ -305,6 +305,18 @@
33 checkOneRequest(c, &recordedRequests, expectedURL, expectedPayload, "POST")
34 }
35
36+func (suite *managementAPISuite) TestDeleteStorageAccount(c *C) {
37+ const accountName = "myaccount"
38+ api := makeAPI(c)
39+ accountURL := api.session.composeURL("services/storageservices/" + accountName)
40+ recordedRequests := setUpDispatcher("operationID")
41+
42+ err := api.DeleteStorageAccount(accountName)
43+ c.Assert(err, IsNil)
44+
45+ checkOneRequest(c, recordedRequests, accountURL, nil, "DELETE")
46+}
47+
48 func (suite *managementAPISuite) TestGetStorageAccountKeys(c *C) {
49 const (
50 accountName = "accountname"

Subscribers

People subscribed via source and target branches