Merge pull request #5585 from markcowl/websimple

Website convenience cmdlets

Author: Maddie Clayton

src/ResourceManager/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj

@@ -201,6 +201,7 @@
     <Compile Include="Utilities\Models\DeploymentVariable.cs" />
     <Compile Include="Utilities\Models\FilterResourcesOptions.cs" />
     <Compile Include="Utilities\Models\GenericResource.cs" />
+    <Compile Include="Utilities\Models\Location.cs" />
     <Compile Include="Utilities\Models\ResourceGroupDeployment.cs" />
     <Compile Include="Utilities\Models\ResourceIdentifier.cs" />
     <Compile Include="Utilities\ResourceManagementClientExtensions.cs" />

src/ResourceManager/Common/Commands.ResourceManager.Common/Utilities/Models/Location.cs

@@ -0,0 +1,71 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.Azure.Commands.ResourceManager.Common.Utilities.Models
+{
+    public class LocationConstraint
+    {
+        ICollection<string> _locations = new List<string>();
+
+        public LocationConstraint(params string[] locations)
+        {
+            foreach (var inputLocation in locations)
+            {
+                if (string.IsNullOrEmpty(inputLocation))
+                {
+                    throw new ArgumentNullException(nameof(inputLocation));
+                }
+
+                _locations.Add(Canonicalize(inputLocation));
+            }
+        }
+        static string Canonicalize(string input)
+        {
+            var builder = new StringBuilder();
+            var skipChars = new[] { ' ', '-' };
+            foreach (char c in input.ToLowerInvariant())
+            {
+                if (!skipChars.Contains(c))
+                {
+                    builder.Append(c);
+                }
+            }
+
+            return builder.ToString();
+        }
+
+        public bool Match(string other)
+        {
+            if (!string.IsNullOrWhiteSpace(other))
+            {
+
+                var canonical = Canonicalize(other);
+                foreach (var location in _locations)
+                {
+                    if (string.Equals(location, canonical, StringComparison.Ordinal))
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return _locations.Count == 0;
+        }
+    }
+}

src/ResourceManager/Websites/AzureRM.Websites.Netcore.psd1

@@ -54,7 +54,7 @@ PowerShellVersion = '5.1'
 RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.10.0'; })
 
 # Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = '.\Microsoft.Azure.Management.Websites.dll'
+RequiredAssemblies = '.\Microsoft.Azure.Management.Websites.dll', '.\Microsoft.Azure.Commands.Common.Strategies.3.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
 # ScriptsToProcess = @()

src/ResourceManager/Websites/AzureRM.Websites.psd1

@@ -54,7 +54,7 @@ CLRVersion = '4.0'
 RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.3.1'; })
 
 # Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = '.\Microsoft.Azure.Management.Websites.dll'
+RequiredAssemblies = '.\Microsoft.Azure.Management.Websites.dll', '.\Microsoft.Azure.Commands.Common.Strategies.3.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
 # ScriptsToProcess = @()

src/ResourceManager/Websites/ChangeLog.md

@@ -20,6 +20,8 @@
 ## Current Release
 * Fixed issue with importing aliases
 
+* New-AzureRMWebApp - added parameter set for simplified WebApp creation, with local git repository support.
+
 ## 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

src/ResourceManager/Websites/Commands.Websites.Test/Commands.Websites.Test.csproj

@@ -334,4 +334,5 @@
   </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')" />
 </Project>

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

@@ -70,6 +70,14 @@ function Test-CreateNewWebAppBackupPiping
         Assert-AreEqual $backupName $backup.BackupName
         Assert-NotNull $backup.StorageAccountUrl
 
+		$count = 0
+		while (($backup.BackupStatus -like "Created" -or $backup.BackupStatus -like "InProgress") -and $count -le 20)
+		{
+			Wait-Seconds 30
+		    $backup = $backup | Get-AzureRmWebAppBackup
+			$count++
+		}
+
         # Test that it's possible to modify the return value of the cmdlet to make a new backup
         $backup.BackupName = $backupName2
         $backup2 = $backup | New-AzureRmWebAppBackup

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

@@ -35,7 +35,7 @@ public void TestCreateNewWebAppSlot()
             WebsitesController.NewInstance.RunPsTest("Test-CreateNewWebAppSlot");
         }
 
-        [Fact]
+        [Fact(Skip = "TODO #5594: This test requires a pre-set AppService Environment with specific settings.")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateNewWebAppSlotOnAse()
         {

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

@@ -357,7 +357,7 @@ function Test-CloneWebAppSlot
 		Assert-AreEqual $serverFarm2.Id $webapp2.ServerFarmId
 
 		# Clone web app to slot
-		$slot2 = New-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $destAppName -Slot $slotname -AppServicePlan $planName -SourceWebApp $slot1
+		$slot2 = New-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $destAppName -Slot $slotname -AppServicePlan $destPlanName -SourceWebApp $slot1
 		$appWithSlotName2 = "$destAppName/$slotname"
 
 		# Assert
@@ -445,14 +445,14 @@ function Test-CreateNewWebAppSlotOnAse
 	$slotname = "staging"
 	$location = "West US"
 	$planName = "travel_production_plan"
-	$aseName = "asedemo"
+	$aseName = "asedemops"
 
 	$apiversion = "2015-08-01"
 	$resourceType = "Microsoft.Web/sites"
 	try
 	{
 		#Setup
-		$serverFarm = Get-AzureRmAppServicePlan -ResourceGroupName $rgname -Name  $planName
+		$serverFarm = Get-AzureRmAppServicePlan | select -First 1
 
 		# Create new web app
 		$actual = New-AzureRmWebApp -ResourceGroupName $rgname -Name $appname -Location $location -AppServicePlan $planName -AseName $aseName

src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/WebAppTests.cs

@@ -37,7 +37,7 @@ public void TestCreateNewWebApp()
             WebsitesController.NewInstance.RunPsTest("Test-CreateNewWebApp");
         }
 
-        [Fact]
+        [Fact(Skip = "TODO #5594: This test requires a pre-set AppService Environment with specific settings.")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateNewAppOnAse()
         {
@@ -79,7 +79,7 @@ public void TestCloneNewWebAppAndDeploymentSlots()
             WebsitesController.NewInstance.RunPsTest(xunitLogger, "Test-CloneNewWebAppAndDeploymentSlots");
         }
 
-        [Fact]
+        [Fact(Skip = "TODO #5594: This test requires a pre-set Traffic Manger Profile with specific settings.")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCloneNewWebAppWithNewTrafficManager()
         {

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

@@ -531,7 +531,7 @@ function Test-CreateNewWebAppOnAse
 	$wname = Get-WebsiteName
 	$location = "West US"
 	$whpName = "travel_production_plan"
-	$aseName = "asedemo"
+	$aseName = "asedemops"
 	$apiversion = "2015-08-01"
 	$resourceType = "Microsoft.Web/sites"
 	try