Allow Get-AzLogicAppTriggerHistory and Get-AzLogicAppRunAction to return more than 30 results (#13846)

* Allow Get-AzLogicAppTriggerHistory to return more than 30 results.

* Allow Get-AzLogicAppRunAction to return more than 30 results

* Update change log

Author: mikejwhat

src/LogicApp/LogicApp.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2042
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30703.110
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LogicApp", "LogicApp\LogicApp.csproj", "{FFE4E475-B32C-4F89-9D52-F7CEBF709C74}"
 EndProject
@@ -38,6 +38,10 @@ Global
 		{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6BD6B80A-06AF-4B5B-9230-69CCFC6C8D64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6BD6B80A-06AF-4B5B-9230-69CCFC6C8D64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BD6B80A-06AF-4B5B-9230-69CCFC6C8D64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6BD6B80A-06AF-4B5B-9230-69CCFC6C8D64}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Release|Any CPU.ActiveCfg = Release|Any CPU

src/LogicApp/LogicApp/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Fix for Get-AzLogicAppTriggerHistory and Get-AzLogicAppRunAction only retrieving the first page of results
 
 ## Version 1.4.0
 * Fixed for Get-AzLogicAppRunHistory only retrieving the first page of results

src/LogicApp/LogicApp/Cmdlets/LogicApp/GetAzureLogicAppRunActionCommand.cs

@@ -18,6 +18,7 @@ namespace Microsoft.Azure.Commands.LogicApp.Cmdlets
 {
     using Microsoft.Azure.Commands.LogicApp.Utilities;
     using ResourceManager.Common.ArgumentCompleters;
+    using System;
     using System.Management.Automation;
 
     /// <summary>
@@ -49,6 +50,15 @@ public class GetAzureLogicAppRunActionCommand : LogicAppBaseCmdlet
         [ValidateNotNullOrEmpty]
         public string ActionName { get; set; }
 
+        [Parameter(Mandatory = false, HelpMessage = "Indicates the cmdlet should follow next page links.")]
+        [Alias("FL")]
+        public SwitchParameter FollowNextPageLink { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = "Specifies how many times to follow next page links if FollowNextPageLink is used.")]
+        [Alias("ML")]
+        [ValidateRange(1, Int32.MaxValue)]
+        public int MaximumFollowNextPageLink { get; set; } = int.MaxValue;
+
         #endregion Input Parameters
 
         /// <summary>
@@ -57,17 +67,22 @@ public class GetAzureLogicAppRunActionCommand : LogicAppBaseCmdlet
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
-
             if (string.IsNullOrEmpty(this.ActionName))
             {
-                var enumerator = LogicAppClient.GetWorkflowRunActions(this.ResourceGroupName, this.Name, this.RunName).GetEnumerator();
-                this.WriteObject(enumerator.ToIEnumerable<WorkflowRunAction>(), true);
+                var page = new Page<WorkflowRunAction>();
+                int i = 0;
+                do
+                {
+                    page = this.LogicAppClient.GetWorkflowRunActions(this.ResourceGroupName, this.Name, this.RunName, page.NextPageLink);
+                    this.WriteObject(page.GetEnumerator().ToIEnumerable<WorkflowRunAction>(), true);
+                    i++;
+                }
+                while (this.FollowNextPageLink && !string.IsNullOrWhiteSpace(page.NextPageLink) && i <= this.MaximumFollowNextPageLink);
             }
             else
             {
-                this.WriteObject(
-                    LogicAppClient.GetWorkflowRunAction(this.ResourceGroupName, this.Name, this.RunName, this.ActionName),
-                    true);
+                this.WriteObject(LogicAppClient.GetWorkflowRunAction(
+                    this.ResourceGroupName, this.Name, this.RunName, this.ActionName), true);
             }
         }
     }

src/LogicApp/LogicApp/Cmdlets/LogicApp/GetAzureLogicAppTriggerHistoryCommand.cs

@@ -18,6 +18,7 @@ namespace Microsoft.Azure.Commands.LogicApp.Cmdlets
 {
     using Microsoft.Azure.Commands.LogicApp.Utilities;
     using ResourceManager.Common.ArgumentCompleters;
+    using System;
     using System.Management.Automation;
 
     /// <summary>
@@ -51,6 +52,15 @@ public class GetAzureLogicAppTriggerHistoryCommand : LogicAppBaseCmdlet
         [ValidateNotNullOrEmpty]
         public string HistoryName { get; set; }
 
+        [Parameter(Mandatory = false, HelpMessage = "Indicates the cmdlet should follow next page links.")]
+        [Alias("FL")]
+        public SwitchParameter FollowNextPageLink { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = "Specifies how many times to follow next page links if FollowNextPageLink is used.")]
+        [Alias("ML")]
+        [ValidateRange(1, Int32.MaxValue)]
+        public int MaximumFollowNextPageLink { get; set; } = int.MaxValue;
+
         #endregion Input Parameters
 
         /// <summary>
