resolved format file issue and auto-forward properties for queue and subscription

Author: v-ajnava

src/ResourceManager/ServiceBus/ChangeLog.md

@@ -20,6 +20,7 @@
 -->
 ## Current Release
 * updated New-AzureRmServiceBusGeoDRConfiguration help and fixed Rules cmdlet output
+* Fixed auto-forward properties in New-AzureRmServiceBusQueue and New-AzureRmServiceBusSubscription cmdlet
 
 ## Version 0.6.3
 * Fix issue with Default Resource Group in CloudShell

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

@@ -74,39 +74,42 @@
               <ListItem>
                 <Label>Action </Label>
                 <ScriptBlock>
-                  if ($_.Action -ne null)
+                  if ($_.Action -ne $null -and $_.Action.SqlExpression -ne $null)
                   {
-                    "SqlExpression : " + $_.Action.SqlExpression  + " ," + "`n"+ " CompatibilityLevel : " +  $_.Action.CompatibilityLevel + " , RequiresPreprocessing : " +  $_.Action.RequiresPreprocessing
+                  "SqlExpression: " + $_.Action.SqlExpression + " , CompatibilityLevel: " + $_.Action.CompatibilityLevel
                   }
                   else
                   {
-                    $null
+                  $null
                   }
                 </ScriptBlock>
               </ListItem>
               <ListItem>
                 <Label>SqlFilter </Label>
                 <ScriptBlock>
-                  if ($_.SqlFilter -ne null)
-                  {                  
-                    "SqlExpression : " + $_.SqlFilter.SqlExpression + " , CompatibilityLevel : " +  $_.SqlFilter.CompatibilityLevel+ " , RequiresPreprocessing : " +  $_.SqlFilter.RequiresPreprocessing
+                  if ($_.SqlFilter -ne $null -and $_.SqlFilter.SqlExpression -ne $null)
+                  {
+                  "SqlExpression: " + $_.SqlFilter.SqlExpression + " , CompatibilityLevel: " + $_.SqlFilter.CompatibilityLevel
                   }
                   else
                   {
-                    $null
+                  $null
                   }
-               </ScriptBlock>
+                </ScriptBlock>
               </ListItem>
               <ListItem>
                 <Label>CorrelationFilter </Label>
                 <ScriptBlock>
-                  if ($_.CorrelationFilter)
-                  {
-                    "CorrelationId : " + $_.CorrelationFilter.CorrelationId + " , MessageId : " +  $_.CorrelationFilter.MessageId + " , To : " +  $_.CorrelationFilter.To + " , ReplyTo : " +  $_.CorrelationFilter.ReplyTo + " , Label : " +  $_.CorrelationFilter.Label + " , SessionId : " +  $_.CorrelationFilter.SessionId + " , ReplyToSessionId : " +  $_.CorrelationFilter.ReplyToSessionId + " , ContentType : " +  $_.CorrelationFilter.ContentType + " , RequiresPreprocessing : " +  $_.CorrelationFilter.RequiresPreprocessing
-                  }
-                  else
+                  if ($_.CorrelationFilter -ne $null)
                   {
-                    $null
+                    "ContentType: " +  $_.CorrelationFilter.ContentType + "`n" +
+                    "MessageId: " + $_.CorrelationFilter.MessageId + "`n" +
+                    "To: " + $_.CorrelationFilter.To + "`n" +
+                    "ReplyTo: " + $_.CorrelationFilter.ReplyTo + "`n" +
+                    "Label: " +  $_.CorrelationFilter.Label + "`n" +
+                    "SessionId: " +  $_.CorrelationFilter.SessionId + "`n" +
+                    "ReplyToSessionId: " +  $_.CorrelationFilter.ReplyToSessionId + "`n" +
+                    "CorrelationId: " +  $_.CorrelationFilter.CorrelationId
                   }
                 </ScriptBlock>
               </ListItem>

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

@@ -59,7 +59,9 @@ public PSRulesAttributes(Rule rule)
             Type = rule.Type;
             Action = new ServiceBus.Models.PSActionAttributes(rule.Action);
             FilterType = rule.FilterType;
-            SqlFilter = new PSSQLFilterAttributes(rule.SqlFilter);
+            if (rule.FilterType.ToString().Equals("SqlFilter"))
+                SqlFilter = new PSSQLFilterAttributes(rule.SqlFilter);
+            if (rule.FilterType.ToString().Equals("CorrelationFilter"))
             CorrelationFilter = new PSCorrelationFilterAttributes(rule.CorrelationFilter);
         }
 

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

