Merge branch 'master' of https://github.com/Azure/azure-powershell into routing-source-dt

Author: anusapan

.github/ISSUE_TEMPLATE/az-preview-bug-report.md

@@ -0,0 +1,67 @@
+---
+name:  Az 4.x preview bug report 
+about: Report errors or unexpected behaviors specifically for the Az 4.0  module in preview
+title: ''
+labels: 'Az 4.x Preview', 'Azure PS Team'
+assignees: ''
+
+---
+
+<!--
+
+- This issue is specifically for reporting issues related to the preview versions of the Az 4.0 PowerShell module
+- Please search the existing issues to see if there has been a similar issue filed
+- For issue related to importing a module, please refer to our troubleshooting guide:
+    - https://github.com/Azure/azure-powershell/blob/master/documentation/troubleshoot-module-load.md
+
+-->
+
+## Description
+
+
+
+## Steps to reproduce
+
+```powershell
+
+```
+
+## Environment data
+
+<!-- Please run $PSVersionTable and paste the output in the below code block -->
+
+```
+
+```
+
+## Module version
+
+<!-- Please run (Get-Module  -ListAvailable) and paste the output in the below code block -->
+
+```powershell
+
+```
+
+## Azure Profile
+
+<!-- Please indicate the selected Azure profile, if any -->
+
+```powershell
+
+```
+
+## Debug output
+
+<!-- Set $DebugPreference='Continue' before running the repro and paste the resulting debug stream in the below code block -->
+
+```
+
+```
+
+## Error output
+
+<!-- Please run Resolve-AzError and paste the output in the below code block -->
+
+```
+
+```

src/Accounts/Accounts/Az.Accounts.psd1

@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '1.6.2'
+ModuleVersion = '1.6.3'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'

src/Accounts/Accounts/ChangeLog.md

@@ -19,6 +19,9 @@
 -->
 ## Upcoming Release
 
