Skip to content

Commit 83e5ec7

Browse files
XynoclafeXynoclafe
committed
Re-record tests
2 parents a8c415b + 150c6f1 commit 83e5ec7

20 files changed

+87829
-4972
lines changed

‎src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzResourceGroupDeploymentStack.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@ public class NewAzResourceGroupDeploymentStack : DeploymentStacksCmdletBase
105105
HelpMessage = "Update behavior for the stack. Value can be \"Detach\" or \"Purge\".")]
106106
public String UpdateBehavior { get; set; }
107107

108+
[Parameter(Mandatory = false,
109+
HelpMessage = "The scope at which the initial deployment should be created. If a scope isn't specified, it will default to the scope of the deployment stack.")]
110+
public string DeploymentScope { get; set; }
111+
108112
[Parameter(Mandatory = false,
109113
HelpMessage = "Do not ask for confirmation when overwriting an existing stack.")]
110114
public SwitchParameter Force { get; set; }
@@ -159,8 +163,9 @@ public override void ExecuteCmdlet()
159163
ParameterUri,
160164
parameters,
161165
Description,
162-
UpdateBehavior == null ? "detach" : UpdateBehavior
163-
) ;
166+
UpdateBehavior == null ? "detach" : UpdateBehavior,
167+
DeploymentScope
168+
);
164169
WriteObject(deploymentStack);
165170
};
166171

‎src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzSubscriptionDeploymentStack.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,11 @@ public class NewAzSubscriptionDeploymentStack : DeploymentStacksCmdletBase
101101

102102
[Parameter(Mandatory = false, ValueFromPipeline = true,
103103
HelpMessage = "Update behavior for the stack. Value can be \"Detach\" or \"Purge\".")]
104-
public String UpdateBehavior { get; set; }
104+
public string UpdateBehavior { get; set; }
105+
106+
[Parameter(Mandatory = false,
107+
HelpMessage = "The scope at which the initial deployment should be created. If a scope isn't specified, it will default to the scope of the deployment stack.")]
108+
public string DeploymentScope { get; set; }
105109

106110
[Parameter(Mandatory = false,
107111
HelpMessage = "Do not ask for confirmation when overwriting an existing stack.")]
@@ -157,7 +161,8 @@ public override void ExecuteCmdlet()
157161
ParameterUri,
158162
parameters,
159163
Description,
160-
UpdateBehavior == null ? "detach" : UpdateBehavior
164+
UpdateBehavior == null ? "detach" : UpdateBehavior,
165+
DeploymentScope
161166
);
162167
WriteObject(deploymentStack);
163168
};

‎src/Resources/ResourceManager/Implementation/DeploymentStacks/SetAzResourceGroupDeploymentStack.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@ public class SetAzResourceGroupDeploymentStack : DeploymentStacksCmdletBase
105105
HelpMessage = "Update behavior for the stack. Value can be \"Detach\" or \"Purge\".")]
106106
public String UpdateBehavior { get; set; }
107107

108+
[Parameter(Mandatory = false,
109+
HelpMessage = "The scope at which the initial deployment should be created. If a scope isn't specified, it will default to the scope of the deployment stack.")]
110+
public string DeploymentScope { get; set; }
111+
108112
[Parameter(Mandatory = false,
109113
HelpMessage = "Do not ask for confirmation when overwriting an existing stack.")]
110114
public SwitchParameter Force { get; set; }
@@ -159,7 +163,8 @@ public override void ExecuteCmdlet()
159163
ParameterUri,
160164
parameters,
161165
Description,
162-
UpdateBehavior
166+
UpdateBehavior,
167+
DeploymentScope
163168
);
164169
WriteObject(deploymentStack);
165170
};

‎src/Resources/ResourceManager/Implementation/DeploymentStacks/SetAzSubscriptionDeploymentStack.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,10 @@ public class SetAzSubscriptionDeploymentStack : DeploymentStacksCmdletBase
103103
HelpMessage = "Location of the stack")]
104104
public string Location { get; set; }
105105

