Merge branch 'release-4.3.0' into feature/updates4aug

Author: dragav

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/help/Add-AzureAnalysisServicesAccount.md

@@ -213,6 +213,8 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
+### Microsoft.Azure.Commands.AnalysisServices.Dataplane.AsAzureProfile
+
 ## NOTES
 Alias: Login-AzureAsAccount
 

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/help/Restart-AzureAnalysisServicesInstance.md

@@ -95,6 +95,8 @@ Accept wildcard characters: False
 
 ## OUTPUTS
 
+### System.Boolean
+
 ## NOTES
 Alias: Restart-AzureAsInstance
 

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Add-AzureRmApiManagementRegion.md

@@ -144,8 +144,14 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## INPUTS
 
+### PsApiManagement
+
+Parameter 'ApiManagement' accepts value of type 'PsApiManagement' from the pipeline
+
 ## OUTPUTS
 
+### Microsoft.Azure.Commands.ApiManagement.Models.PsApiManagement
+
 ## NOTES
 * The cmdlet writes updated **PsApiManagement** instance to pipeline.
 

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Backup-AzureRmApiManagement.md

@@ -134,6 +134,8 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
+### Microsoft.Azure.Commands.ApiManagement.Models.PsApiManagement
+
 ## NOTES
 
 ## RELATED LINKS

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagement.md

@@ -85,6 +85,8 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
+### System.Collections.Generic.List`1[Microsoft.Azure.Commands.ApiManagement.Models.PsApiManagement]
+
 ## NOTES
 
 ## RELATED LINKS

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagementProperty.md

@@ -105,6 +105,10 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
+### System.Collections.Generic.IList`1[Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models.PsApiManagementProperty]
+
+### Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models.PsApiManagementProperty
+
 ## NOTES
 
-## RELATED LINKS
+## RELATED LINKS

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagementSsoToken.md

@@ -67,6 +67,8 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
+### System.String
+
 ## NOTES
 
 ## RELATED LINKS

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Import-AzureRmApiManagementHostnameCertificate.md

@@ -137,6 +137,8 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
+### Microsoft.Azure.Commands.ApiManagement.Models.PsApiManagementHostnameCertificate
+
 ## NOTES
 
 ## RELATED LINKS

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/New-AzureRmApiManagement.md

@@ -265,6 +265,8 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
+### Microsoft.Azure.Commands.ApiManagement.Models.PsApiManagement
+
 ## NOTES
 
 ## RELATED LINKS

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/New-AzureRmApiManagementGroup.md

@@ -62,7 +62,9 @@ Accept wildcard characters: False
 ```
 
 ### -ExternalId
-For external groups, this property contains the id of the group from the external identity provider, e.g. Azure Active Directory aad://contoso5api.onmicrosoft.com/groups/12ad42b1-592f-4664-a77b4250-2f2e82579f4c; otherwise the value is null.```yaml
+For external groups, this property contains the id of the group from the external identity provider, e.g. Azure Active Directory aad://contoso5api.onmicrosoft.com/groups/12ad42b1-592f-4664-a77b4250-2f2e82579f4c; otherwise the value is null.
+
+```yaml
 Type: String
 Parameter Sets: (All)
 Aliases: 
@@ -105,7 +107,9 @@ Accept wildcard characters: False
 ```
 
 ### -Type
-Group Type. Custom Group is User defined Group. System Group includes Administrator, Developers and Guests. You cannot create or update a System Group.  External Group is groups from External Identity Provider like Azure Active Directory. This parameter is optional and by default assumed to be a Custom Group.```yaml
+Group Type. Custom Group is User defined Group. System Group includes Administrator, Developers and Guests. You cannot create or update a System Group.  External Group is groups from External Identity Provider like Azure Active Directory. This parameter is optional and by default assumed to be a Custom Group.
+
+```yaml
 Type: PsApiManagementGroupType
 Parameter Sets: (All)
 Aliases: 

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/New-AzureRmApiManagementHostnameConfiguration.md

@@ -70,6 +70,8 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
+### Microsoft.Azure.Commands.ApiManagement.Models.PsApiManagementHostnameConfiguration
+
 ## NOTES
 
 ## RELATED LINKS

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/New-AzureRmApiManagementRegion.md