+## Version 1.6.3
+* Update telemetry and url rewriting for generated modules, fix windows unit tests.
+
 ## Version 1.6.2
 * Fixed miscellaneous typos across module
 * Support user-assigned MSI in Azure Functions Authentication (#9479)

src/Accounts/Accounts/CommonModule/EnvironmentExtensions.cs

@@ -237,8 +237,8 @@ internal static Uri PatchHost(this Uri baseUri, string newBase)
             if (baseUri.IsAbsoluteUri)
             {
                 output.Path = output.Uri.AppendPathRemoveDuplicates(baseUri.AbsolutePath);
-                output.Query = baseUri.Query;
-                output.Fragment = baseUri.Fragment;
+                output.Query = baseUri.Query?.TrimStart('?');
+                output.Fragment = baseUri.Fragment?.TrimStart('#');
                 return output.Uri;
             }
 

src/Accounts/Accounts/CommonModule/TelemetryProvider.cs

@@ -139,9 +139,11 @@ public virtual AzurePSQoSEvent CreateQosEvent(InvocationInfo invocationInfo, str
                 SessionId = correlationId,
                 ParameterSetName = parameterSetName,
                 InvocationName = invocationInfo?.InvocationName,
-                InputFromPipeline = invocationInfo?.PipelineLength > 0,
+                InputFromPipeline = invocationInfo?.PipelineLength > 0
             };
 
+            data.CustomProperties.Add("PSPreviewVersion", "4.0.0");
+
             if (invocationInfo != null)
             {
                 data.Parameters = string.Join(",", invocationInfo?.BoundParameters?.Keys?.ToArray());

src/Accounts/Accounts/CommonModule/UniqueId.cs

@@ -16,9 +16,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Net.Http;
-using Microsoft.Azure.Commands.Common.Authentication;
-using System.Net.Http.Headers;
-using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.Common
 {
@@ -28,19 +25,12 @@ namespace Microsoft.Azure.Commands.Common
     /// <summary>
     /// Pipeline step for adding x-ms-unique-id header
     /// </summary>
-    public class UserAgent
+    public class UniqueId
     {
-        Version _version;
+        private static UniqueId _instance;
+        public static UniqueId Instance => UniqueId._instance ?? (UniqueId._instance = new UniqueId());
 
-        public UserAgent(InvocationInfo invocation)
-            : this(invocation?.MyCommand?.Module?.Version ?? new Version("1.0.0"))
-        {
-        }
-
-        public UserAgent(Version moduleVersion)
-        {
-            _version = moduleVersion;
-        }
+        private int count;
 
         /// <summary>
         /// Pipeline delegate to add a unique id header to an outgoing request
@@ -53,13 +43,8 @@ public UserAgent(Version moduleVersion)
         /// <returns>Amended pipeline for retrieving a response</returns>
         public Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken token, Action cancel, SignalDelegate signal, NextDelegate next)
         {
-            var userAgents = AzureSession.Instance?.ClientFactory?.UserAgents ?? new ProductInfoHeaderValue[] { new ProductInfoHeaderValue("AzurePowerShell", $"Az{_version.ToString()}") };
-            // add user agent haeaders
-
-            foreach (var userAgent in userAgents)
-            {
-                request.Headers.UserAgent.Add(userAgent);
-            }
+            // add a header...
+            request.Headers.Add("x-ms-unique-id", Interlocked.Increment(ref this.count).ToString());
 
             // continue with pipeline.
             return next(request, token, cancel, signal);

src/Accounts/Accounts/CommonModule/UserAgent.cs

@@ -16,6 +16,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Net.Http;
+using Microsoft.Azure.Commands.Common.Authentication;
+using System.Net.Http.Headers;
+using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.Common
 {
@@ -25,12 +28,19 @@ namespace Microsoft.Azure.Commands.Common
     /// <summary>
     /// Pipeline step for adding x-ms-unique-id header
     /// </summary>
-    public class UniqueId
+    public class UserAgent
     {
-        private static UniqueId _instance;
-        public static UniqueId Instance => UniqueId._instance ?? (UniqueId._instance = new UniqueId());
+        Version _version;
 
-        private int count;
+        public UserAgent(InvocationInfo invocation)
+            : this(invocation?.MyCommand?.Module?.Version ?? new Version("1.0.0"))
+        {
+        }
+
+        public UserAgent(Version moduleVersion)
+        {
+            _version = moduleVersion;
+        }
 
         /// <summary>
         /// Pipeline delegate to add a unique id header to an outgoing request
@@ -43,8 +53,13 @@ public class UniqueId
         /// <returns>Amended pipeline for retrieving a response</returns>
         public Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken token, Action cancel, SignalDelegate signal, NextDelegate next)
         {
-            // add a header...
-            request.Headers.Add("x-ms-unique-id", Interlocked.Increment(ref this.count).ToString());
+            var userAgents = new ProductInfoHeaderValue[] { new ProductInfoHeaderValue("AzurePowerShell", $"Az4.0.0-preview") };
+            // add user agent haeaders
+
+            foreach (var userAgent in userAgents)
+            {
+                request.Headers.UserAgent.Add(userAgent);
+            }
 
             // continue with pipeline.
             return next(request, token, cancel, signal);

src/Accounts/Accounts/Properties/AssemblyInfo.cs

@@ -43,8 +43,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.6.2")]
-[assembly: AssemblyFileVersion("1.6.2")]
+[assembly: AssemblyVersion("1.6.3")]
+[assembly: AssemblyFileVersion("1.6.3")]
 #if !SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.PowerShell.Cmdlets.Accounts.Test")]
 #endif

src/Advisor/Advisor/Az.Advisor.psd1

@@ -51,7 +51,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.Advisor.dll'

src/Aks/Aks/Az.Aks.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\YamlDotNet.dll', '.\AutoMapper.dll'

src/AlertsManagement/AlertsManagement/Az.AlertsManagement.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.AlertsManagement.dll'

src/AnalysisServices/AnalysisServices/Az.AnalysisServices.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.Analysis.dll'

src/ApiManagement/ApiManagement/Az.ApiManagement.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\AutoMapper.dll', 

src/ApplicationInsights/ApplicationInsights/Az.ApplicationInsights.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.ApplicationInsights.dll'

src/Attestation/Attestation/Az.Attestation.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.Attestation.dll'

src/Automation/Automation.Test/ScenarioTests/UpdateManagementTests.cs

@@ -175,5 +175,13 @@ public void CreateLinuxIncludePackageNameMasksSUC()
         {
             TestRunner.RunTestScript("Test-CreateLinuxIncludedPackageNameMasksSoftwareUpdateConfiguration");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.Service, Category.Automation)]
+        public void CreateLinuxSucWithRebootSetting()
+        {
+            TestRunner.RunTestScript("Test-CreateLinuxSoftwareUpdateConfigurationWithRebootSetting");
+        }
     }
 }

src/Automation/Automation.Test/ScenarioTests/UpdateManagementTests.ps1

@@ -522,3 +522,43 @@ function Test-CreateLinuxIncludedPackageNameMasksSoftwareUpdateConfiguration() {
     WaitForProvisioningState $name "Succeeded"
 }
 
+
+<#
+Test-CreateLinuxOneTimeSoftwareUpdateConfigurationWithAllOption
+#>
+function Test-CreateLinuxSoftwareUpdateConfigurationWithRebootSetting {
+	$azureVMIdsLinux = @(
+        "/subscriptions/d2b38167-d3ca-4d1f-a020-948eee21b6bc/resourceGroups/ikanni-rhel76-hw-001-RG/providers/Microsoft.Compute/virtualMachines/ikanni-rhel76-hw-001",
+        "/subscriptions/d2b38167-d3ca-4d1f-a020-948eee21b6bc/resourceGroups/ikanni-rhel76-JPE-hw-002-RG/providers/Microsoft.Compute/virtualMachines/ikanni-rhel76-JPE-hw-002"
+    )
+
+    $name = "linx-suc-reboot"
+	$rebootSetting = "Never"
+    $startTime = ([DateTime]::Now).AddMinutes(10)
+	$s = New-AzAutomationSchedule -ResourceGroupName $rg `
+                                       -AutomationAccountName $aa `
+                                       -Name $name `
+                                       -Description linux-suc-reboot `
+                                       -OneTime `
+                                       -StartTime $startTime `
+                                       -ForUpdate
+
+    $suc = New-AzAutomationSoftwareUpdateConfiguration  -ResourceGroupName $rg `
+                                                             -AutomationAccountName $aa `
+                                                             -Schedule $s `
+                                                             -Linux `
+                                                             -AzureVMResourceId $azureVMIdsLinux `
+                                                             -NonAzureComputer $nonAzurecomputers `
+                                                             -Duration (New-TimeSpan -Hours 2) `
+                                                             -IncludedPackageClassification Security,Critical `
+                                                             -ExcludedPackageNameMask Mask01,Mask02 `
+                                                             -IncludedPackageNameMask Mask100 `
+															 -RebootSetting $rebootSetting
+	
+    Assert-NotNull $suc "New-AzAutomationSoftwareUpdateConfiguration returned null"
+    Assert-AreEqual $suc.Name $name "Name of created software update configuration didn't match given name"
+	Assert-AreEqual $suc.UpdateConfiguration.Linux.rebootSetting $rebootSetting "Reboot setting failed to match"
+
+    WaitForProvisioningState $name "Failed"
+}
+