Merge pull request #147 from NeowayLabs/fixSubnetAndNsgDelete

Fix subnet and nsg delete
NeowayLabs · Aug 2, 2017 · 7714bde · 7714bde
2 parents e9e835b + 15140e1
commit 7714bde
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/azure/nsg.sh b/azure/nsg.sh
@@ -26,10 +26,12 @@ fn azure_nsg_create(name, group, location) {
 #
 # Returns an empty string on success or an error string on failure.
 fn azure_nsg_delete(name, group) {
-        out, status <= az network nsg delete --name $name --resource-group $group
+        # WHY: az silently succeeds if the nsg does not exists =/
+        out, status <= azure network nsg delete -q --name $name --resource-group $group
         if $status != "0" {
                 return format("error[%s] deleting nsg[%s] resgroup[%s]", $out, $name, $group)
         }
+        print("azure_nsg_delete: success: %s\n", $out)
         return ""
 }
 

diff --git a/azure/subnet.sh b/azure/subnet.sh
@@ -66,7 +66,7 @@ fn azure_subnet_get_id(name, group, vnet) {
 #
 # Returns an empty string on success or an error string on failure.
 fn azure_subnet_delete(name, group, vnet) {
-        out, status <= azure network vnet subnet delete --resource-group $group --vnet-name $vnet --name $name
+        out, status <= azure network vnet subnet delete -q --resource-group $group --vnet-name $vnet --name $name
         if $status != "0" {
                 return format(
 			"error[%s] deleting subnet[%s] resgroup[%s] vnet[%s]",
@@ -76,5 +76,6 @@ fn azure_subnet_delete(name, group, vnet) {
 			$vnet
 		)
         }
+        print("azure_subnet_delete: success: %s\n", $out)
         return ""
 }