Merge lp:~axwalk/gwacl/deleteservice-media into lp:gwacl

[Andrew Wilkins]

Pass ?comp=media to DeleteHostedService requests

As of the 2013-08-01 version of DeleteHostedService,
it is possible to pass a request parameter (comp=media)
to tell Azure to also delete associated disks and blobs.
We should use this instead of DestroyHostedService,
which does all of that in numerous API requests.

Pass ?comp=media to DeleteHostedService requests

As of the 2013-08-01 version of DeleteHostedService,
it is possible to pass a request parameter (comp=media)
to tell Azure to also delete associated disks and blobs.
We should use this instead of DestroyHostedService,
which does all of that in numerous API requests.

[Ian Booth (wallyworld)]

Awesome

review: Approve

=== modified file 'management_base.go'
--- management_base.go	2014-03-10 03:56:29 +0000
+++ management_base.go	2014-03-12 04:02:53 +0000
@@ -222,7 +222,9 @@
 // DeleteHostedService deletes the named hosted service.
 // See http://msdn.microsoft.com/en-us/library/windowsazure/gg441305.aspx
 func (api *ManagementAPI) DeleteHostedService(serviceName string) error {
-    response, err := api.session.delete("services/hostedservices/"+serviceName, "2010-10-28")
+    url := "services/hostedservices/" + serviceName
+    url = addURLQueryParams(url, "comp", "media")
+    response, err := api.session.delete(url, "2013-08-01")
     if err != nil {
         if IsNotFoundError(err) {
             return nil
 
=== modified file 'management_base_test.go'
--- management_base_test.go	2014-03-11 03:32:29 +0000
+++ management_base_test.go	2014-03-12 04:02:53 +0000
@@ -654,9 +654,9 @@
 }
 
 func assertDeleteHostedServiceRequest(c *C, api *ManagementAPI, serviceName string, httpRequest *X509Request) {
-    expectedURL := fmt.Sprintf("%s%s/services/hostedservices/%s", defaultManagement,
+    expectedURL := fmt.Sprintf("%s%s/services/hostedservices/%s?comp=media", defaultManagement,
         api.session.subscriptionId, serviceName)
-    checkRequest(c, httpRequest, expectedURL, "2010-10-28", nil, "DELETE")
+    checkRequest(c, httpRequest, expectedURL, "2013-08-01", nil, "DELETE")
 }
 
 func (suite *managementBaseAPISuite) TestDeleteHostedService(c *C) {