Merge branch 'master' into patch-7

Author: cormacpayne

.github/PULL_REQUEST_TEMPLATE.md

@@ -14,5 +14,5 @@
 - [ ] The PR does not introduce [breaking changes](../documentation/breaking-changes/breaking-changes-definition.md)
 - [ ] If applicable, the changes made in the PR have proper test coverage
 - [ ] For public API changes to cmdlets:
-    - [ ] a cmdlet design review was approved for the changes in [this repository](https://github.com/Azure/azure-powershell-cmdlet-review-pr)
+    - [ ] a cmdlet design review was approved for the changes in [this repository](https://github.com/Azure/azure-powershell-cmdlet-review-pr) (_Microsoft internal only_)
     - [ ] the markdown help files have been regenerated using the commands listed [here](../documentation/development-docs/help-generation.md#updating-all-markdown-files-in-a-module)

CONTRIBUTING.md

@@ -71,7 +71,7 @@ The following guidelines must be followed in **EVERY** pull request that is open
 - There are a [small number of commits](documentation/development-docs/cleaning-up-commits.md) that each have an informative message
 - All files shipped with a module should contain a proper Microsoft license header
 - For public API changes to cmdlets:
-    - a cmdlet design review was approved for the changes in [this repository](https://github.com/Azure/azure-powershell-cmdlet-review-pr)
+    - a cmdlet design review was approved for the changes in [this repository](https://github.com/Azure/azure-powershell-cmdlet-review-pr) (_Microsoft internal only_)
     - the markdown help files have been regenerated using the commands listed [here](documentation/development-docs/help-generation.md#updating-all-markdown-files-in-a-module)
 
 #### Testing guidelines

src/CognitiveServices/CognitiveServices.Test/CognitiveServices.Test.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="6.0.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.13.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.14.0-preview" />
   </ItemGroup>
 
 </Project>

src/Compute/Compute.Test/Compute.Test.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="27.1.0" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.2" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.13.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.14.0-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/Compute/Compute/ChangeLog.md

@@ -20,6 +20,7 @@
 -->
 ## Upcoming Release
 * Fixed miscellaneous typos across module
+* Update example in `Invoke-AzVMRunCommand` documentation to use correct parameter name
 * Update `-VolumeType` description in `Set-AzVMDiskEncryptionExtension` and `Set-AzVmssDiskEncryptionExtension` reference documentation
 
 ## Version 2.4.1

src/Compute/Compute/help/Invoke-AzVMRunCommand.md

@@ -40,7 +40,7 @@ Invoke a run command on the VM.
 
 ### Example 1
 ```
-PS C:\> Invoke-AzVMRunCommand -ResourceGroupName 'rgname' -Name 'vmname' -CommandId 'RunPowerShellScript' -ScriptPath 'sample.ps1' -Parameter @{param1 = "var1"; param2 = "var2"}
+PS C:\> Invoke-AzVMRunCommand -ResourceGroupName 'rgname' -VMName 'vmname' -CommandId 'RunPowerShellScript' -ScriptPath 'sample.ps1' -Parameter @{param1 = "var1"; param2 = "var2"}
 ```
 
 Invoke a run command of RunPowerShellScript with overriding the script 'sample.ps1' and the parameters on the VM of 'vmname' in resource group 'rgname'.

src/DataFactory/DataFactoryV2.Test/DataFactoryV2.Test.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.1.0" />
+    <PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.1.2" />
     <PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="3.11.6898.1" />
   </ItemGroup>
 

src/DataFactory/DataFactoryV2/Changelog.md

@@ -21,8 +21,9 @@
 ## Upcoming Release
 * Fix typo to capitalize "Windows" in 'New-AzDataFactoryEncryptValue" documentation
 * Fixed miscellaneous typos across module
-* Updated ADF .Net SDK version to 4.1.1 
+* Updated ADF .Net SDK version to 4.1.2 
 * Add parameter "DataProxyIntegrationRuntimeName", "DataProxyStagingLinkedServiceName" and "DataProxyStagingPath" for "Set-AzureRmDataFactoryV2IntegrationRuntime" cmd to enable set up Self-Hosted Integration Runtime as a proxy for SSIS Integration Runtime
+* Updated PSTriggerRun to show the triggered pipelines, message and properties, and PSActivityRun to show the activity type
 
 ## Version 1.1.3
 * Updated ADF .Net SDK version to 4.1.0

src/DataFactory/DataFactoryV2/DataFactoryV2.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.1.1" />
+    <PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.1.2" />
     <PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="3.11.6898.1" />
   </ItemGroup>
 

src/DataFactory/DataFactoryV2/Models/PSActivityRun.cs

@@ -13,6 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using System;
+using System.Collections.Generic;
 using Microsoft.Azure.Management.DataFactory.Models;
 
 namespace Microsoft.Azure.Commands.DataFactoryV2.Models
@@ -58,6 +59,14 @@ public string ActivityName
             }
         }
 
+        public string ActivityType
+        {
+            get
+            {
+                return this.activityRun.ActivityType;
+            }
+        }
+
         public string PipelineRunId
         {
             get
@@ -137,5 +146,13 @@ public object Error
                 return this.activityRun.Error;
             }
         }
+
+        public IDictionary<string, object> AdditionalProperties
+        {
+            get
+            {
+                return this.activityRun.AdditionalProperties;
+            }
+        }
     }
 }

src/DataFactory/DataFactoryV2/Models/PSTriggerRun.cs

@@ -13,6 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using System;
+using System.Collections.Generic;
 using Microsoft.Azure.Management.DataFactory.Models;
 
 namespace Microsoft.Azure.Commands.DataFactoryV2.Models
@@ -81,5 +82,37 @@ public string Status
                 return this.triggerRun.Status;
             }
         }
