added verification and error message for authorizationrules rights

Author: Ajit Navasare (MINDTREE LIMITED)

src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusQueueTests.cs

@@ -36,12 +36,7 @@ public void ServiceBusQueue_CURD()
             ServiceBusController.NewInstance.RunPsTest(_logger, "ServiceBusQueueTests");
         }
 
-#if NETSTANDARD
-        [Fact(Skip = "Failed assertion: $namespaceListKeys.PrimaryConnectionString.Contains($updatedAuthRule.PrimaryKey)")]
-        [Trait(Category.RunType, Category.DesktopOnly)]
-#else
         [Fact]
-#endif
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void ServiceBusQueueAuth_CURD()
         {

src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusQueueTests.ps1

@@ -179,8 +179,8 @@ function ServiceBusQueueAuthTests
     Write-Debug "Get Queue authorizationRules connectionStrings"
     $namespaceListKeys = Get-AzServiceBusKey -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Queue $queueName -Name $authRuleName
 
-    Assert-True {$namespaceListKeys.PrimaryConnectionString.Contains($updatedAuthRule.PrimaryKey)}
-    Assert-True {$namespaceListKeys.SecondaryConnectionString.Contains($updatedAuthRule.SecondaryKey)}
+    Assert-True {$namespaceListKeys.PrimaryConnectionString -like "*$($updatedAuthRule.PrimaryKey)*"}
+    Assert-True {$namespaceListKeys.SecondaryConnectionString -like "*$($updatedAuthRule.SecondaryKey)*"}
 
 	# Regentrate the Keys 
 	$policyKey = "PrimaryKey"

src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusServiceTests.cs

@@ -36,12 +36,7 @@ public void ServiceBusNameSpace_CURD_Tests()
             ServiceBusController.NewInstance.RunPsTest(_logger, "ServiceBusTests");
         }
 
-#if NETSTANDARD
-        [Fact(Skip = "Failed assertion: $namespaceListKeys.PrimaryConnectionString.Contains($updatedAuthRule.PrimaryKey)")]
-        [Trait(Category.RunType, Category.DesktopOnly)]
-#else
         [Fact]
-#endif
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void ServiceBusNameSpaceAuth_CURD_Tests()
         {

src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusServiceTests.ps1

@@ -94,6 +94,16 @@ function ServiceBusNameSpaceAuthTests
     $createdNamespace = Get-AzServiceBusNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName
     Assert-AreEqual $createdNamespace.Name $namespaceName
 
+	Write-Debug "Create a Namespace Authorization Rule"    
+    Write-Debug "Auth Rule name : $authRuleName"
+    $result = New-AzServiceBusAuthorizationRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $authRuleName -Rights @("Listen","Send")
+	
+    Assert-AreEqual $authRuleName $result.Name
+    Assert-AreEqual 2 $result.Rights.Count
+    Assert-True { $result.Rights -Contains "Listen" }
+    Assert-True { $result.Rights -Contains "Send" }
+
+
     Write-Debug "Create a Namespace Authorization Rule"    
     Write-Debug "Auth Rule name : $authRuleName"
     $result = New-AzServiceBusAuthorizationRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $authRuleName -Rights @("Listen","Send")
@@ -170,8 +180,8 @@ function ServiceBusNameSpaceAuthTests
     Write-Debug "Get namespace authorizationRules connectionStrings"
     $namespaceListKeys = Get-AzServiceBusKey -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $authRuleName
 
-    Assert-True {$namespaceListKeys.PrimaryConnectionString.Contains($updatedAuthRule.PrimaryKey)}
-    Assert-True {$namespaceListKeys.SecondaryConnectionString.Contains($updatedAuthRule.SecondaryKey)}
+    Assert-True {$namespaceListKeys.PrimaryConnectionString -like "*$($updatedAuthRule.PrimaryKey)*"}
+    Assert-True {$namespaceListKeys.SecondaryConnectionString -like "*$($updatedAuthRule.SecondaryKey)*"}
 
 	$policyKey = "PrimaryKey"
 

src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusTopicTests.cs

@@ -36,12 +36,7 @@ public void ServiceBusTopic_CURD()
             ServiceBusController.NewInstance.RunPsTest(_logger, "ServiceBusTopicTests");
         }
 
-#if NETSTANDARD
-        [Fact(Skip = "Failed assertion: $namespaceListKeys.PrimaryConnectionString.Contains($updatedAuthRule.PrimaryKey)")]
-        [Trait(Category.RunType, Category.DesktopOnly)]
-#else
         [Fact]