@@ -103,6 +103,8 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
+### Microsoft.Azure.Commands.ApiManagement.Models.PsApiManagementRegion
+
 ## NOTES
 
 ## RELATED LINKS

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/New-AzureRmApiManagementVirtualNetwork.md

@@ -88,6 +88,8 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
+### Microsoft.Azure.Commands.ApiManagement.Models.PsApiManagementVirtualNetwork
+
 ## NOTES
 
 ## RELATED LINKS

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Remove-AzureRmApiManagement.md

@@ -114,6 +114,8 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
+### System.Boolean
+
 ## NOTES
 
 ## RELATED LINKS

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Remove-AzureRmApiManagementProductFromGroup.md

@@ -102,6 +102,8 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
+### System.Boolean
+
 ## NOTES
 
 ## RELATED LINKS

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Remove-AzureRmApiManagementRegion.md

@@ -93,8 +93,14 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## INPUTS
 
+### PsApiManagement
+
+Parameter 'ApiManagement' accepts value of type 'PsApiManagement' from the pipeline
+
 ## OUTPUTS
 
+### Microsoft.Azure.Commands.ApiManagement.Models.PsApiManagement
+
 ## NOTES
 
 ## RELATED LINKS

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Remove-AzureRmApiManagementUserFromGroup.md

@@ -99,6 +99,8 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
+### System.Boolean
+
 ## NOTES
 
 ## RELATED LINKS

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Restore-AzureRmApiManagement.md

@@ -129,6 +129,8 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
+### Microsoft.Azure.Commands.ApiManagement.Models.PsApiManagement
+
 ## NOTES
 
 ## RELATED LINKS

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Set-AzureRmApiManagementHostnames.md

@@ -148,8 +148,14 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## INPUTS
 
+### PsApiManagement
+
+Parameter 'ApiManagement' accepts value of type 'PsApiManagement' from the pipeline
+
 ## OUTPUTS
 
+### Microsoft.Azure.Commands.ApiManagement.Models.PsApiManagement
+
 ## NOTES
 
 ## RELATED LINKS

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Update-AzureRmApiManagementDeployment.md

@@ -259,8 +259,14 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## INPUTS
 
+### PsApiManagement
+
+Parameter 'ApiManagement' accepts value of type 'PsApiManagement' from the pipeline
+
 ## OUTPUTS
 
+### Microsoft.Azure.Commands.ApiManagement.Models.PsApiManagement
+
 ## NOTES
 
 ## RELATED LINKS

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Update-AzureRmApiManagementRegion.md

@@ -132,8 +132,14 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## INPUTS
 
+### PsApiManagement
+
+Parameter 'ApiManagement' accepts value of type 'PsApiManagement' from the pipeline
+
 ## OUTPUTS
 
+### Microsoft.Azure.Commands.ApiManagement.Models.PsApiManagement
+
 ## NOTES
 
 ## RELATED LINKS

src/ResourceManager/Automation/ChangeLog.md

@@ -20,6 +20,7 @@
 ## Current Release
 * Made changes to AutomationDSC* cmdlets to pull more than 100 records
 * Resolved the issue where the Verbose streams stop working after calling some Automation cmdlets (for example Get-AzureRmAutomationVariable, Get-AzureRmAutomationJob).
+* Support for NodeConfiguration Build versioning added in StartAzureAutomationDscCompilationJob and ImportAzureAutomationDscNodeConfiguration.
 * Bug fixes for existing issues - Fixes the alias issue is #3775 and the runOn alias and support for HybridWorkers.
 
 ## Version 3.2.1

src/ResourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj

@@ -169,6 +169,7 @@
     <Compile Include="UnitTests\GetAzureAutomationScheduleTest.cs" />
     <Compile Include="UnitTests\GetAzureAutomationVariableTest.cs" />
     <Compile Include="UnitTests\GetAzureAutomationWebhookTest.cs" />
+    <Compile Include="UnitTests\ImportAzureAutomationDscNodeConfigurationTest.cs" />
     <Compile Include="UnitTests\NewAzureAutomationAccountTest.cs" />
     <Compile Include="UnitTests\GetAzureAutomationAccountTest.cs" />
     <Compile Include="UnitTests\NewAzureAutomationCertificateTest.cs" />
