Merge pull request #6239 from sergey-shandar/sergey-websites3

Websites: Websites.Strategies are replaced by Common.Strategies library.

Author: vladimir-shcherbakov

src/ResourceManager/Common/Commands.Common.Strategies.UnitTest/AsyncCmdletExtensionsTest.cs

@@ -37,7 +37,7 @@ public string Location
             public async Task<ResourceConfig<RG>> CreateConfigAsync()
                 => new ResourceConfig<RG>(
                     new ResourceStrategy<RG>(
-                        null, 
+                        null,
                         async (c, p) => new RG(),
                         null,
                         null,
@@ -51,7 +51,7 @@ public async Task<ResourceConfig<RG>> CreateConfigAsync()
 
         class AsyncCmdlet : IAsyncCmdlet
         {
-            public CancellationToken CancellationToken { get; } 
+            public CancellationToken CancellationToken { get; }
                 = new CancellationToken();
 
             public IEnumerable<KeyValuePair<string, object>> Parameters
@@ -89,6 +89,11 @@ public void WriteVerbose(string message)
             {
                 Assert.Equal("Str = \"str\"", message);
             }
+
+            public void WriteWarning(string message)
+            {
+                throw new NotImplementedException();
+            }
         }
 
         [Fact]
@@ -102,4 +107,4 @@ public async Task TestVerboseStream()
             await client.RunAsync("subscriptionId", parameters, asyncCmdlet);
         }
     }
-}
+}

src/ResourceManager/Common/Commands.Common.Strategies/AsyncCmdletExtensions.cs

@@ -191,6 +191,9 @@ public AsyncCmdlet(ICmdlet cmdlet)
             public void WriteVerbose(string message)
                 => Scheduler.BeginInvoke(() => Cmdlet.WriteVerbose(message));
 
+            public void WriteWarning(string message)
+                => Scheduler.BeginInvoke(() => Cmdlet.WriteWarning(message));
+
             public Task<bool> ShouldProcessAsync(string target, string action)
                 => Scheduler.Invoke(() => Cmdlet.ShouldProcess(target, action));
 
@@ -199,8 +202,6 @@ public void WriteObject(object value)
 
             public void ReportTaskProgress(ITaskProgress taskProgress)
                 => Scheduler.BeginInvoke(() => TaskProgressList.Add(taskProgress));
-
-
         }
     }
 }

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

@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Azure.Commands.Common.Strategies</RootNamespace>
-    <AssemblyName>Microsoft.Azure.Commands.Common.Strategies.3</AssemblyName>
+    <AssemblyName>Microsoft.Azure.Commands.Common.Strategies.4</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>

src/ResourceManager/Common/Commands.Common.Strategies/Common.Strategies.Netcore.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <AssemblyName>Microsoft.Azure.Commands.Common.Strategies</AssemblyName>
+    <AssemblyName>Microsoft.Azure.Commands.Common.Strategies.4</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.Common.Strategies</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>

src/ResourceManager/Common/Commands.Common.Strategies/IAsyncCmdlet.cs

@@ -29,9 +29,10 @@ public interface IAsyncCmdlet
         IEnumerable<KeyValuePair<string, object>> Parameters { get; }
 
         /// <summary>
+        /// Log additional information.
         /// Thread-safe `WriteVerbose` function.
         /// </summary>
-        /// <param name="message"></param>
+        /// <param name="message">The additional information to log</param>
         void WriteVerbose(string message);
 
         /// <summary>
@@ -40,11 +41,17 @@ public interface IAsyncCmdlet
         Task<bool> ShouldProcessAsync(string target, string action);
 
         /// <summary>
-        /// Thread-safe `WriteVerbose` function.
+        /// Thread-safe `WriteObject` function.
         /// </summary>
         /// <param name="value"></param>
         void WriteObject(object value);
 
+        /// <summary>
+        /// Thread-safe `WriteWarning` function.
+        /// </summary>
+        /// <param name="message"></param>
+        void WriteWarning(string message);
+
         /// <summary>
         /// Report task progress. The function is used to report current task and cmdlet progress.
         /// </summary>