+
+        public IDictionary<string, string> TriggeredPipelines
+        {
+            get
+            {
+                return this.triggerRun.TriggeredPipelines;
+            }
+        }
+
+        public string Message
+        {
+            get
+            {
+                return this.triggerRun.Message;
+            }
+        }
+
+        public IDictionary<string, string> Properties
+        {
+            get
+            {
+                return this.triggerRun.Properties;
+            }
+        }
+
+        public IDictionary<string, object> AdditionalProperties
+        {
+            get
+            {
+                return this.triggerRun.AdditionalProperties;
+            }
+        }
     }
 }

src/DataLakeStore/DataLakeStore.Test/DataLakeStore.Test.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.4.2-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.13.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.14.0-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/Dns/Dns.Test/Dns.Test.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Dns" Version="3.0.1" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.13.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.14.0-preview" />
   </ItemGroup>
 
 </Project>

src/EventHub/EventHub.Test/ScenarioTests/EventHubsTests.ps1

@@ -120,6 +120,10 @@ function EventHubsAuthTests
 	$namespaceName = getAssetName "Eventhub-Namespace-"
 	$eventHubName = getAssetName "EventHub-"
 	$authRuleName = getAssetName "Eventhub-Namespace-AuthorizationRule"
+    $authRuleName = getAssetName "authorule-"
+	$authRuleNameListen = getAssetName "authorule-"
+	$authRuleNameSend = getAssetName "authorule-"
+	$authRuleNameAll = getAssetName "authorule-"
 
 	# Create ResourceGroup
 	Write-Debug " Create resource group"    
@@ -164,6 +168,23 @@ function EventHubsAuthTests
 	Assert-True { $result.Rights -Contains "Listen" }
 	Assert-True { $result.Rights -Contains "Send" }
 