@@ -61,10 +71,15 @@ public override void ExecuteCmdlet()
             base.ExecuteCmdlet();
             if (string.IsNullOrEmpty(this.HistoryName))
             {
-                var enumerator =
-                    LogicAppClient.GetWorkflowTriggerHistories(this.ResourceGroupName, this.Name, this.TriggerName)
-                        .GetEnumerator();
-                this.WriteObject(enumerator.ToIEnumerable<WorkflowTriggerHistory>(), true);
+                var page = new Page<WorkflowTriggerHistory>();
+                int i = 0;
+                do
+                {
+                    page = this.LogicAppClient.GetWorkflowTriggerHistories(this.ResourceGroupName, this.Name, this.TriggerName, page.NextPageLink);
+                    this.WriteObject(page.GetEnumerator().ToIEnumerable<WorkflowTriggerHistory>(), true);
+                    i++;
+                }
+                while (this.FollowNextPageLink && !string.IsNullOrWhiteSpace(page.NextPageLink) && i <= this.MaximumFollowNextPageLink);
             }
             else
             {

src/LogicApp/LogicApp/Utilities/LogicAppClientRunOperations.cs

@@ -82,9 +82,11 @@ public WorkflowRunAction GetWorkflowRunAction(string resourceGroupName, string w
         /// <param name="workflowName">Name of the workflow</param>
         /// <param name="runName">Name of the workflow run</param>
         /// <returns>Actions of the specified workflow run</returns>
-        public Page<WorkflowRunAction> GetWorkflowRunActions(string resourceGroupName, string workflowName, string runName)
+        public Page<WorkflowRunAction> GetWorkflowRunActions(string resourceGroupName, string workflowName, string runName, string nextPageLink = "")
         {
-            return (Page<WorkflowRunAction>)this.LogicManagementClient.WorkflowRunActions.List(resourceGroupName, workflowName, runName);
+            return string.IsNullOrWhiteSpace(nextPageLink) ?
+                (Page<WorkflowRunAction>)this.LogicManagementClient.WorkflowRunActions.List(resourceGroupName, workflowName, runName) :
+                (Page<WorkflowRunAction>)this.LogicManagementClient.WorkflowRunActions.ListNext(nextPageLink);
         }
     }
 }

src/LogicApp/LogicApp/Utilities/LogicAppClientTriggerOperations.cs

@@ -66,12 +66,12 @@ public WorkflowTriggerCallbackUrl GetWorkflowTriggerCallbackUrl(string resourceG
         /// <param name="triggerName">Name of the trigger</param>
         /// <returns>List of trigger histories</returns>
         public Page<WorkflowTriggerHistory> GetWorkflowTriggerHistories(string resourceGroupName, string workflowName,
-            string triggerName)
+            string triggerName, string nextPageLink = "")
         {
-            return
-                (Page<WorkflowTriggerHistory>)
-                    this.LogicManagementClient.WorkflowTriggerHistories.List(resourceGroupName, workflowName,
-                        triggerName);
+            return string.IsNullOrWhiteSpace(nextPageLink) ?
+                    (Page<WorkflowTriggerHistory>)this.LogicManagementClient.WorkflowTriggerHistories.List(
+                        resourceGroupName, workflowName, triggerName) :
+                    (Page<WorkflowTriggerHistory>)this.LogicManagementClient.WorkflowTriggerHistories.ListNext(nextPageLink);
         }
 
         /// <summary>

src/LogicApp/LogicApp/help/Get-AzLogicAppRunAction.md

@@ -1,4 +1,4 @@
----
+---
 external help file: Microsoft.Azure.PowerShell.Cmdlets.LogicApp.dll-Help.xml
 Module Name: Az.LogicApp
 ms.assetid: 2EA28B90-4BAE-45DF-BD2E-60C74F53FB7B
@@ -9,16 +9,19 @@ schema: 2.0.0
 # Get-AzLogicAppRunAction
 
 ## SYNOPSIS
+
 Gets an action from a logic app run.
 
 ## SYNTAX
 
-```
+```powershell
 Get-AzLogicAppRunAction -ResourceGroupName <String> -Name <String> -RunName <String> [-ActionName <String>]
