Skip to content

Merge websites-preview branch for BUILD #6046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 57 commits into from
Apr 26, 2018
Merged

Merge websites-preview branch for BUILD #6046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
b9e5dd1
Updated code to work with new Websites SDK. Added cmdlets for website…
Oct 27, 2017
c9792a7
Merge remote-tracking branch 'upstream/preview' into preview
Oct 27, 2017
7aefff0
Remove project reference for WebSites SDK and use an unsigned nupkg b…
Nov 1, 2017
bf7522b
Remove WebSites symbols nupkg file
Nov 1, 2017
f812965
Fixes an issue where the list of web apps returned by Get-AzureRmWebA…
Nov 7, 2017
e4417c5
Removing local build of Microsoft.Azure.Management.Websites.1.7.1-pre…
Nov 8, 2017
923a665
Fix build errors due to WebSites SDK update
Nov 8, 2017
59ddf4b
Fix manifest files, add new recorded tests to the csproj
Nov 8, 2017
05eeff5
Merge remote-tracking branch 'upstream/preview' into preview
Nov 10, 2017
b934ba6
Recorded failing PublishingProfile tests again
Nov 10, 2017
b234e0f
Generated markdown help files. Added SupportsShouldProcess to restore…
Nov 21, 2017
5f51cc7
Merge branch 'preview' into preview
twitchax Nov 30, 2017
fd05626
Update version of Microsoft.Azure.Management.Websites package for .NE…
Dec 4, 2017
1419c46
Merge remote-tracking branch 'origin/preview' into preview
Dec 4, 2017
d1f10f0
Merge remote-tracking branch 'upstream/preview' into preview
Dec 4, 2017
bf5ac41
Remove old websites client extension methods that are breaking the .N…
Dec 4, 2017
50a29ee
Change old SiteConfig type -> SiteConfigResource for .NET Standard build
Dec 6, 2017
38241ef
A couple more patches of SiteConfig -> SiteConfigResource
Dec 6, 2017
e61db4a
Merge remote-tracking branch 'upstream/preview' into preview
Dec 18, 2017
b658a9e
Fixes for code review. Removed redundant dependencies, updated module
Dec 18, 2017
59bde91
Changed snapshot times to DateTimes instead of Strings
Jan 2, 2018
51cfa61
Merge pull request #5234 from Azure/preview
markcowl Jan 6, 2018
730177b
Merge branch 'websites-preview' into preview
markcowl Jan 6, 2018
fea8d33
Merge remote-tracking branch 'upstream/preview' into preview
Jan 17, 2018
c98549d
Added AsJob option and Snapshot parameter set to restore snapshot com…
Jan 17, 2018
b9b4444
Merge remote-tracking branch 'origin/preview' into preview
Jan 17, 2018
7113b48
Merge pull request #5308 from Azure/preview
markcowl Jan 19, 2018
dff2bc7
Merge branch 'websites-preview' into preview
markcowl Jan 19, 2018
4576653
Fix module versions, change ValidateSet to PSArgumentCompleter for Ne…
Jan 19, 2018
c98f6e5
Add breaking change exceptions for Websites module
Jan 23, 2018
8a0c6c5
Merge pull request #4876 from Nking92/preview
cormacpayne Jan 25, 2018
1ac6aab
Fixes:##4808: Support for Identity property, fixes #5155 - Support for
panchagnula Dec 16, 2017
d5bfdf4
Fixes #5222 - Add support for Isolated SKU for ASEV2
panchagnula Jan 17, 2018
21ad069
FW:updating to use the PSArgumentCompleter attribute instead of valid…
panchagnula Jan 23, 2018
6950697
Updating changeLog, using switchParmeter & updating help
panchagnula Jan 30, 2018
25ddc8c
Removing snapshots commands to postpone release for an API rework
Jan 30, 2018
289062f
Remove app snapshots tests and documentation
Jan 31, 2018
d02c9f5
Remove snapshots cmdlet classes from VS project
Jan 31, 2018
e598e0f
Updaing md files
panchagnula Jan 31, 2018
3523883
Merge pull request #5252 from panchagnula/sisirap-NickGBase-IdentitySet
cormacpayne Jan 31, 2018
84e226e
Merge pull request #5397 from Nking92/websites-preview
cormacpayne Jan 31, 2018
53a57c1
Merge branch 'preview' of https://github.com/Azure/azure-powershell i…
cormacpayne Feb 1, 2018
a224304
Fix bug in tooling around PowerShellGet 1.6.0
cormacpayne Feb 1, 2018
0dd8638
Merge branch 'updatesign' of https://github.com/markcowl/azure-powers…
cormacpayne Feb 1, 2018
132cb06
Re-recording RemoveWebAppTest & adding the changes from pull request …
panchagnula Feb 21, 2018
21161d1
Merge pull request #5592 from panchagnula/sisirap-mergedPreviewWithWe…
cormacpayne Feb 22, 2018
b5a7d23
Merge branch 'websites-preview' into iss#5678
vladimir-shcherbakov Apr 16, 2018
f9ff530
Smart merge.
vladimir-shcherbakov Apr 17, 2018
09844ff
Merge remote-tracking branch 'upstr/preview' into iss#5678
vladimir-shcherbakov Apr 18, 2018
bff5c71
Another try to merge BreakingChangeIssue.csv
vladimir-shcherbakov Apr 18, 2018
587988d
Test fix and re-recording.
vladimir-shcherbakov Apr 23, 2018
2888be6
re-recorded Microsoft.Azure.Commands.Websites.Test.ScenarioTests.Web…
vladimir-shcherbakov Apr 23, 2018
162c621
Tests fixed and re-recorded.
vladimir-shcherbakov Apr 25, 2018
c3c2251
Merge remote-tracking branch 'upstream/preview' into iss#5678
vladimir-shcherbakov Apr 25, 2018
05fc7f0
Fix for Netcore build in websites update
markcowl Apr 25, 2018
848cf83
Responding to review feedback on websites changes
markcowl Apr 25, 2018
acd5331
Responding to review feedback
markcowl Apr 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/ResourceManager/Websites/AzureRM.Websites.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ PrivateData = @{
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = '* Updated to the latest version of the Azure ClientRuntime'
ReleaseNotes = '* Upgrade to latest version of the Websites SDK
* Added -AssignIdentity & -Httpsonly properties for SetAzureWebApp'

# Prerelease string of this module
# Prerelease = ''
Expand All @@ -140,6 +141,8 @@ PrivateData = @{
# External dependent modules of this module
# ExternalModuleDependencies = @()

# Prerelease = ''

} # End of PSData hashtable

} # End of PrivateData hashtable
Expand Down
6 changes: 6 additions & 0 deletions src/ResourceManager/Websites/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
-->
## Current Release
* Set minimum dependency of module to PowerShell 5.0
* Upgrade to latest version of the Websites SDK
* Added -AssignIdentity & -Httpsonly properties for SetAzureWebApp

