Skip to content

Commit 7dd0254

Browse files
cormacpaynecormacpayne
authored
Merge pull request #5820 from v-Ajnava/preview_local
ServiceBus: updated New-AzureRmServiceBusGeoDRConfiguration help and fixed Rules cmdlet output
2 parents 5a8aa6b + 6205fc9 commit 7dd0254

File tree

5 files changed

+103
-16
lines changed

5 files changed

+103
-16
lines changed

‎src/ResourceManager/ServiceBus/ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
- Additional information about change #1
2020
-->
2121
## Current Release
22+
* updated New-AzureRmServiceBusGeoDRConfiguration help and fixed Rules cmdlet output
23+
* Fixed auto-forward properties in New-AzureRmServiceBusQueue and New-AzureRmServiceBusSubscription cmdlet
2224
* Updated to the latest version of the Azure ClientRuntime
2325

2426
## Version 0.6.3

‎src/ResourceManager/ServiceBus/Commands.ServiceBus/Microsoft.Azure.Commands.ServiceBus.format.ps1xml

Lines changed: 72 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<Configuration>
33
<ViewDefinitions>
44
<View>
5-
<Name>Microsoft.Azure.Commands.ServiceBus.Models.NamespaceAttributes</Name>
5+
<Name>Microsoft.Azure.Commands.ServiceBus.Models.PSNamespaceAttributes</Name>
66
<ViewSelectedBy>
7-
<TypeName>Microsoft.Azure.Commands.ServiceBus.Models.NamespaceAttributes</TypeName>
7+
<TypeName>Microsoft.Azure.Commands.ServiceBus.Models.PSNamespaceAttributes</TypeName>
88
</ViewSelectedBy>
99
<ListControl>
1010
<ListEntries>
@@ -49,5 +49,74 @@
4949
</ListEntries>
5050
</ListControl>
5151
</View>
52+
<View>
53+
<Name>Microsoft.Azure.Commands.ServiceBus.Models.PSRulesAttributes</Name>
54+
<ViewSelectedBy>
55+
<TypeName>Microsoft.Azure.Commands.ServiceBus.Models.PSRulesAttributes</TypeName>
56+
</ViewSelectedBy>
57+
<ListControl>
58+
<ListEntries>
59+
<ListEntry>
60+
<ListItems>
61+
<ListItem>
62+
<PropertyName>Name</PropertyName>
63+
</ListItem>
64+
<ListItem>
65+
<PropertyName>Id</PropertyName>
66+
</ListItem>
67+
<ListItem>
68+
<PropertyName>Type</PropertyName>
69+
</ListItem>
70+
<ListItem>
71+
<Label>FilterType </Label>
72+
<ScriptBlock>$_.FilterType </ScriptBlock>
73+
</ListItem>
74+
<ListItem>
75+
<Label>Action </Label>
76+
<ScriptBlock>
77+
if ($_.Action -ne $null -and $_.Action.SqlExpression -ne $null)
78+
{
79+
"SqlExpression: " + $_.Action.SqlExpression + " , CompatibilityLevel: " + $_.Action.CompatibilityLevel
80+
}
81+
else
82+
{
83+
$null
84+
}
85+
</ScriptBlock>
86+
</ListItem>
87+
<ListItem>
88+
<Label>SqlFilter </Label>
89+
<ScriptBlock>
90+
if ($_.SqlFilter -ne $null -and $_.SqlFilter.SqlExpression -ne $null)
91+
{
92+
"SqlExpression: " + $_.SqlFilter.SqlExpression + " , CompatibilityLevel: " + $_.SqlFilter.CompatibilityLevel
93+
}
94+
else
95+
{
96+
$null
97+
}
98+
</ScriptBlock>
99+
</ListItem>
100+
<ListItem>
101+
<Label>CorrelationFilter </Label>
102+
<ScriptBlock>
103+
if ($_.CorrelationFilter -ne $null)
104+
{
105+
"ContentType: " + $_.CorrelationFilter.ContentType + "`n" +
106+
"MessageId: " + $_.CorrelationFilter.MessageId + "`n" +
107+
"To: " + $_.CorrelationFilter.To + "`n" +
108+
"ReplyTo: " + $_.CorrelationFilter.ReplyTo + "`n" +
109+
"Label: " + $_.CorrelationFilter.Label + "`n" +
110+
"SessionId: " + $_.CorrelationFilter.SessionId + "`n" +
111+
"ReplyToSessionId: " + $_.CorrelationFilter.ReplyToSessionId + "`n" +
112+
"CorrelationId: " + $_.CorrelationFilter.CorrelationId
113+
}
114+
</ScriptBlock>
115+
</ListItem>
116+
</ListItems>
117+
</ListEntry>
118+
</ListEntries>
119+
</ListControl>
120+
</View>
52121
</ViewDefinitions>
53-
</Configuration>
122+
</Configuration>

