Skip to content

Commit d491dda

Browse files
committed
Fixed nit, 2 tests still failing
1 parent 8c814d7 commit d491dda

File tree

4 files changed

+3
-22
lines changed

4 files changed

+3
-22
lines changed

src/Resources/ResourceManager/SdkClient/DeploymentStacksSdkClient.cs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -508,9 +508,7 @@ string deploymentScope
508508
"Canceled"
509509
);
510510

511-
512511
errorValidation(finalStack);
513-
514512
return new PSDeploymentStack(finalStack);
515513
}
516514

@@ -685,21 +683,6 @@ private List<string> processErrorMessages(ErrorResponse error)
685683
}
686684
}
687685
}
688-
689-
690-
//while length of count of error > 2
691-
//loop through all details
692-
693-
/*while (error.Details != null && error.Details.Count >= 0)
694-
{
695-
errorMessages.Add(string.Format(ErrorFormat, error.Code, error.Message));
696-
if (error.Details.Count == 0)
697-
{
698-
break;
699-
}
700-
error = error.Details[0];
701-
}*/
702-
703686
return errorMessages;
704687
}
705688
}

src/Resources/ResourceManager/SdkClient/ResourceManagerSdkClient.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1469,7 +1469,6 @@ private DeploymentExtended ExecuteDeploymentInternal(PSDeploymentCmdletParameter
14691469
this.BeginDeployment(parameters, deployment);
14701470

14711471
WriteVerbose(string.Format(ProjectResources.CreatedDeployment, parameters.DeploymentName));
1472-
14731472
return ProvisionDeploymentStatus(parameters, deployment);
14741473
}
14751474

src/Resources/ResourceManager/SdkExtensions/ResourcesExtensions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ public static PSDeployment ToPSDeployment(this DeploymentExtended result, string
6363
{
6464
deployment = CreatePSDeployment(result, managementGroupId, resourceGroupName);
6565
}
66-
6766
return deployment;
6867
}
6968

src/Resources/Resources.Test/ScenarioTests/DeploymentStackTests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ function Test-NewSubscriptionDeploymentStack
338338
try {
339339

340340
# Test - NewByNameAndTemplateFile
341-
$NewByNameAndTemplateFile = New-AzSubscriptionDeploymentStack -Name $rname -Location $location -TemplateFile sampleTemplate.json -TemplateParameterFile sampleTemplateParams.json
341+
$NewByNameAndTemplateFile = New-AzSubscriptionDeploymentStack -Name $rname -Location $location -TemplateFile simpleTemplate.json -TemplateParameterFile simpleTemplateParams.json
342342

343343
# Assert
344344
Assert-NotNull $NewByNameAndTemplateFile
@@ -583,7 +583,7 @@ function Test-SetResourceGroupDeploymentStack
583583
$resourceId = "/subscriptions/$subId/resourcegroups/$rgname/providers/Microsoft.Resources/deploymentStacks/$rname"
584584

585585
#Test - SetByNameAndResourceGroupAndTemplateFile
586-
$deployment = Set-AzResourceGroupDeploymentStack -Name $rname -ResourceGroupName $rgname -TemplateFile sampleTemplate.json -UpdateBehavior "detachResources" -force
586+
$deployment = Set-AzResourceGroupDeploymentStack -Name $rname -ResourceGroupName $rgname -TemplateFile simpleTemplate.json -UpdateBehavior "detachResources" -force
587587

588588
#Assert
589589
Assert-NotNull $deployment
@@ -595,7 +595,7 @@ function Test-SetResourceGroupDeploymentStack
595595
New-AzResourceGroup -Name $rgname -Location $rglocation
596596

597597
#Test - SetByNameAndResourceGroupAndTemplateFileAndTemplateParameterFile
598-
$deployment = Set-AzResourceGroupDeploymentStack -Name $rname -ResourceGroupName $rgname -TemplateFile sampleTemplate.json -TemplateParameterFile sampleTemplateParams.json -UpdateBehavior "detachResources" -force
598+
$deployment = Set-AzResourceGroupDeploymentStack -Name $rname -ResourceGroupName $rgname -TemplateFile simpleTemplate.json -TemplateParameterFile simpleTemplateParams.json -UpdateBehavior "detachResources" -force
599599

600600
#Assert
601601
Assert-NotNull $deployment

0 commit comments

Comments
 (0)