Skip to content

Commit e57664c

Browse files
author
maddieclayton
authored
Merge pull request #5455 from v-Ajnava/preview_local
Fix for issue 5450
2 parents dc69ae6 + 29c58e8 commit e57664c

File tree

6 files changed

+508
-487
lines changed

6 files changed

+508
-487
lines changed

src/ResourceManager/ServiceBus/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
- Additional information about change #1
2020
-->
2121
## Current Release
22+
* Added functionality fix for Remove-AzureRmServiceBusRule and Get-AzureRmServiceBusKey
2223

2324
## Version 0.6.0
2425
* Added below new commandlets for Geo Disaster Recovery operations.

src/ResourceManager/ServiceBus/Commands.ServiceBus.Test/ScenarioTests/ServiceBusRuleTests.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ function ServiceBusRuleTests
8282

8383
#remove Rule
8484
Remove-AzureRmServiceBusRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Topic $resultGetTopic.Name -Subscription $subName -Name $ruleName -Force
85+
86+
# Get rule List to verfiy the deleted rule
87+
$ruleList_delete = Get-AzureRmServiceBusRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Topic $resultGetTopic.Name -Subscription $subName
88+
Assert-AreEqual $ruleList_delete.Count 0 "Rule List: Rule count not equal to Zero delete"
8589

8690
# Delete the created/Updated Subscription
8791
$ResultDeleteTopic = Remove-AzureRmServiceBusSubscription -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Topic $ResulListTopic[0].Name -Name $resultGetSub.Name

src/ResourceManager/ServiceBus/Commands.ServiceBus.Test/SessionRecords/Microsoft.Azure.Commands.ServiceBus.Test.ScenarioTests.ServiceBusRuleTests/ServiceBusRule_CURD.json

Lines changed: 272 additions & 256 deletions
Large diffs are not rendered by default.

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

Lines changed: 229 additions & 229 deletions
Large diffs are not rendered by default.

src/ResourceManager/ServiceBus/Commands.ServiceBus/Cmdlets/AuthorizationRule/GetAzureServiceBusKey.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public override void ExecuteCmdlet()
7474
// Get a Topic List Keys for the specified AuthorizationRule
7575
if (ParameterSetName.Equals(TopicAuthoRuleParameterSet))
7676
{
77-
PSListKeysAttributes keys = Client.GetQueueKey(ResourceGroupName, Namespace, Topic, Name);
77+
PSListKeysAttributes keys = Client.GetTopicKey(ResourceGroupName, Namespace, Topic, Name);
7878
WriteObject(keys,true);
7979
}
8080

src/ResourceManager/ServiceBus/Commands.ServiceBus/Cmdlets/Rule/RemoveAzureServiceBusRule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public override void ExecuteCmdlet()
6363
Name,
6464
() =>
6565
{
66-
Client.DeleteNamespaceAuthorizationRules(ResourceGroupName, Namespace, Name);
66+
Client.DeleteRule(ResourceGroupName, Namespace, Topic, Subscription, Name);
6767

6868
if (PassThru)
6969
{

0 commit comments

Comments
 (0)