@@ -194,6 +195,7 @@
     <Compile Include="UnitTests\SetAzureAutomationRunbookTest.cs" />
     <Compile Include="UnitTests\SetAzureAutomationScheduleTest.cs" />
     <Compile Include="UnitTests\SetAzureAutomationWebhookTest.cs" />
+    <Compile Include="UnitTests\StartAzureAutomationDscCompilationJobTest.cs" />
     <Compile Include="UnitTests\StartAzureAutomationRunbookTest.cs" />
     <Compile Include="UnitTests\StopAzureAutomationJobTest.cs" />
     <Compile Include="UnitTests\SuspendAzureAutomationJobTest.cs" />
@@ -239,6 +241,7 @@
     <None Include="ScenarioTests\Resources\fastjob.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="ScenarioTests\Resources\ContosoDscConfiguration.ps1" />
     <None Include="ScenarioTests\Resources\Test-Workflow.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

src/ResourceManager/Automation/Commands.Automation.Test/ScenarioTests/Resources/ContosoDscConfiguration.ps1

@@ -0,0 +1,15 @@
+Configuration ContosoDscConfiguration {
+
+    Node "TEST-PC1" {
+        WindowsFeature MyFeatureInstance {
+            Ensure = "Present"
+            Name =  "RSAT"
+        }
+        WindowsFeature My2ndFeatureInstance {
+            Ensure = "Present"
+            Name = "Bitlocker"
+        }
+    }
+} 
+
+ContosoDscConfiguration

src/ResourceManager/Automation/Commands.Automation.Test/UnitTests/ImportAzureAutomationDscNodeConfigurationTest.cs

@@ -0,0 +1,81 @@
+// ----------------------------------------------------------------------------------
+//
+// 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 Microsoft.Azure.Commands.Automation.Cmdlet;
+using Microsoft.Azure.Commands.Automation.Common;
+using Microsoft.WindowsAzure.Commands.Common.Test.Mocks;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
+using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
+using Moq;
+using Xunit;
+
+namespace Microsoft.Azure.Commands.ResourceManager.Automation.Test.UnitTests
+{
+    public class ImportAzureAutomationDscNodeConfigurationTest : RMTestBase
+    {
+        private Mock<IAutomationClient> mockAutomationClient;
+
+        private MockCommandRuntime mockCommandRuntime;
+
+        private ImportAzureAutomationDscNodeConfiguration cmdlet;
+
+        public ImportAzureAutomationDscNodeConfigurationTest()
+        {
+            this.mockAutomationClient = new Mock<IAutomationClient>();
+            this.mockCommandRuntime = new MockCommandRuntime();
+            
+            this.cmdlet = new ImportAzureAutomationDscNodeConfiguration
+            {
+                AutomationClient = this.mockAutomationClient.Object,
+                CommandRuntime = this.mockCommandRuntime
+            };
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void ImportAzureAutomationDscNodeConfigurationTestWithNullNodeConfiguration()
+        {
+            // Setup
+            string resourceGroupName = "resourceGroup";
+            string accountName = "automation";
+            string configurationName = "runbook";
+            string path = "/path/to/configuration";
+            string nodeConfigurationName = "runbook.configuration";
+            bool incrementNodeConfigBuild = false;
+
+            this.mockAutomationClient.Setup(
+                f =>
+                    f.CreateNodeConfiguration(resourceGroupName, accountName, path, configurationName, incrementNodeConfigBuild, false)
+                );
+
+            this.mockAutomationClient.Setup(
+                f => f.GetNodeConfiguration(resourceGroupName, accountName, nodeConfigurationName, null)
+                );
+
+            // Test
+            this.cmdlet.ResourceGroupName = resourceGroupName;
+            this.cmdlet.AutomationAccountName = accountName;
+            this.cmdlet.ConfigurationName = configurationName;
+            this.cmdlet.Path = path;
+            this.cmdlet.IncrementNodeConfigurationBuild = incrementNodeConfigBuild;
+            this.cmdlet.Force = false;
+
+            this.cmdlet.ExecuteCmdlet();
+
+            // Assert
+            this.mockAutomationClient.Verify(f => f.CreateNodeConfiguration(resourceGroupName, accountName, path, configurationName, incrementNodeConfigBuild, false),
+                Times.Once());
+        }
+    }
+}