Fix SGE.removeSecurityGroup for when the SG doesn't exist
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/cb556428 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/cb556428 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/cb556428 Branch: refs/heads/master Commit: cb556428e36543abb40035554e5bad685e6af0d2 Parents: f086c05 Author: Svetoslav Neykov <[email protected]> Authored: Thu Jul 6 10:51:27 2017 +0300 Committer: Svetoslav Neykov <[email protected]> Committed: Fri Jul 7 10:37:03 2017 +0300 ---------------------------------------------------------------------- .../extensions/AzureComputeSecurityGroupExtension.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/cb556428/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtension.java ---------------------------------------------------------------------- diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtension.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtension.java index 50cb75a..eaf820c 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtension.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtension.java @@ -190,7 +190,15 @@ public class AzureComputeSecurityGroupExtension implements SecurityGroupExtensio final ResourceGroupAndName resourceGroupAndName = ResourceGroupAndName.fromSlashEncoded(id); URI uri = api.getNetworkSecurityGroupApi(resourceGroupAndName.resourceGroup()) .delete(resourceGroupAndName.name()); - return resourceDeleted.apply(uri); + + // https://docs.microsoft.com/en-us/rest/api/network/virtualnetwork/delete-a-network-security-group + if (uri != null) { + // 202-Accepted if resource exists and the request is accepted. + return resourceDeleted.apply(uri); + } else { + // 204-No Content if resource does not exist. + return false; + } } @Override