## Version 4.2.2
* Updated to the latest version of the Azure ClientRuntime
Expand All @@ -32,6 +34,10 @@
* Fixed issue with importing aliases
* New-AzureRMWebApp - added parameter set for simplified WebApp creation, with local git repository support.

## Version 5.0.0-preview
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move the content of this into ## Current Release

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

* Upgrade to latest version of the Websites SDK
* Added -AssignIdentity & -Httpsonly properties for SetAzureWebApp

## Version 4.1.0
* Added Location Completer to -Location parameters allowing tab completion through valid Locations
* Added ResourceGroup Completer to -ResourceGroup parameters allowing tab completion through resource groups in current subscription
Expand Down
40 changes: 9 additions & 31 deletions src/ResourceManager/Websites/Commands.Websites.Test/Commands.Websites.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,8 @@
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.3.0.0\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.Websites, Version=1.0.0.2, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Websites.1.2.0-preview\lib\net45\Microsoft.Azure.Management.Websites.dll</HintPath>
<Private>True</Private>
<Reference Include="Microsoft.Azure.Management.Websites, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Websites.1.7.1-preview\lib\net452\Microsoft.Azure.Management.Websites.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down Expand Up @@ -215,22 +214,22 @@
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppBackupRestoreTests\TestGetWebAppBackupList.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests\TestCloneWebAppSlot.json">
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppBackupRestoreTests\TestGetWebAppSnapshots.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests\TestCloneWebAppToSlot.json">
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppBackupRestoreTests\TestRestoreWebAppSnapshot.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests\TestCreateNewWebAppSlot.json">
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests\TestCloneWebAppSlot.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests\TestCreateNewWebAppSlotOnAse.json">
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests\TestCloneWebAppToSlot.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests\TestGetWebAppSlot.json">
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests\TestCreateNewWebAppSlot.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests\TestGetWebAppSlotMetrics.json">
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests\TestGetWebAppSlot.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests\TestManageSlotSlotConfigName.json">
Expand All @@ -242,39 +241,18 @@
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests\TestStartStopRestartWebAppSlot.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests\TestWebAppRegularSlotSwap.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests\TestWebAppSlotPublishingProfile.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests\TestWebAppSwapWithPreviewCompleteSlotSwap.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests\TestWebAppSwapWithPreviewResetSlotSwap.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppTests\TestCloneNewWebApp.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppTests\TestCloneNewWebAppAndDeploymentSlots.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppTests\TestCloneNewWebAppWithNewTrafficManager.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppTests\TestCreateNewAppOnAse.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppTests\TestCreateNewWebApp.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppTests\TestGetWebApp.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppTests\TestGetWebAppMetrics.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppTests\TestRemoveWebApp.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down Expand Up @@ -322,7 +300,7 @@
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
<Import Project="..\..\..\..\tools\Common.Dependencies.Test.targets" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
2 changes: 1 addition & 1 deletion src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/AppServicePlanTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void TestGetAppServicePlanMetrics()
WebsitesController.NewInstance.RunPsTest("Test-GetAppServicePlanMetrics");
}

