Merge branch 'master' into master

Author: lixiachena

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,60 @@
+---
+name: Az module bug report
+about: Report errors or unexpected behaviors for the Az module
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+
+- Make sure you are able to reproduce this issue on the latest released version of Az
+    - https://www.powershellgallery.com/packages/Az
+- 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 versions
+
+<!-- Please run (Get-Module -Name Az.* -ListAvailable) and paste the output in the below code block -->
+
+```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-AzureRmError and paste the output in the below code block -->
+
+```
+
+```

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

@@ -0,0 +1,52 @@
+---
+name: AzureRM module bug report
+about: Report errors or unexpected behaviors for the AzureRM module
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+
+- The AzureRM module has been replaced by the Az module; please see the following document for more information:
+    - https://docs.microsoft.com/en-us/powershell/azure/new-azureps-module-az
+- If you are able to, please migrate to the Az module and see if the issue is reproducible
+    - If so, please file an issue using the Az module template
+- Please search the existing issues to see if there has been a similar issue filed
+
+-->
+
+## Description
+
+
+
+## Steps to reproduce
+
+```powershell
+
+```
+
+## Module versions
+
+<!-- Please run (Get-Module -Name AzureRM* -ListAvailable) and paste the output in the below code block -->
+
+```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-AzureRmError and paste the output in the below code block -->
+
+```
+
+```

.github/ISSUE_TEMPLATE/azurerm-module-bug-report.md

@@ -0,0 +1,12 @@
+---
+name: Feature request
+about: Suggest a new feature or improvement
+title: ''
+labels: Feature Request
+assignees: ''
+
+---
+
+## Description of the new feature
+
+## Proposed implementation details (optional)

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,12 @@
+---
+name: Internal issue
+about: Azure PowerShell team only
+title: ''
+labels: Azure PS Team
+assignees: ''
+
+---
+
+## Description
+
+## Cost

.github/ISSUE_TEMPLATE/internal-issue.md

@@ -18,6 +18,9 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Update help for Import-AzAutomationDscNodeConfiguration
+* Added configuration name validation to Import-AzAutomationDscConfiguration cmdlet
+* Improved error handling for Import-AzAutomationDscConfiguration cmdlet
 
 ## Version 1.1.0
 * Added support for Python 2 runbooks

.github/PULL_REQUEST_TEMPLATE.md renamed to .github/PULL_REQUEST_TEMPLATE/PULL_REQUEST_TEMPLATE.md