-#endif
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void ServiceBusTopicAuth_CURD()
         {

src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusTopicTests.ps1

@@ -168,8 +168,8 @@ function ServiceBusTopicAuthTests
     Write-Debug "Get Topic authorizationRules connectionStrings"
     $namespaceListKeys = Get-AzServiceBusKey -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Topic $TopicName -Name $authRuleName
 
-    Assert-True {$namespaceListKeys.PrimaryConnectionString.Contains($updatedAuthRule.PrimaryKey)}
-    Assert-True {$namespaceListKeys.SecondaryConnectionString.Contains($updatedAuthRule.SecondaryKey)}
+    Assert-True {$namespaceListKeys.PrimaryConnectionString -like "*$($updatedAuthRule.PrimaryKey)*"}
+    Assert-True {$namespaceListKeys.SecondaryConnectionString -like "*$($updatedAuthRule.SecondaryKey)*"}
 
 	# Regentrate the Keys 
 	$policyKey = "PrimaryKey"

src/ServiceBus/ServiceBus.Test/SessionRecords/Microsoft.Azure.Commands.ServiceBus.Test.ScenarioTests.ServiceBusQueueTests/ServiceBusQueueAuth_CURD.json

@@ -19,6 +19,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* added verification and error message for authorizationrules rights if only 'Manage' is assigned
 
 ## Version 1.2.1
 * Fix for issue #4938 - New-AzureRmServiceBusQueue returns BadRequest when setting MaxSizeInMegabytes

src/ServiceBus/ServiceBus.Test/SessionRecords/Microsoft.Azure.Commands.ServiceBus.Test.ScenarioTests.ServiceBusServiceTests/ServiceBusNameSpaceAuth_CURD_Tests.json

@@ -17,6 +17,7 @@
 using System.Collections.Generic;
 using Microsoft.Azure.Management.ServiceBus.Models;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
+using System;
 
 namespace Microsoft.Azure.Commands.ServiceBus.Commands
 {
@@ -64,6 +65,12 @@ public override void ExecuteCmdlet()
                 PSSharedAccessAuthorizationRuleAttributes sasRule = new PSSharedAccessAuthorizationRuleAttributes();
                 sasRule.Rights = new List<AccessRights?>();
 
+                if (Array.Exists(Rights, element => element == "Manage") && !Array.Exists(Rights, element => element == "Listen") || !Array.Exists(Rights, element => element == "Send"))
+                {
+                    Exception exManage = new Exception("Assigning 'Manage' to rights requires ‘Listen and ‘Send' to be included with. e.g. @(\"Manage\",\"Listen\",\"Send\")");
+                    throw exManage;
+                }
+
                 foreach (string test in Rights)
                 {
                     sasRule.Rights.Add(ParseAccessRights(test));
@@ -100,6 +107,10 @@ public override void ExecuteCmdlet()
             {
                 WriteError(ServiceBusClient.WriteErrorforBadrequest(ex));
             }
+            catch (Exception ex)
+            {
+                WriteError(new ErrorRecord(ex, ex.Message, ErrorCategory.OpenError, ex));
+            }
 
         }
     }

src/ServiceBus/ServiceBus.Test/SessionRecords/Microsoft.Azure.Commands.ServiceBus.Test.ScenarioTests.ServiceBusTopicTests/ServiceBusTopicAuth_CURD.json

@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using System;
 using Microsoft.Azure.Commands.ServiceBus.Models;
 using Microsoft.Azure.Management.ServiceBus.Models;
 using System.Management.Automation;
@@ -82,10 +83,19 @@ public override void ExecuteCmdlet()
                 {
                     sasRule.Rights = new List<AccessRights?>();
                     if (Rights != null && Rights.Length > 0)
+                    {
+                        if (Array.Exists(Rights, element => element == "Manage") && !Array.Exists(Rights, element => element == "Listen") || !Array.Exists(Rights, element => element == "Send"))
+                        {
+                            Exception exManage = new Exception("Assigning 'Manage' to rights requires ‘Listen and ‘Send' to be included with. e.g. @(\"Manage\",\"Listen\",\"Send\")");
+                            throw exManage;
+                        }
+
                         foreach (string test in Rights)
                         {
                             sasRule.Rights.Add(ParseAccessRights(test));
                         }
+                    }
+                        
                 }
 
                 if (ParameterSetName.Equals(AuthoRuleInputObjectParameterSet))
@@ -145,6 +155,10 @@ public override void ExecuteCmdlet()
             {
                 WriteError(ServiceBusClient.WriteErrorforBadrequest(ex));
             }
+            catch (Exception ex)
+            {
+                WriteError(new ErrorRecord(ex, ex.Message, ErrorCategory.OpenError, ex));
+            }
         }
     }
 }