+	$resultListen = New-AzEventHubAuthorizationRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -EventHub $eventHubName -Name $authRuleNameListen -Rights @("Listen")
+	Assert-AreEqual $authRuleNameListen $resultListen.Name
+    Assert-AreEqual 1 $resultListen.Rights.Count
+    Assert-True { $resultListen.Rights -Contains "Listen" }
+
+	$resultSend = New-AzEventHubAuthorizationRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -EventHub $eventHubName -Name $authRuleNameSend -Rights @("Send")
+	Assert-AreEqual $authRuleNameSend $resultSend.Name
+    Assert-AreEqual 1 $resultSend.Rights.Count
+    Assert-True { $resultSend.Rights -Contains "Send" }
+
+	$resultall3 = New-AzEventHubAuthorizationRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -EventHub $eventHubName -Name $authRuleNameAll -Rights @("Listen","Send","Manage")
+	Assert-AreEqual $authRuleNameAll $resultall3.Name
+    Assert-AreEqual 3 $resultall3.Rights.Count
+    Assert-True { $resultall3.Rights -Contains "Send" }
+	Assert-True { $resultall3.Rights -Contains "Listen" }
+	Assert-True { $resultall3.Rights -Contains "Manage" }
+
 	# Get Created Eventhub Authorization Rule
 	Write-Debug "Get created authorizationRule"
 	$createdAuthRule = Get-AzEventHubAuthorizationRule -ResourceGroup $resourceGroupName -Namespace $namespaceName -EventHub $eventHubName -Name $authRuleName

src/EventHub/EventHub.Test/ScenarioTests/NamespaceTests.ps1

@@ -26,13 +26,11 @@ function NamespaceAuthTests
 	$namespaceName = getAssetName "Eventhub-Namespace-"
 	$namespaceNameKafka = getAssetName "Eh-NamespaceKafka-"
 	$authRuleName =  getAssetName "Eventhub-Namespace-AuthorizationRule"
+	$authRuleName = getAssetName "authorule-"
+	$authRuleNameListen = getAssetName "authorule-"
+	$authRuleNameSend = getAssetName "authorule-"
+	$authRuleNameAll = getAssetName "authorule-"
 
-
-	$StartTime = Get-Date
-	$EndTime = $StartTime.AddHours(2.0)
-	New-AzEventHubAuthorizationRuleSASToken -ResourceId /subscriptions/854d368f-1828-428f-8f3c-f2affa9b2f7d/resourceGroups/v-ajnavtest/providers/Microsoft.EventHub/namespaces/Eventhub-Namespace1-1375/eventhubs/testingsastoken/authorizationRules/BaseAuthorizationRule -KeyType Primary -ExpiryTime $EndTime -StartTime $StartTime
-	
-
     Write-Debug " Create resource group"
     Write-Debug "ResourceGroup name : $resourceGroupName"
     New-AzResourceGroup -Name $resourceGroupName -Location $location -Force
@@ -66,6 +64,23 @@ function NamespaceAuthTests
     Assert-True { $result.Rights -Contains "Listen" }
     Assert-True { $result.Rights -Contains "Send" }
 
+	$resultListen = New-AzEventHubAuthorizationRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $authRuleNameListen -Rights @("Listen")
+	Assert-AreEqual $authRuleNameListen $resultListen.Name
+    Assert-AreEqual 1 $resultListen.Rights.Count
+    Assert-True { $resultListen.Rights -Contains "Listen" }
+
+	$resultSend = New-AzEventHubAuthorizationRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $authRuleNameSend -Rights @("Send")
+	Assert-AreEqual $authRuleNameSend $resultSend.Name
+    Assert-AreEqual 1 $resultSend.Rights.Count
+    Assert-True { $resultSend.Rights -Contains "Send" }
+
+	$resultAll3 = New-AzEventHubAuthorizationRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $authRuleNameAll -Rights @("Listen","Send","Manage")
+	Assert-AreEqual $authRuleNameAll $resultAll3.Name
+    Assert-AreEqual 3 $resultAll3.Rights.Count
+    Assert-True { $resultAll3.Rights -Contains "Send" }
+	Assert-True { $resultAll3.Rights -Contains "Listen" }
+	Assert-True { $resultAll3.Rights -Contains "Manage" }
+
     Write-Debug "Get created authorizationRule"
     $createdAuthRule = Get-AzEventHubAuthorizationRule -ResourceGroup $resourceGroupName -Namespace $namespaceName -Name $authRuleName
 
