Skip to content

Commit f12c6ea

Browse files
committed
Use statusCode utility instead
1 parent ba086e8 commit f12c6ea

File tree

1 file changed

+16
-10
lines changed
  • src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups

1 file changed

+16
-10
lines changed

src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourceClient.cs

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
using Hyak.Common;
2424
using Microsoft.Azure.Commands.Resources.Models.Authorization;
2525
using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
26+
using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Utilities;
2627
using Microsoft.Azure.Commands.Tags.Model;
2728
using Microsoft.Azure.Common.Authentication;
2829
using Microsoft.Azure.Common.Authentication.Models;
@@ -34,6 +35,7 @@
3435
using Microsoft.WindowsAzure.Commands.Utilities.Common;
3536
using Newtonsoft.Json;
3637
using ProjectResources = Microsoft.Azure.Commands.Resources.Properties.Resources;
38+
using System.Net;
3739

3840
namespace Microsoft.Azure.Commands.Resources.Models
3941
{
@@ -338,19 +340,23 @@ private List<DeploymentOperation> GetNewOperations(List<DeploymentOperation> old
338340
}
339341

340342
//If nested deployment, get the operations under those deployments as well
341-
if(operation.Properties.TargetResource.ResourceType.Equals(Constants.MicrosoftResourcesDeploymentType, StringComparison.OrdinalIgnoreCase)
342-
&& !operation.Properties.StatusCode.Equals("BadRequest", StringComparison.OrdinalIgnoreCase))
343+
if(operation.Properties.TargetResource.ResourceType.Equals(Constants.MicrosoftResourcesDeploymentType, StringComparison.OrdinalIgnoreCase))
343344
{
344-
List<DeploymentOperation> newNestedOperations = new List<DeploymentOperation>();
345-
DeploymentOperationsListResult result;
345+
HttpStatusCode statusCode;
346+
Enum.TryParse<HttpStatusCode>(operation.Properties.StatusCode, out statusCode);
347+
if(!statusCode.IsClientFailureRequest())
348+
{
349+
List<DeploymentOperation> newNestedOperations = new List<DeploymentOperation>();
350+
DeploymentOperationsListResult result;
346351

347-
result = ResourceManagementClient.DeploymentOperations.List(
348-
resourceGroupName: ResourceIdUtility.GetResourceGroupName(operation.Properties.TargetResource.Id),
349-
deploymentName: operation.Properties.TargetResource.ResourceName,
350-
parameters: null);
352+
result = ResourceManagementClient.DeploymentOperations.List(
353+
resourceGroupName: ResourceIdUtility.GetResourceGroupName(operation.Properties.TargetResource.Id),
354+
deploymentName: operation.Properties.TargetResource.ResourceName,
355+
parameters: null);
351356

352-
newNestedOperations = GetNewOperations(operations, result.Operations);
353-
newOperations.AddRange(newNestedOperations);
357+
newNestedOperations = GetNewOperations(operations, result.Operations);
358+
newOperations.AddRange(newNestedOperations);
359+
}
354360
}
355361
}
356362

0 commit comments

Comments
 (0)