@@ -235,7 +235,11 @@ public PSQueueAttributes CreateUpdateQueue(string resourceGroupName, string name
                 parameters.RequiresSession = queue.RequiresSession;
             if (queue.Status.HasValue)
                 parameters.Status = queue.Status;
-        
+            if (!string.IsNullOrEmpty(queue.ForwardDeadLetteredMessagesTo))
+                parameters.ForwardDeadLetteredMessagesTo = queue.ForwardDeadLetteredMessagesTo;
+            if (!string.IsNullOrEmpty(queue.ForwardTo))
+                parameters.ForwardTo = queue.ForwardTo;
+
             SBQueue response = Client.Queues.CreateOrUpdate(resourceGroupName, namespaceName, queueName, parameters);
             return new PSQueueAttributes(response);
         }
@@ -468,8 +472,11 @@ public PSSubscriptionAttributes CreateUpdateSubscription(string resourceGroupNam
                 parameters.RequiresSession = subscription.RequiresSession;
             if (subscription.Status.HasValue)
                 parameters.Status = subscription.Status;
+            if (!string.IsNullOrEmpty(subscription.ForwardTo))
+                parameters.ForwardTo = subscription.ForwardTo;
+            if (!string.IsNullOrEmpty(subscription.ForwardDeadLetteredMessagesTo))
+                parameters.ForwardDeadLetteredMessagesTo = subscription.ForwardDeadLetteredMessagesTo;
 
-
             var response = Client.Subscriptions.CreateOrUpdate(resourceGroupName, namespaceName, topicName, subscriptionName, parameters);
             return new PSSubscriptionAttributes(response);
         }
@@ -499,11 +506,19 @@ public bool DeleteSubscription(string resourceGroupName, string namespaceName, s
 
         public PSRulesAttributes CreateUpdateRules(string resourceGroupName, string namespaceName, string topicName, string subscriptionName, string ruleName, PSRulesAttributes ruleAttributes)
         {
-            var parameters = new Rule()
+            var parameters = new Rule();
+            parameters.FilterType = ruleAttributes.FilterType;
+            parameters.Action = new Management.ServiceBus.Models.Action()
+            {
+                SqlExpression = ruleAttributes.Action.SqlExpression,
+                CompatibilityLevel = ruleAttributes.Action.CompatibilityLevel
+            };
+
+            if(ruleAttributes.FilterType.ToString().Equals("SqlFilter"))
+                parameters.SqlFilter = new SqlFilter() { RequiresPreprocessing = ruleAttributes.SqlFilter.RequiresPreprocessing, SqlExpression = ruleAttributes.SqlFilter.SqlExpression };
+            if (ruleAttributes.FilterType.ToString().Equals("CorrelationFilter"))
             {
-                Action = new Management.ServiceBus.Models.Action(),
-                SqlFilter = new SqlFilter() { RequiresPreprocessing = ruleAttributes.SqlFilter.RequiresPreprocessing, SqlExpression = ruleAttributes.SqlFilter.SqlExpression },
-                CorrelationFilter = new CorrelationFilter()
+                parameters.CorrelationFilter = new CorrelationFilter()
                 {
                     CorrelationId = ruleAttributes.CorrelationFilter.CorrelationId,
                     MessageId = ruleAttributes.CorrelationFilter.MessageId,
@@ -514,9 +529,8 @@ public PSRulesAttributes CreateUpdateRules(string resourceGroupName, string name
                     ReplyToSessionId = ruleAttributes.CorrelationFilter.ReplyToSessionId,
                     ContentType = ruleAttributes.CorrelationFilter.ContentType,
                     RequiresPreprocessing = ruleAttributes.CorrelationFilter.RequiresPreprocessing,
-                }            
-             
-            };
+                };
+            }
 
             var response = Client.Rules.CreateOrUpdate(resourceGroupName, namespaceName, topicName, subscriptionName, ruleName, parameters);
             return new PSRulesAttributes(response);