@@ -222,6 +237,11 @@ function NamespaceTests
     Write-Debug "Namespace name : $namespaceName2"
     $result = New-AzEventHubNamespace -ResourceGroup $secondResourceGroup -Name $namespaceName2 -Location $location
 
+	### change the Namespace SKU to Basic
+	Write-Debug "Namespace name : $namespaceName2"
+	$result = Set-AzEventHubNamespace -ResourceGroup $secondResourceGroup -Name $namespaceName2 -Location $location -SkuName "Basic"
+	Assert-AreEqual $result.Sku.Name "Basic" "Namespace SKU not changed."
+	   
     Write-Debug "Get all the namespaces created in the resourceGroup"
     $allCreatedNamespace = Get-AzEventHubNamespace -ResourceGroup $secondResourceGroup
 

src/EventHub/EventHub.Test/SessionRecords/Microsoft.Azure.Commands.EventHub.Test.ScenarioTests.EventHubsTests/EventHubsAuthorizationRulesCRUD.json

@@ -20,6 +20,9 @@
 ## Upcoming Release
 * Fixed miscellaneous typos across module
 * Fix for issue #9658 : Typo VirtualNteworkRule parameter in Set-AzEventHubNetworkRuleSet
+* Fix for issue #9558 : Set-AzEventHubNamespace is using PATCH instead of PUT
+* added EnableKafka parameter to Set-AzEventHubNamespace cmdlet
+* Fix for issue #9786 : cannot create a rule with Listen only rights
 
 ## Version 1.3.0
 * Added new cmmdlet added for generating SAS token : New-AzEventHubAuthorizationRuleSASToken

src/EventHub/EventHub.Test/SessionRecords/Microsoft.Azure.Commands.EventHub.Test.ScenarioTests.NamespaceTests/NamespaceAuthorizationRulesCRUD.json

@@ -50,7 +50,7 @@ public class NewAzureEventhubAuthorizationRules : AzureEventHubsCmdletBase
         [Alias(AliasAuthorizationRuleName)]
         public string Name { get; set; }
 
-        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "Rights, e.g.  \"Listen\",\"Send\",\"Manage\"")]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "Rights, e.g.  \"" + Manage + "\",\"" + Send + "\",\"" + Listen + "\"")]
         [ValidateNotNullOrEmpty]
         [ValidateSet("Listen", "Send", "Manage", IgnoreCase = true)]
         public string[] Rights { get; set; }
@@ -60,9 +60,9 @@ public override void ExecuteCmdlet()
             PSSharedAccessAuthorizationRuleAttributes sasRule = new PSSharedAccessAuthorizationRuleAttributes();
             sasRule.Rights = new List<string>();
 
-            if (Array.Exists(Rights, element => element == "Manage") && !Array.Exists(Rights, element => element == "Listen") || !Array.Exists(Rights, element => element == "Send"))
+            if (Array.Exists(Rights, element => element.Equals(Manage) && (!Array.Exists(Rights, element1 => element1.Equals(Listen)) || !Array.Exists(Rights, element1 => element1.Equals(Send)))))
             {
-                Exception exManage = new Exception("Assigning 'Manage' to rights requires ‘Listen and ‘Send' to be included with. e.g. @(\"Manage\",\"Listen\",\"Send\")");
+                Exception exManage = new Exception("Assigning '" + Manage + "' to rights requires '" + Listen + "' and '" + Send + "' to be included with. e.g. @(\"" + Manage + "\",\"" + Listen + "\",\"" + Send + "\")");
                 throw exManage;
             }
 

src/EventHub/EventHub.Test/SessionRecords/Microsoft.Azure.Commands.EventHub.Test.ScenarioTests.NamespaceTests/NamespaceCRUD.json

