Skip to content

Commit 628ae39

Browse files
committed
New-AzureRmWebAppSlot returns an error if I don't add the Optional
parameter AppServicePlan Azure#6414 Updating Failing tests Styling fix Updating changeLog Updating to match the latest changeLog
1 parent 6202ba2 commit 628ae39

File tree

6 files changed

+2947
-1829
lines changed

6 files changed

+2947
-1829
lines changed

src/ResourceManager/Websites/ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* `Set-AzureRmWebApp` is updated to not overwrite the AppSettings when using -AssignIdentity
22+
* `New-AzureRmWebAppSlot` is updated to honor AppServicePlan as an optional parameter
2123

2224
## Version 5.0.2
2325
* `New-AzureRMWebApp` is updated to use common algorithms from the Strategy library.

src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/WebAppSlotTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ function Test-CreateNewWebAppSlot
406406
Assert-AreEqual $serverFarm.Id $result.ServerFarmId
407407

408408
# Create deployment slot
409-
$job = New-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -AppServicePlan $planName -AsJob
409+
$job = New-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -AsJob
410410
$job | Wait-Job
411411
$slot1 = $job | Receive-Job
412412

src/ResourceManager/Websites/Commands.Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests/TestCreateNewWebAppSlot.json

Lines changed: 347 additions & 347 deletions
Large diffs are not rendered by default.

src/ResourceManager/Websites/Commands.Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests/TestWebAppSwapWithPreviewCompleteSlotSwap.json

Lines changed: 1328 additions & 770 deletions
Large diffs are not rendered by default.

src/ResourceManager/Websites/Commands.Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests/TestWebAppSwapWithPreviewResetSlotSwap.json

Lines changed: 1268 additions & 710 deletions
Large diffs are not rendered by default.

src/ResourceManager/Websites/Commands.Websites/Cmdlets/DeploymentSlots/NewAzureWebAppSlot.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public override void ExecuteCmdlet()
9090

9191
var webApp = WebsitesClient.GetWebApp(ResourceGroupName, Name, null);
9292

93-
WriteObject(WebsitesClient.CreateWebApp(ResourceGroupName, Name, Slot, webApp.Location, AppServicePlan, cloningInfo, AseName, AseResourceGroupName));
93+
WriteObject(WebsitesClient.CreateWebApp(ResourceGroupName, Name, Slot, webApp.Location, AppServicePlan==null?webApp.ServerFarmId : AppServicePlan, cloningInfo, AseName, AseResourceGroupName));
9494
}
9595
}
9696
}

0 commit comments

Comments
 (0)