‎src/ResourceManager/ServiceBus/Commands.ServiceBus/Models/PSRulesAttributes.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ public PSRulesAttributes(Rule rule)
5959
Type = rule.Type;
6060
Action = new ServiceBus.Models.PSActionAttributes(rule.Action);
6161
FilterType = rule.FilterType;
62-
SqlFilter = new PSSQLFilterAttributes(rule.SqlFilter);
62+
if (rule.FilterType.ToString().Equals("SqlFilter"))
63+
SqlFilter = new PSSQLFilterAttributes(rule.SqlFilter);
64+
if (rule.FilterType.ToString().Equals("CorrelationFilter"))
6365
CorrelationFilter = new PSCorrelationFilterAttributes(rule.CorrelationFilter);
6466
}
6567

‎src/ResourceManager/ServiceBus/Commands.ServiceBus/Utilities/ServiceBusClient.cs

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,11 @@ public PSQueueAttributes CreateUpdateQueue(string resourceGroupName, string name
235235
parameters.RequiresSession = queue.RequiresSession;
236236
if (queue.Status.HasValue)
237237
parameters.Status = queue.Status;
238-
238+
if (!string.IsNullOrEmpty(queue.ForwardDeadLetteredMessagesTo))
239+
parameters.ForwardDeadLetteredMessagesTo = queue.ForwardDeadLetteredMessagesTo;
240+
if (!string.IsNullOrEmpty(queue.ForwardTo))
241+
parameters.ForwardTo = queue.ForwardTo;
242+
239243
SBQueue response = Client.Queues.CreateOrUpdate(resourceGroupName, namespaceName, queueName, parameters);
240244
return new PSQueueAttributes(response);
241245
}
@@ -468,8 +472,11 @@ public PSSubscriptionAttributes CreateUpdateSubscription(string resourceGroupNam
468472
parameters.RequiresSession = subscription.RequiresSession;
469473
if (subscription.Status.HasValue)
470474
parameters.Status = subscription.Status;
475+
if (!string.IsNullOrEmpty(subscription.ForwardTo))
476+
parameters.ForwardTo = subscription.ForwardTo;
477+
if (!string.IsNullOrEmpty(subscription.ForwardDeadLetteredMessagesTo))
478+
parameters.ForwardDeadLetteredMessagesTo = subscription.ForwardDeadLetteredMessagesTo;
471479

472-
473480
var response = Client.Subscriptions.CreateOrUpdate(resourceGroupName, namespaceName, topicName, subscriptionName, parameters);
474481
return new PSSubscriptionAttributes(response);
475482
}
@@ -499,11 +506,19 @@ public bool DeleteSubscription(string resourceGroupName, string namespaceName, s
499506

500507
public PSRulesAttributes CreateUpdateRules(string resourceGroupName, string namespaceName, string topicName, string subscriptionName, string ruleName, PSRulesAttributes ruleAttributes)
501508
{
502-
var parameters = new Rule()
509+
var parameters = new Rule();
510+
parameters.FilterType = ruleAttributes.FilterType;
511+
parameters.Action = new Management.ServiceBus.Models.Action()
512+
{
513+
SqlExpression = ruleAttributes.Action.SqlExpression,
514+
CompatibilityLevel = ruleAttributes.Action.CompatibilityLevel
515+
};
516+
517+
if(ruleAttributes.FilterType.ToString().Equals("SqlFilter"))
518+
parameters.SqlFilter = new SqlFilter() { RequiresPreprocessing = ruleAttributes.SqlFilter.RequiresPreprocessing, SqlExpression = ruleAttributes.SqlFilter.SqlExpression };
519+
if (ruleAttributes.FilterType.ToString().Equals("CorrelationFilter"))
503520
{
504-
Action = new Management.ServiceBus.Models.Action(),
505-
SqlFilter = new SqlFilter() { RequiresPreprocessing = ruleAttributes.SqlFilter.RequiresPreprocessing, SqlExpression = ruleAttributes.SqlFilter.SqlExpression },
506-
CorrelationFilter = new CorrelationFilter()
521+
parameters.CorrelationFilter = new CorrelationFilter()
507522
{
508523
CorrelationId = ruleAttributes.CorrelationFilter.CorrelationId,
509524
MessageId = ruleAttributes.CorrelationFilter.MessageId,
@@ -514,9 +529,8 @@ public PSRulesAttributes CreateUpdateRules(string resourceGroupName, string name
514529
ReplyToSessionId = ruleAttributes.CorrelationFilter.ReplyToSessionId,
515530
ContentType = ruleAttributes.CorrelationFilter.ContentType,
516531
RequiresPreprocessing = ruleAttributes.CorrelationFilter.RequiresPreprocessing,
517-
}
518-
519-
};
532+
};
533+
}
520534

521535
var response = Client.Rules.CreateOrUpdate(resourceGroupName, namespaceName, topicName, subscriptionName, ruleName, parameters);
522536
return new PSRulesAttributes(response);

‎src/ResourceManager/ServiceBus/Commands.ServiceBus/help/New-AzureRmServiceBusGeoDRConfiguration.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ The **New-AzureRmServiceBusGeoDRConfiguration** cmdlet Creates a new Alias(Disas
4040

4141
### Example 1
4242
```powershell
43-
PS C:\> New-AzureRmServiceBusGeoDRConfiguration -ResourceGroupName "SampleResourceGroup" -Namespace "SampleNamespace_Primary" -Name "SampleDRCongifName" -PartnerNamespace "SampleNamespace_Secondary"
43+
PS C:\> New-AzureRmServiceBusGeoDRConfiguration -ResourceGroupName "SampleResourceGroup" -Namespace "SampleNamespace_Primary" -Name "SampleDRCongifName" -PartnerNamespace "/subscriptions/{SubscriptionId}/resourceGroups/SampleResourceGroup/providers/Microsoft.ServiceBus/namespaces/SampleNamespace_Secondary"
4444
4545
Name : SampleDRCongifName
4646
Id : /subscriptions/{SubscriptionId}/resourceGroups/SampleResourceGroup/providers/Microsoft.ServiceBus/namespaces/SampleNamespace_Primary/disasterRecoveryConfigs/SampleDRCongifName
4747
Type : Microsoft.ServiceBus/Namespaces/disasterrecoveryconfigs
4848
ProvisioningState : Accepted
49-
PartnerNamespace : SampleNamespace_Secondary
49+
PartnerNamespace : /subscriptions/{SubscriptionId}/resourceGroups/TestignGeoDR/providers/Microsoft.ServiceBus/namespaces/SampleNamespaceSecondary
5050
Role : Primary
5151
```
5252

@@ -145,7 +145,7 @@ Accept wildcard characters: False
145145
```
146146
147147
### -PartnerNamespace
148-
DR Configuration PartnerNamespace
148+
DR Configuration PartnerNamespace (ARM Id of PartnerNamespace [Secondary namespace])
149149
150150
```yaml
151151
Type: String

0 commit comments

Comments
 (0)