@@ -106,6 +106,12 @@ public abstract class AzureEventHubsCmdletBase : AzureRMCmdlet
         protected const string AliasResourceId = "ResourceId";
         protected const string AliasVirtualNetworkRule = "VirtualNteworkRule";
 
+        //Access Rights 
+        protected const string Manage = "Manage";
+        protected const string Send = "Send";
+        protected const string Listen = "Listen";
+
+
         protected struct SKU
         {
             internal const string Basic = "Basic";

src/EventHub/EventHub/ChangeLog.md

@@ -58,6 +58,8 @@ public class SetAzureEventHubNamespace : AzureEventHubsCmdletBase
         [Parameter(Mandatory = false, ParameterSetName = AutoInflateParameterSet, ValueFromPipelineByPropertyName = true, Position = 4, HelpMessage = "The eventhub throughput units.")]
         public int? SkuCapacity { get; set; }
 
+        public const string ChangeDesc = "'State' Parameter is being deprecated without being replaced";
+        [CmdletParameterBreakingChange("State", ChangeDescription = ChangeDesc)]
         [Parameter(Mandatory = false, ParameterSetName = NamespaceParameterSet, ValueFromPipelineByPropertyName = true, Position = 5, HelpMessage = "Disable/Enable Namespace.")]
         [Parameter(Mandatory = false, ParameterSetName = AutoInflateParameterSet, ValueFromPipelineByPropertyName = true, Position = 5, HelpMessage = "Disable/Enable Namespace.")]
         public Models.NamespaceState? State { get; set; }
@@ -79,6 +81,13 @@ public class SetAzureEventHubNamespace : AzureEventHubsCmdletBase
         [ValidateRange(0,20)]        
         public int? MaximumThroughputUnits { get; set; }
 
+        /// <summary>
+        /// Indicates whether Kafka is enabled.
+        /// </summary>
+        [Parameter(Mandatory = false, ParameterSetName = AutoInflateParameterSet, HelpMessage = "enabling or disabling Kafka for namespace")]
+        [Parameter(Mandatory = false, ParameterSetName = NamespaceParameterSet, HelpMessage = "enabling or disabling Kafka for namespace")]
+        public SwitchParameter EnableKafka { get; set; }
+
         public override void ExecuteCmdlet()
         {
             // Update a EventHub namespace 
@@ -87,11 +96,8 @@ public override void ExecuteCmdlet()
             if (ShouldProcess(target: Name, action: string.Format(Resources.UpdateNamespace, Name, ResourceGroupName)))
             {
                 try
-                {
-                    if (EnableAutoInflate.IsPresent)
-                        WriteObject(Client.UpdateNamespace(ResourceGroupName, Name, Location, SkuName, SkuCapacity, State, tagDictionary, true, MaximumThroughputUnits));
-                    else
-                        WriteObject(Client.UpdateNamespace(ResourceGroupName, Name, Location, SkuName, SkuCapacity, State, tagDictionary, false, MaximumThroughputUnits));
+                {                    
+                    WriteObject(Client.BeginCreateNamespace(ResourceGroupName, Name, Location, SkuName, SkuCapacity, tagDictionary, EnableAutoInflate.IsPresent, MaximumThroughputUnits, EnableKafka.IsPresent));                    
                 }
                 catch (Management.EventHub.Models.ErrorResponseException ex)
                 {

src/EventHub/EventHub/Cmdlets/AuthorizationRule/NewAzureEventhubAuthorizationRules.cs

@@ -137,7 +137,7 @@ public PSNamespaceAttributes UpdateNamespace(string resourceGroupName, string na
             if (maximumThroughputUnits.HasValue)
                 parameter.MaximumThroughputUnits = maximumThroughputUnits;
 
-            var response = Client.Namespaces.Update(resourceGroupName, namespaceName, parameter);
+            var response = Client.Namespaces.CreateOrUpdate(resourceGroupName, namespaceName, parameter);
 
             return new PSNamespaceAttributes(response);
         }