Merge lp:~allenap/gwacl/delete-entity into lp:gwacl

[Gavin Panella]

It is no longer an error to delete a non-existing entity through Azure's management API.

[Julian Edwards (julian-edwards)]

review: Approve

[Raphaël Badin (rvb)]

Looks good!

review: Approve

=== modified file 'management_base.go'
--- management_base.go	2013-07-17 01:11:29 +0000
+++ management_base.go	2013-07-18 14:26:22 +0000
@@ -184,6 +184,9 @@
 func (api *ManagementAPI) DeleteHostedService(serviceName string) error {
     response, err := api.session.delete("services/hostedservices/"+serviceName, "2010-10-28")
     if err != nil {
+        if IsNotFoundError(err) {
+            return nil
+        }
         return err
     }
     return api.blockUntilCompleted(response)
@@ -214,6 +217,9 @@
     path := "services/hostedservices/" + serviceName + "/deployments/" + deploymentName
     response, err := api.session.delete(path, "2012-03-01")
     if err != nil {
+        if IsNotFoundError(err) {
+            return nil
+        }
         return err
     }
     return api.blockUntilCompleted(response)
@@ -268,6 +274,9 @@
 func (api *ManagementAPI) DeleteStorageAccount(storageAccountName string) error {
     response, err := api.session.delete("services/storageservices/"+storageAccountName, "2011-06-01")
     if err != nil {
+        if IsNotFoundError(err) {
+            return nil
+        }
         return err
     }
     return api.blockUntilCompleted(response)
@@ -312,6 +321,9 @@
     }
     response, err := api.session.delete(url, "2012-08-01")
     if err != nil {
+        if IsNotFoundError(err) {
+            return nil
+        }
         return err
     }
     return api.blockUntilCompleted(response)
@@ -476,6 +488,9 @@
     }
     response, err := api.session.delete(url, "2011-02-25")
     if err != nil {
+        if IsNotFoundError(err) {
+            return nil
+        }
         return err
     }
     return api.blockUntilCompleted(response)
 
=== modified file 'management_base_test.go'
--- management_base_test.go	2013-07-18 03:46:50 +0000
+++ management_base_test.go	2013-07-18 14:26:22 +0000
@@ -541,6 +541,12 @@
     assertDeleteHostedServiceRequest(c, api, hostedServiceName, (*recordedRequests)[0])
 }
 
+func (suite *managementBaseAPISuite) TestDeleteHostedServiceWhenServiceDoesNotExist(c *C) {
+    rigFixedResponseDispatcher(&x509Response{StatusCode: http.StatusNotFound})
+    err := makeAPI(c).DeleteHostedService("hosted-service-name")
+    c.Assert(err, IsNil)
+}
+
 func (suite *managementBaseAPISuite) TestAddDeployment(c *C) {
     api := makeAPI(c)
     recordedRequests := setUpDispatcher("operationID")
@@ -576,6 +582,12 @@
     assertDeleteDeploymentRequest(c, api, hostedServiceName, deploymentName, (*recordedRequests)[0])
 }
 
+func (suite *managementBaseAPISuite) TestDeleteDeploymentWhenDeploymentDoesNotExist(c *C) {
+    rigFixedResponseDispatcher(&x509Response{StatusCode: http.StatusNotFound})
+    err := makeAPI(c).DeleteDeployment("hosted-service-name", "deployment-name")
+    c.Assert(err, IsNil)
+}
+
 var getDeploymentResponse = `
 <?xml version="1.0"?>
 <Deployment xmlns="http://schemas.microsoft.com/windowsazure" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
@@ -713,6 +725,12 @@
     checkOneRequest(c, recordedRequests, accountURL, "2011-06-01", nil, "DELETE")
 }
 
+func (suite *managementBaseAPISuite) TestDeleteStorageAccountWhenAccountDoesNotExist(c *C) {
+    rigFixedResponseDispatcher(&x509Response{StatusCode: http.StatusNotFound})
+    err := makeAPI(c).DeleteStorageAccount("account-name")
+    c.Assert(err, IsNil)
+}
+
 func (suite *managementBaseAPISuite) TestGetStorageAccountKeys(c *C) {
     const (
         accountName  = "accountname"
@@ -765,6 +783,12 @@
     assertDeleteDiskRequest(c, api, diskName, (*recordedRequests)[0])
 }
 
+func (suite *managementBaseAPISuite) TestDeleteDiskWhenDiskDoesNotExist(c *C) {
+    rigFixedResponseDispatcher(&x509Response{StatusCode: http.StatusNotFound})
+    err := makeAPI(c).DeleteDisk(&DeleteDiskRequest{DiskName: "disk-name"})
+    c.Assert(err, IsNil)
+}
+
 func (suite *managementBaseAPISuite) TestDeleteDiskWithDeleteBlob(c *C) {
     // Setting deleteBlob=true should append comp=media as a url query value.
     deleteDiskInterval = time.Nanosecond
@@ -968,6 +992,13 @@
     checkOneRequest(c, &recordedRequests, expectedURL, "2011-02-25", nil, "DELETE")
 }
 
+func (suite *managementBaseAPISuite) TestDeleteAffinityGroupWhenGroupDoesNotExist(c *C) {
+    rigFixedResponseDispatcher(&x509Response{StatusCode: http.StatusNotFound})
+    request := DeleteAffinityGroupRequest{Name: "groupname"}
+    err := makeAPI(c).DeleteAffinityGroup(&request)
+    c.Assert(err, IsNil)
+}
+
 func makeNetworkConfiguration() *NetworkConfiguration {
     return &NetworkConfiguration{
         XMLNS: XMLNS_NC,