@@ -61,4 +68,4 @@ public interface IAsyncCmdlet
         /// </summary>
         CancellationToken CancellationToken { get; }
     }
-}
+}

src/ResourceManager/Common/Commands.Common.Strategies/ICmdlet.cs

@@ -41,6 +41,12 @@ public interface ICmdlet
         /// <param name="value"></param>
         void WriteObject(object value);
 
+        /// <summary>
+        /// See also PowerShell `WriteWarning`.
+        /// </summary>
+        /// <param name="message"></param>
+        void WriteWarning(string message);
+
         /// <summary>
         /// See also PowerShell `WriteProgress`.
         /// </summary>
@@ -64,4 +70,4 @@ void WriteProgress(
         /// </summary>
         IEnumerable<KeyValuePair<string, object>> Parameters { get; }
     }
-}
+}

src/ResourceManager/Compute/AzureRM.Compute.Netcore.psd1

@@ -55,7 +55,7 @@ RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\AutoMapper.dll',
-    '.\Microsoft.Azure.Commands.Common.Strategies.dll', 
+    '.\Microsoft.Azure.Commands.Common.Strategies.4.dll', 
     '.\Microsoft.Azure.Management.Compute.dll',
     '.\Microsoft.Azure.Management.KeyVault.dll'
 

src/ResourceManager/Compute/AzureRM.Compute.psd1

@@ -62,7 +62,7 @@ RequiredAssemblies = '.\AutoMapper.dll', '.\Microsoft.Azure.Management.Compute.d
                '.\Microsoft.WindowsAzure.Commands.Sync.dll', 
                '.\Microsoft.WindowsAzure.Commands.Tools.Vhd.dll', 
                '.\Microsoft.WindowsAzure.Storage.dll', '.\System.Spatial.dll', 
-               '.\Microsoft.Azure.Commands.Common.Strategies.3.dll'
+               '.\Microsoft.Azure.Commands.Common.Strategies.4.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
 # ScriptsToProcess = @()

src/ResourceManager/Compute/Commands.Compute/Strategies/AsyncCmdletExtensions.cs

@@ -84,6 +84,9 @@ public void WriteProgress(
                         CurrentOperation = currentOperation,
                         PercentComplete = percentComplete,
                     });
+
+            public void WriteWarning(string message)
+                => _Cmdlet.WriteWarning(message);
         }
     }
 }

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

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

src/ResourceManager/Websites/AzureRM.Websites.psd1

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

src/ResourceManager/Websites/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* `New-AzureRMWebApp` is updated to use common algorithms from the Strategy library.
 
 ## Version 5.0.1
 * Set minimum dependency of module to PowerShell 5.0

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

@@ -259,6 +259,9 @@
     <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\TestCreateNewWebAppSimple.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppTests\TestRemoveWebApp.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

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

@@ -44,6 +44,13 @@ public void TestCreateNewAppOnAse()
             WebsitesController.NewInstance.RunPsTest("Test-CreateNewWebAppOnAse");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestCreateNewWebAppSimple()
+        {
+            WebsitesController.NewInstance.RunPsTest("Test-CreateNewWebAppSimple");
+        }
+
         [Fact(Skip = "Needs investigation. Fails running playback")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetWebApp()

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

@@ -768,4 +768,23 @@ function Test-WebAppPublishingProfile
 		Remove-AzureRmAppServicePlan -ResourceGroupName $rgname -Name  $planName -Force
 		Remove-AzureRmResourceGroup -Name $rgname -Force
 	}
+}
+
+<#
+.SYNOPSIS
+Tests creating a web app with a simple parameterset.
+#>
+function Test-CreateNewWebAppSimple
+{
+	$appName = Get-WebsiteName
+	try
+	{
+		$webapp = New-AzureRmWebApp -Name $appName
+
+		Assert-AreEqual $appName $webapp.Name
+	}
+	finally
+	{
+		Remove-AzureRmResourceGroup $appName
+	}
 }