- [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
+ [-FollowNextPageLink] [-MaximumFollowNextPageLink <Int32>] [-DefaultProfile <IAzureContextContainer>]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
+
 The **Get-AzLogicAppRunAction** cmdlet gets an action from a logic app run.
 This cmdlet returns a **WorkflowRunAction** objects.
 Specify the logic app, resource group, and run.
@@ -30,8 +33,9 @@ If you omit a required template parameter, the cmdlet prompts you for the value.
 ## EXAMPLES
 
 ### Example 1: Get an action from a Logic App run
+
 ```powershell
-PS C:\>Get-AzLogicAppActionRun -ResourceGroupName "ResourceGroup11" -Name "LogicApp05" -RunName "LogicAppRun56" -ActionName "LogicAppAction01"
+PS C:\>Get-AzLogicAppRunAction -ResourceGroupName "ResourceGroup11" -Name "LogicApp05" -RunName "08585925184423369718380498702CU26" -ActionName "LogicAppAction01"
 Code        : NotFound
 EndTime     : 1/13/2016 2:42:56 PM
 Error       : 
@@ -44,36 +48,20 @@ TrackingId  :
 Type        :
 ```
 
-This command gets a specific Logic App action from the logic app named LogicApp05 for the run named LogicAppRun56.
+This command gets a specific Logic App action from the logic app named LogicApp05 for the run with identifier 08585925184423369718380498702CU26.
 
 ### Example 2: Get all the actions from a Logic App run
+
 ```powershell
-PS C:\>Get-AzLogicAppActionRun -ResourceGroupName "ResourceGroup11" -Name "LogicApp05" -RunName "LogicAppRun56"
-Code        : NotFound
-EndTime     : 1/13/2016 2:42:56 PM
-Error       : 
-InputsLink  : Microsoft.Azure.Management.Logic.Models.ContentLink
-Name        : LogicAppAction1
-OutputsLink : Microsoft.Azure.Management.Logic.Models.ContentLink
-StartTime   : 1/13/2016 2:42:55 PM
-Status      : Failed
-TrackingId  : 
-Type        :
+PS C:\>Get-AzLogicAppRunAction -ResourceGroupName "ResourceGroup11" -Name "LogicApp05" -RunName "08585925184423369718380498702CU26" -FollowNextPageLink
 ```
 
-This command gets all Logic App actions from a run named LogicAppRun56 of a logic app named LogicApp05.
-
-### Example 3
-
-This command gets all Logic App actions from a run named LogicAppRun56 of a logic app named LogicApp05. (autogenerated)
-
-```powershell <!-- Aladdin Generated Example --> 
-Get-AzLogicAppRunAction -Name 'IntegrationAccount31' -ResourceGroupName MyResourceGroup -RunName '08587489104702792076'
-```
+This command gets all Logic App actions from a run with identifier 08585925184423369718380498702CU26 of a logic app named LogicApp05.
 
 ## PARAMETERS
 
 ### -ActionName
+
 Specifies the name of an action in a logic app run.
 This cmdlet gets the action that this parameter specifies.
 
@@ -90,6 +78,7 @@ Accept wildcard characters: False
 ```
 
 ### -DefaultProfile
+
 The credentials, account, tenant, and subscription used for communication with azure
 
 ```yaml
@@ -104,7 +93,40 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -FollowNextPageLink
+
+Indicates the cmdlet should follow next page links.
+
+```yaml
+Type: System.Management.Automation.SwitchParameter
+Parameter Sets: (All)
+Aliases: FL
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -MaximumFollowNextPageLink
+
+Specifies how many times to follow next page links if FollowNextPageLink is used.
+
+```yaml
+Type: System.Int32
+Parameter Sets: (All)
+Aliases: ML
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Name
+
 Specifies the name of a logic app for which this cmdlet gets an action.
 
 ```yaml
@@ -120,6 +142,7 @@ Accept wildcard characters: False
 ```
 
 ### -ResourceGroupName
+
 Specifies the name of a resource group in which this cmdlet gets an action.
 
 ```yaml
@@ -135,6 +158,7 @@ Accept wildcard characters: False
 ```
 
 ### -RunName
+
 Specifies the name of a run of a logic app.
 This cmdlet gets an action for the run that this parameter specifies.
 
@@ -151,7 +175,8 @@ Accept wildcard characters: False
 ```
 
 ### CommonParameters
-This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
+
+This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
 
 ## INPUTS
 
@@ -168,5 +193,3 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 [Get-AzLogicAppRunHistory](./Get-AzLogicAppRunHistory.md)
 
 [Stop-AzLogicAppRun](./Stop-AzLogicAppRun.md)
-
-