[Fact]
[Fact(Skip = "TODO #5594: This test requires a pre-set AppService Environment with specific settings.")]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestCreateNewAppServicePlanInAse()
{
Expand Down
16 changes: 7 additions & 9 deletions src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/AppServicePlanTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,31 +333,29 @@ function Test-CreateNewAppServicePlanInAse
$whpName = Get-WebHostPlanName
$location = "West US"
$capacity = 1
$skuName = "S2"
$aseName = "asedemo"
$aseResourceGroupName = "appdemorg"
$skuName = "I1"
$skuTier = "Isolated"
$aseName = "asedemops"
$aseResourceGroupName = "asedemorg"

try
{
#Setup
New-AzureRmResourceGroup -Name $rgname -Location $location

# Test
$createResult = New-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $whpName -Location $location -Tier "Standard" -WorkerSize Medium -NumberOfWorkers $capacity -AseName $aseName -AseResourceGroupName $aseResourceGroupName
$createResult = New-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $whpName -Location $location -Tier $skuTier -WorkerSize Medium -NumberOfWorkers $capacity -AseName $aseName -AseResourceGroupName $aseResourceGroupName

# Assert
Assert-AreEqual $whpName $createResult.Name
Assert-AreEqual "Standard" $createResult.Sku.Tier
Assert-AreEqual "Isolated" $createResult.Sku.Tier
Assert-AreEqual $skuName $createResult.Sku.Name
Assert-AreEqual $capacity $createResult.Sku.Capacity

# Assert

$getResult = Get-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $whpName
Assert-AreEqual $whpName $getResult.Name
Assert-AreEqual "Standard" $getResult.Sku.Tier
Assert-AreEqual "Isolated" $getResult.Sku.Tier
Assert-AreEqual $skuName $getResult.Sku.Name
Assert-AreEqual $capacity $getResult.Sku.Capacity
}
finally
{
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/Common.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,14 @@ function Get-SecondaryLocation

if ($location -eq $null)
{
return "East US"
return "West US"
} else
{
return $location.Locations[1]
}
}

return "EastUS"
return "WestUS"
}

<#
Expand Down
14 changes: 7 additions & 7 deletions src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/SSLBindingTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ assign a custom domain to it and update global variable values.
#>

#Global variables
$rgname = "webappsslbindingrb"
$appname = "webappsslbindingtest"
$rgname = "lketmtestantps10"
$appname = "lketmtestantps10"
$slot = "testslot"
$prodHostname = "www.webappsslbindingtests.com"
$slotHostname = "testslot.webappsslbindingtests.com"
$thumbprint = "40D6600B0B8740C41BA4B3D13B967DDEF6ED1918"
$prodHostname = "www.adorenow.net"
$slotHostname = "testslot.adorenow.net"
$thumbprint = "ECC61863C674D5CEE90AB06373D37342368F0413"

<#
.SYNOPSIS
Expand Down Expand Up @@ -62,7 +62,7 @@ function Test-GetNewWebAppSSLBinding

# Test - Get commands for web app
$getResult = Get-AzureRMWebAppSSLBinding -ResourceGroupName $rgname -WebAppName $appname
Assert-AreEqual 2 $getResult.Count
Assert-AreEqual 1 $getResult.Count
$currentHostNames = $getResult | Select -expand Name
Assert-True { $currentHostNames -contains $createWebAppResult.Name }
$getResult = Get-AzureRMWebAppSSLBinding -ResourceGroupName $rgname -WebAppName $appname -Name $prodHostname
Expand Down Expand Up @@ -138,7 +138,7 @@ function Test-WebAppSSLBindingPipeSupport

# Test - Retrieve Ssl bindings using web app and web app slot objects
$getResult = $webapp | Get-AzureRMWebAppSSLBinding
Assert-AreEqual 2 $getResult.Count
Assert-AreEqual 1 $getResult.Count

$getResult = $webappslot | Get-AzureRMWebAppSSLBinding
Assert-AreEqual 1 $getResult.Count
Expand Down
63 changes: 61 additions & 2 deletions ...esourceManager/Websites/Commands.Websites.Test/ScenarioTests/WebAppBackupRestoreTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
# limitations under the License.
# ----------------------------------------------------------------------------------