@@ -173,15 +173,11 @@ public Model.DscConfiguration CreateConfiguration(
                 string fileContent = null;
                 string configurationName = String.Empty;
 
-                try
+                if (File.Exists(Path.GetFullPath(sourcePath)))
                 {
-                    if (File.Exists(Path.GetFullPath(sourcePath)))
-                    {
-                        fileContent = System.IO.File.ReadAllText(sourcePath);
-                    }
+                    fileContent = System.IO.File.ReadAllText(sourcePath);
                 }
-                catch (Exception)
-                {
+                else {
                     // exception in accessing the file path
                     throw new FileNotFoundException(
                                         string.Format(
@@ -192,6 +188,10 @@ public Model.DscConfiguration CreateConfiguration(
                 // configuration name is same as filename
                 configurationName = Path.GetFileNameWithoutExtension(sourcePath);
 
+                if (!System.Text.RegularExpressions.Regex.IsMatch(configurationName, "^([a-zA-Z]{1}([a-zA-Z0-9]|_){0,63})$")) {
+                    throw new PSInvalidOperationException("Invalid configuration name. Valid configuration names can contain only letters, numbers, and underscores. The name must start with a letter. The length of the name must be between 1 and 64 characters. ");
+                }
+
                 // for the private preview, configuration can be imported in Published mode only
                 // Draft mode is not implemented
                 if (!published)
@@ -238,14 +238,30 @@ public Model.DscConfiguration CreateConfiguration(
                         }
                 };
 
-                var configuration =
-                    this.automationManagementClient.DscConfiguration.CreateOrUpdate(
+                try
+                {
+                    var configuration =
+                        this.automationManagementClient.DscConfiguration.CreateOrUpdate(
                         resourceGroupName,
                         automationAccountName,
                         configurationName,
                         configurationCreateParameters);
 
-                return new Model.DscConfiguration(resourceGroupName, automationAccountName, configuration);
+                    return new Model.DscConfiguration(resourceGroupName, automationAccountName, configuration);
+                }
+                catch (Microsoft.Azure.Management.Automation.Models.ErrorResponseException ex)
+                {
+                    if (ex.Response.Content != null)
+                    {
+                        throw new Microsoft.Azure.Management.Automation.Models.ErrorResponseException(ex.Response.Content, ex);
+                    }
+                    else {
+                        throw ex;
+                    }
+                }
+                catch (Exception ex) {
+                    throw ex;
+                }
             }
         }
 

src/Automation/Automation/ChangeLog.md

@@ -27,7 +27,7 @@ Specify the path of a .mof file.
 
 ### Example 1: Import a DSC node configuration into Automation
 ```
-PS C:\>Import-AzAutomationDscConfiguration -AutomationAccountName "Contoso17" -ResourceGroupName "ResourceGroup01" -ConfigurationName "ContosoConfiguration" -Path "C:\DSC\webserver.mof" -Force
+PS C:\>Import-AzAutomationDscNodeConfiguration -AutomationAccountName "Contoso17" -ResourceGroupName "ResourceGroup01" -ConfigurationName "ContosoConfiguration" -Path "C:\DSC\webserver.mof" -Force
 ```
 
 This command imports a DSC node configuration from the file named webserver.mof into the Automation account named Contoso17, under the DSC configuration ContosoConfiguration.
@@ -36,7 +36,7 @@ If there is an existing DSC node configuration named ContosoConfiguration.webser
 
 ### Example 2: Import a DSC node configuration into Automation and create a new build version and not overwrite existing NodeConfiguration.
 ```
-PS C:\>Import-AzAutomationDscConfiguration -AutomationAccountName "Contoso17" -ResourceGroupName "ResourceGroup01" -ConfigurationName "ContosoConfiguration" -Path "C:\DSC\webserver.mof" -IncrementNodeConfigurationBuild
+PS C:\>Import-AzAutomationDscNodeConfiguration -AutomationAccountName "Contoso17" -ResourceGroupName "ResourceGroup01" -ConfigurationName "ContosoConfiguration" -Path "C:\DSC\webserver.mof" -IncrementNodeConfigurationBuild
 ```
 
 This command imports a DSC node configuration from the file named webserver.mof into the Automation account named Contoso17, under the DSC configuration ContosoConfiguration.

src/Automation/Automation/Common/AutomationPSClientDSC.cs

@@ -129,11 +129,10 @@ function Test-Image
         Assert-AreEqual 1 $images.Count;
 
         # Update Image Tag
-        $image = Get-AzImage -ResourceGroupName $rgname -ImageName $imageName;
-        $image.Tags =  New-Object "System.Collections.Generic.Dictionary``2[System.String,System.String]";
-        $image.Tags.Add("test1", "testval3");
-        $image.Tags.Add("test2", "testval4");
-        Update-AzImage -ResourceGroupName $rgname -ImageName $imageName -Image $image;
+        $images[0] | Update-AzImage -Tag @{test1 = "testval3"; test2 = "testval4"};
+        Update-AzImage -ResourceGroupName $rgname -ImageName $imageName -Tag @{test1 = "testval3"; test2 = "testval4"};
+        Update-AzImage -Image $images[0] -Tag @{test1 = "testval3"; test2 = "testval4"};
+        Update-AzImage -ResourceId $images[0].Id -Tag @{test1 = "testval3"; test2 = "testval4"};
 
         $image = Get-AzImage -ResourceGroupName $rgname -ImageName $imageName;
         Assert-True {$image.Tags.ContainsKey("test1") }
@@ -215,7 +214,7 @@ function Test-ImageCapture
         $p = Add-AzVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 2 -VhdUri $dataDiskVhdUri2 -CreateOption Empty;
         $p = Add-AzVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 3 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
         $p = Remove-AzVMDataDisk -VM $p -Name 'testDataDisk3';
-        
+
         # OS & Image
         $user = "Foo12";
         $password = $PLACEHOLDER;

src/Automation/Automation/help/Import-AzAutomationDscNodeConfiguration.md

@@ -2083,11 +2083,19 @@ function Test-VirtualMachineScaleSetAutoRollback
         Assert-AreEqual 2 $vmss.Sku.Capacity;
         Assert-AreEqual $false $vmss.VirtualMachineProfile.StorageProfile.OsDisk.WriteAcceleratorEnabled;
 
+        $vmssVMsStatus = Get-AzVmssVM -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceView;
+        $vmssVMsStatusFullOutput = $vmssVMsStatus | fc | Out-String;
+        Assert-True { $vmssVMsStatusFullOutput.Contains("InstanceView") };
+
         $vmss2 = $vmss | Update-AzVmss -DisableAutoRollback $true;
         Assert-True { $vmss2.UpgradePolicy.AutomaticOSUpgradePolicy.DisableAutomaticRollback };
 
         $result = Get-AzVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -OSUpgradeHistory;
         Assert-Null $result
+
+        $vmssVMsStatus = Get-AzVmssVM -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceView;
+        $vmssVMsStatusFullOutput = $vmssVMsStatus | fc | Out-String;
+        Assert-True { $vmssVMsStatusFullOutput.Contains("InstanceView") };
     }
     finally
     {

src/Compute/Compute.Test/ScenarioTests/ImageTests.ps1

@@ -19,6 +19,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Add Tag and ResourceId parameters to Update-AzImage cmdlet
+* Get-AzVmssVM without instance ID and with InstanceView can list VMSS VMs with instance view.
 
 ## Version 1.3.0
 * AEM extension: Add support for UltraSSD and P60,P70 and P80 disks

src/Compute/Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.ps1

@@ -57,22 +57,22 @@ public override void ExecuteCmdlet()
 
         [Parameter(
             ParameterSetName = "DefaultParameter",
-            Position = 1,
+            Position = 0,
             Mandatory = true,
             ValueFromPipelineByPropertyName = true)]
         [ResourceGroupCompleter]
         public string ResourceGroupName { get; set; }
 
         [Parameter(
             ParameterSetName = "DefaultParameter",
-            Position = 2,
+            Position = 1,
             Mandatory = true,
             ValueFromPipelineByPropertyName = true)]
         public string Name { get; set; }
 
         [Parameter(
             ParameterSetName = "DefaultParameter",
-            Position = 3,
+            Position = 2,
             Mandatory = true,
             ValueFromPipeline = true)]
         public PSContainerService ContainerService { get; set; }
@@ -107,22 +107,22 @@ public override void ExecuteCmdlet()
 
         [Parameter(
             ParameterSetName = "DefaultParameter",
-            Position = 1,
+            Position = 0,
             Mandatory = true,
             ValueFromPipelineByPropertyName = true)]
         [ResourceGroupCompleter]
         public string ResourceGroupName { get; set; }
 
         [Parameter(
             ParameterSetName = "DefaultParameter",
-            Position = 2,
+            Position = 1,
             Mandatory = true,
             ValueFromPipelineByPropertyName = true)]
         public string Name { get; set; }
 
         [Parameter(
             ParameterSetName = "DefaultParameter",
-            Position = 3,
+            Position = 2,
             Mandatory = true,
             ValueFromPipeline = true)]
         public PSContainerService ContainerService { get; set; }