106+
[Parameter(Mandatory = false,
107+
HelpMessage = "The scope at which the initial deployment should be created. If a scope isn't specified, it will default to the scope of the deployment stack.")]
108+
public String DeploymentScope { get; set; }
109+
106110
[Parameter(Mandatory = false,
107111
HelpMessage = "Do not ask for confirmation when overwriting an existing stack.")]
108112
public SwitchParameter Force { get; set; }
@@ -157,7 +161,8 @@ public override void ExecuteCmdlet()
157161
ParameterUri,
158162
parameters,
159163
Description,
160-
UpdateBehavior
164+
UpdateBehavior,
165+
DeploymentScope
161166
);
162167

163168
WriteObject(deploymentStack);

‎src/Resources/ResourceManager/SdkClient/DeploymentStacksSdkClient.cs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -308,13 +308,15 @@ public PSDeploymentStack ResourceGroupCreateOrUpdateDeploymentStack(
308308
string parameterUri,
309309
Hashtable parameters,
310310
string description,
311-
string updateBehavior
311+
string updateBehavior,
312+
string deploymentScope
312313
)
313314
{
314315
var deploymentStackModel = new DeploymentStack
315316
{
316317
Description = description,
317-
UpdateBehavior = updateBehavior
318+
UpdateBehavior = updateBehavior,
319+
DeploymentScope = deploymentScope
318320
};
319321

320322
DeploymentStacksTemplateLink templateLink = new DeploymentStacksTemplateLink();
@@ -442,14 +444,16 @@ public PSDeploymentStack SubscriptionCreateOrUpdateDeploymentStack(
442444
string parameterUri,
443445
Hashtable parameters,
444446
string description,
445-
string updateBehavior
446-
)
447+
string updateBehavior,
448+
string deploymentScope
449+
)
447450
{
448451
var deploymentStackModel = new DeploymentStack
449452
{
450453
Description = description,
451454
Location = location,
452-
UpdateBehavior = updateBehavior
455+
UpdateBehavior = updateBehavior,
456+
DeploymentScope = deploymentScope
453457
};
454458

455459
DeploymentStacksTemplateLink templateLink = new DeploymentStacksTemplateLink();

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

Lines changed: 0 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,6 @@ function Test-GetResourceGroupDeploymentStackSnapshot
8181
$getByNameAndResourceGroup = Get-AzResourceGroupDeploymentStack -ResourceGroupName $rgname -StackName $rname
8282
$provisioningState = $getByNameAndResourceGroup.provisioningState
8383

84-
while ($provisioningState -ne "succeeded" -and $provisioningState -ne "failed"){
85-
$getByNameAndResourceGroup = Get-AzResourceGroupDeploymentStack -ResourceGroupName $rgname -StackName $rname
86-
$provisioningState = $getByNameAndResourceGroup.provisioningState
87-
}
88-
8984
#Assert
9085
Assert-AreEqual $provisioningState "succeeded"
9186

@@ -179,12 +174,6 @@ function Test-GetSubscriptionDeploymentStackSnapshot
179174
$getByName = Get-AzSubscriptionDeploymentStack -Name $rname
180175
$provisioningState = $getByName.provisioningState
181176

182-
183-
while ($provisioningState -ne "succeeded" -and $provisioningState -ne "failed"){
184-
$getByName = Get-AzSubscriptionDeploymentStack -Name $rname
185-
$provisioningState = $getByName.provisioningState
186-
}
187-
188177
#Assert
189178
Assert-AreEqual $provisioningState "succeeded"
190179

@@ -272,21 +261,13 @@ function Test-NewAndSetResourceGroupDeploymentStackWithTemplateSpec
272261
$deployment = New-AzResourceGroupDeploymentStack -Name $stackname -ResourceGroupName $rgname -TemplateSpec $resourceId -ParameterFile "sampleTemplateParams.json"
273262
$id = $deployment.id
274263

275-
while ($deployment.provisioningState -ne "succeeded" -and $deployment.provisioningState -ne "failed"){
276-
$deployment = Get-AzResourceGroupDeploymentStack -id $id
277-
}
278-
279264
# Assert
280265
Assert-AreEqual "succeeded" $deployment.ProvisioningState
281266

282267
# Test - Set-AzResourceGroupDeploymentStacks using templateSpecs
283268
$deployment = Set-AzResourceGroupDeploymentStack -Name $stackname -ResourceGroupName $rgname -TemplateSpec $resourceId -ParameterFile "sampleTemplateParams.json" -updateBehavior "detach"
284269
$id = $deployment.id
285270

286-
while ($deployment.provisioningState -ne "succeeded" -and $deployment.provisioningState -ne "failed"){
287-
$deployment = Get-AzResourceGroupDeploymentStack -id $id
288-
}
289-
290271
# Assert
291272
Assert-AreEqual "succeeded" $deployment.ProvisioningState
292273

@@ -325,21 +306,13 @@ function Test-NewAndSetSubscriptionDeploymentStackWithTemplateSpec
325306
$deployment = New-AzSubscriptionDeploymentStack -Name $stackname -TemplateSpec $resourceId -Location $rglocation
326307
$id = $deployment.id
327308

328-
while ($deployment.provisioningState -ne "succeeded" -and $deployment.provisioningState -ne "failed"){
329-
$deployment = Get-AzSubscriptionDeploymentStack -id $id
330-
}
331-
332309
# Assert
333310
Assert-AreEqual "succeeded" $deployment.ProvisioningState
334311

335312
# Test - Set-AzSubscriptionDeploymentStacks using templateSpecs
336313
$deployment = Set-AzResourceGroupDeploymentStack -Name $stackname -TemplateSpec $resourceId -ParameterFile "sampleTemplateParams.json" -Location $rglocation -updateBehavior "detach"
337314
$id = $deployment.id
338315

339-
while ($deployment.provisioningState -ne "succeeded" -and $deployment.provisioningState -ne "failed"){
340-
$deployment = Get-AzSubscriptionDeploymentStack -id $id
341-
}
342-
343316
# Assert
344317
Assert-AreEqual "succeeded" $deployment.ProvisioningState
345318

@@ -399,10 +372,6 @@ function Test-RemoveResourceGroupDeploymentStack
399372
New-AzResourceGroup -Name $rgname -Location $rglocation
400373
$deployment = New-AzResourceGroupDeploymentStack -Name $rname -ResourceGroupName $rgname -TemplateFile sampleTemplate.json -ParameterFile sampleTemplateParams.json
401374

402-
while ($deployment.provisioningState -ne "succeeded" -and $deployment.provisioningState -ne "failed"){
403-
$deployment = Get-AzResourceGroupDeploymentStack -id $resourceid
404-
}
405-
406375

407376
# Test - removeByResourceId
408377
$removeByResourceId = Remove-AzResourceGroupDeploymentStack -ResourceId $resourceId -force
@@ -413,10 +382,6 @@ function Test-RemoveResourceGroupDeploymentStack
413382
#Prepare
414383
$deployment = New-AzResourceGroupDeploymentStack -Name $rname -ResourceGroupName $rgname -TemplateFile sampleTemplate.json -ParameterFile sampleTemplateParams.json -force
415384

416-
while ($deployment.provisioningState -ne "succeeded" -and $deployment.provisioningState -ne "failed"){
417-
$deployment = Get-AzResourceGroupDeploymentStack -id $resourceid
418-
}
419-
420385

421386
# Test - removeByResourceNameAndResourceGroupName
422387
$removeByResourceNameAndResourceGroupName = Remove-AzResourceGroupDeploymentStack -ResourceGroupName $rgname -Name $rname -force
@@ -454,17 +419,8 @@ function Test-RemoveResourceGroupDeploymentStackSnapshot
454419
New-AzResourceGroup -Name $rgname -Location $rglocation
455420
$deployment = New-AzResourceGroupDeploymentStack -Name $rname -ResourceGroupName $rgname -TemplateFile sampleTemplate.json -ParameterFile sampleTemplateParams.json
456421

457-
458-
while ($deployment.provisioningState -ne "succeeded" -and $deployment.provisioningState -ne "failed"){
459-
$deployment = Get-AzResourceGroupDeploymentStack -id $resourceid
460-
}
461-
462422
$deploymentSet = Set-AzResourceGroupDeploymentStack -Name $rname -ResourceGroupName $rgname -TemplateFile sampleTemplate.json -ParameterFile sampleTemplateParams.json -UpdateBehavior "detach" -force
463423

464-
while ($deploymentSet.provisioningState -ne "succeeded" -and $deploymentSet.provisioningState -ne "failed"){
465-
$deploymentSet = Get-AzResourceGroupDeploymentStack -id $resourceid
466-
}
467-
468424

469425
$snapshotId = $deployment.SnapshotId;
470426

@@ -481,17 +437,8 @@ function Test-RemoveResourceGroupDeploymentStackSnapshot
481437
New-AzResourceGroup -Name $rgname -Location $rglocation
482438
$deployment = New-AzResourceGroupDeploymentStack -Name $rname -ResourceGroupName $rgname -TemplateFile sampleTemplate.json -ParameterFile sampleTemplateParams.json -force
483439

484-
while ($deployment.provisioningState -ne "succeeded" -and $deployment.provisioningState -ne "failed"){
485-
$deployment = Get-AzResourceGroupDeploymentStack -id $resourceid
486-
}
487-
488440
$deploymentSet = Set-AzResourceGroupDeploymentStack -Name $rname -ResourceGroupName $rgname -TemplateFile sampleTemplate.json -ParameterFile sampleTemplateParams.json -UpdateBehavior "detach" -force
489441

490-
491-
while ($deploymentSet.provisioningState -ne "succeeded" -and $deploymentSet.provisioningState -ne "failed"){
492-
$deploymentSet = Get-AzResourceGroupDeploymentStack -id $resourceid
493-
}
494-
495442
$stackName = $deployment.name
496443

497444
$snapshotId = $deployment.SnapshotId;
@@ -528,10 +475,6 @@ function Test-RemoveSubscriptionDeploymentStack
528475
$deployment = New-AzSubscriptionDeploymentStack -Name $rname -TemplateFile subscription_level_template.json -ParameterFile subscription_level_parameters.json -location $rglocation
529476
$resourceid = "/subscriptions/$subId/providers/Microsoft.Resources/deploymentStacks/$rname"
530477

531-
while ($deployment.provisioningState -ne "succeeded" -and $deployment.provisioningState -ne "failed"){
532-
$deployment = Get-AzDeploymentStack -id $resourceid
533-
}
534-
535478
# Test - RemoveByName
536479
$removeByName = Remove-AzSubscriptionDeploymentStack -Name $rname -force
537480

@@ -541,11 +484,6 @@ function Test-RemoveSubscriptionDeploymentStack
541484
# Prepare
542485
$deployment = New-AzSubscriptionDeploymentStack -Name $rname -TemplateFile subscription_level_template.json -ParameterFile subscription_level_parameters.json -location $rglocation -force
543486

544-
while ($deployment.provisioningState -ne "succeeded" -and $deployment.provisioningState -ne "failed"){
545-
$deployment = Get-AzDeploymentStack -id $resourceid
546-
}
547-
548-
549487
# Test - RemoveByResourceId
550488
$removeByResourceId = Remove-AzSubscriptionDeploymentStack -ResourceId $resourceid -force
551489

@@ -578,18 +516,10 @@ function Test-RemoveSubscriptionDeploymentStackSnapshot
578516
# Prepare
579517
$deployment = New-AzSubscriptionDeploymentStack -Name $rname -TemplateFile subscription_level_template.json -ParameterFile subscription_level_parameters.json -location $rglocation
580518

581-
while ($deployment.provisioningState -ne "succeeded" -and $deployment.provisioningState -ne "failed"){
582-
$deployment = Get-AzDeploymentStack -ResourceId $resourceId
583-
}
584-
585519
Assert-AreEqual $deployment.provisioningState "succeeded"
586520

587521
$deploymentSet = Set-AzSubscriptionDeploymentStack -Name $rname -TemplateFile subscription_level_template.json -ParameterFile subscription_level_parameters.json -UpdateBehavior "detach" -force -location $rglocation
588522

589-
while ($deploymentSet.provisioningState -ne "succeeded" -and $deploymentSet.provisioningState -ne "failed"){
590-
$deploymentSet = Get-AzDeploymentStack -ResourceId $resourceId
591-
}
592-
593523
Assert-AreEqual $deploymentSet.provisioningState "succeeded"
594524

595525
$snapshotId = $deployment.SnapshotId;
@@ -606,19 +536,10 @@ function Test-RemoveSubscriptionDeploymentStackSnapshot
606536
# Prepare
607537
$deployment = New-AzSubscriptionDeploymentStack -Name $rname -TemplateFile subscription_level_template.json -ParameterFile subscription_level_parameters.json -force -location $rglocation
608538

609-
while ($deployment.provisioningState -ne "succeeded" -and $deployment.provisioningState -ne "failed"){
610-
$deployment = Get-AzDeploymentStack -ResourceId $resourceId
611-
}
612-
613539
Assert-AreEqual $deployment.provisioningState "succeeded"
614540

615541
$deploymentSet = Set-AzSubscriptionDeploymentStack -Name $rname -TemplateFile subscription_level_template.json -ParameterFile subscription_level_parameters.json -UpdateBehavior "detach" -force -location $rglocation
616542

617-
618-
while ($deploymentSet.provisioningState -ne "succeeded" -and $deploymentSet.provisioningState -ne "failed"){
619-
$deploymentSet = Get-AzDeploymentStack -ResourceId $resourceId
620-
}
621-
622543
Assert-AreEqual $deploymentSet.provisioningState "succeeded"
623544

624545
$stackName = $deployment.Name
@@ -664,10 +585,6 @@ function Test-SetResourceGroupDeploymentStack
664585
#Test - SetByNameAndResourceGroupAndTemplateFile
665586
$deployment = Set-AzResourceGroupDeploymentStack -Name $rname -ResourceGroupName $rgname -TemplateFile sampleTemplate.json -UpdateBehavior "detach" -force
666587

667-
while ($deployment.provisioningState -ne "succeeded" -and $deployment.provisioningState -ne "failed"){
668-
$deployment = Get-AzResourceGroupDeploymentStack -ResourceId $resourceId
669-
}
670-
671588
#Assert
672589
Assert-NotNull $deployment
673590

@@ -680,10 +597,6 @@ function Test-SetResourceGroupDeploymentStack
680597
#Test - SetByNameAndResourceGroupAndTemplateFileAndParameterFile
681598
$deployment = Set-AzResourceGroupDeploymentStack -Name $rname -ResourceGroupName $rgname -TemplateFile sampleTemplate.json -ParameterFile sampleTemplateParams.json -UpdateBehavior "detach" -force
682599

683-
while ($deployment.provisioningState -ne "succeeded" -and $deployment.provisioningState -ne "failed"){
684-
$deployment = Get-AzResourceGroupDeploymentStack -ResourceId $resourceId
685-
}
686-
687600
#Assert
688601
Assert-NotNull $deployment
689602
}
@@ -714,10 +627,6 @@ function Test-SetSubscriptionDeploymentStack
714627
#Test - SetByNameAndTemplateFile
715628
$deployment = Set-AzSubscriptionDeploymentStack -Name $rname -TemplateFile subscription_level_template.json -UpdateBehavior "detach" -force -location $location
716629

717-
while ($deployment.provisioningState -ne "succeeded" -and $deployment.provisioningState -ne "failed"){
718-
$deployment = Get-AzDeploymentStack -ResourceId $resourceId
719-
}
720-
721630
#Assert
722631
Assert-NotNull $deployment
723632

@@ -729,10 +638,6 @@ function Test-SetSubscriptionDeploymentStack
729638
#Test - SetByNameAndTemplateFileAndParameterFile
730639
$deployment = Set-AzSubscriptionDeploymentStack -Name $rname -TemplateFile subscription_level_template.json -ParameterFile subscription_level_parameters.json -UpdateBehavior "detach" -force -location $location
731640

732-
while ($deployment.provisioningState -ne "succeeded" -and $deployment.provisioningState -ne "failed"){
733-
$deployment = Get-AzDeploymentStack -ResourceId $resourceId
734-
}
735-
736641
#Assert
737642
Assert-NotNull $deployment
738643
}

0 commit comments

Comments
 (0)