# Snapshots require a Premium app to exist for several hours.
# Deploy a Premium app and update these global variables to re-record the snapshots tests.
$snapshotRgName = 'onesdksnapshots'
$snapshotAppName = 'onesdkpremapp'
$snapshotAppSlot = 'staging'

function Test-CreateNewWebAppBackup
{
$rgName = Get-ResourceGroupName
Expand Down Expand Up @@ -322,6 +328,56 @@ function Test-EditAndGetWebAppBackupConfigurationPiping
}
}

function Test-GetWebAppSnapshots
{
# Test named parameters
$snapshots = Get-AzureRmWebAppSnapshot -ResourceGroupName $snapshotRgName -Name $snapshotAppName
Assert-True { $snapshots.Length -gt 0 }
Assert-NotNull $snapshots[0]
Assert-NotNull $snapshots[0].SnapshotTime
Assert-AreEqual 'Production' $snapshots[0].Slot

# Test positional parameters
$snapshots = Get-AzureRmWebAppSnapshot $snapshotRgName $snapshotAppName
Assert-True { $snapshots.Length -gt 0 }
Assert-NotNull $snapshots[0]
Assert-NotNull $snapshots[0].SnapshotTime
Assert-AreEqual 'Production' $snapshots[0].Slot

# Test snapshots for slots
$snapshots = Get-AzureRmWebAppSnapshot -ResourceGroupName $snapshotRgName -Name $snapshotAppName -Slot $snapshotAppSlot
Assert-True { $snapshots.Length -gt 0 }
Assert-NotNull $snapshots[0]
Assert-NotNull $snapshots[0].SnapshotTime
Assert-AreEqual $snapshotAppSlot $snapshots[0].Slot

# Test piping
$app = Get-AzureRmWebApp -ResourceGroupName $snapshotRgName -Name $snapshotAppName
$snapshots = $app | Get-AzureRmWebAppSnapshot
Assert-True { $snapshots.Length -gt 0 }
Assert-NotNull $snapshots[0]
Assert-NotNull $snapshots[0].SnapshotTime
Assert-AreEqual 'Production' $snapshots[0].Slot
}

function Test-RestoreWebAppSnapshot
{
# Test overwrite
$snapshot = (Get-AzureRmWebAppSnapshot $snapshotRgName $snapshotAppName)[0]
Restore-AzureRmWebAppSnapshot -ResourceGroupName $snapshotRgName -Name $snapshotAppName -SnapshotTime $snapshot.SnapshotTime -Force -RecoverConfiguration

# Test restore to target slot
$target = Get-AzureRmWebAppSlot -ResourceGroupName $snapshotRgName -Name $snapshotAppName -Slot $snapshotAppSlot
Restore-AzureRmWebAppSnapshot -ResourceGroupName $snapshotRgName -Name $snapshotAppName -SnapshotTime $snapshot.SnapshotTime -RecoverConfiguration -TargetApp $target

# Test piping
$snapshot | Restore-AzureRmWebAppSnapshot -Force

# Test background job
$snapshot | Restore-AzureRmWebAppSnapshot -Force -AsJob
$job | Wait-Job
}

# Utility functions

# Creates a new web app
Expand Down Expand Up @@ -354,7 +410,10 @@ function Create-TestStorageAccount
$stoKey = (Get-AzureRmStorageAccountKey -ResourceGroupName $resourceGroup -Name $storageName).Key1;
# 2 hour access duration
$accessDuration = New-Object -TypeName TimeSpan(2,0,0)
$permissions = [Microsoft.WindowsAzure.Storage.Blob.SharedAccessBlobPermissions]::Write
$permissions = [Microsoft.WindowsAzure.Storage.Blob.SharedAccessBlobPermissions]::Write -bor
[Microsoft.WindowsAzure.Storage.Blob.SharedAccessBlobPermissions]::Read -bor
[Microsoft.WindowsAzure.Storage.Blob.SharedAccessBlobPermissions]::List -bor
[Microsoft.WindowsAzure.Storage.Blob.SharedAccessBlobPermissions]::Delete
$sasUri = Get-SasUri $storageName $stoKey $stoContainerName $accessDuration $permissions
return $sasUri
}
}
2 changes: 1 addition & 1 deletion src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/WebAppSlotTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public void TestWebAppRegularSlotSwap()
WebsitesController.NewInstance.RunPsTest("Test-WebAppRegularSlotSwap");
}

[Fact]
[Fact(Skip = "iss#6044 The test needs to be re-written")]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestWebAppSwapWithPreviewResetSlotSwap()
{
Expand Down
Loading