From ea4932f82d475d3f886dadfeeb7e112acacb9348 Mon Sep 17 00:00:00 2001 From: Siddharth Vaghasia Date: Tue, 9 Jan 2024 17:35:36 +0530 Subject: [PATCH 1/2] fix for changing base url for Get-Flow --- src/Commands/PowerPlatform/PowerAutomate/GetFlow.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Commands/PowerPlatform/PowerAutomate/GetFlow.cs b/src/Commands/PowerPlatform/PowerAutomate/GetFlow.cs index 82a8b2d9e..afb6dda75 100644 --- a/src/Commands/PowerPlatform/PowerAutomate/GetFlow.cs +++ b/src/Commands/PowerPlatform/PowerAutomate/GetFlow.cs @@ -31,7 +31,8 @@ public class GetFlow : PnPAzureManagementApiCmdlet protected override void ExecuteCmdlet() { string environmentName = null; - if(ParameterSpecified(nameof(Environment))) + string baseUrl = "https://api.flow.microsoft.com/"; + if (ParameterSpecified(nameof(Environment))) { environmentName = Environment.GetName(); @@ -39,7 +40,7 @@ protected override void ExecuteCmdlet() } else { - var environments = GraphHelper.GetResultCollectionAsync(Connection, "https://management.azure.com/providers/Microsoft.ProcessSimple/environments?api-version=2016-11-01", AccessToken).GetAwaiter().GetResult(); + var environments = GraphHelper.GetResultCollectionAsync(Connection, baseUrl + "/providers/Microsoft.ProcessSimple/environments?api-version=2016-11-01", AccessToken).GetAwaiter().GetResult(); environmentName = environments.FirstOrDefault(e => e.Properties.IsDefault.HasValue && e.Properties.IsDefault == true)?.Name; if(string.IsNullOrEmpty(environmentName)) @@ -56,7 +57,7 @@ protected override void ExecuteCmdlet() WriteVerbose($"Retrieving specific Power Automate Flow with the provided name '{flowName}' within the environment '{environmentName}'"); - var result = GraphHelper.GetAsync(Connection, $"https://management.azure.com/providers/Microsoft.ProcessSimple{(AsAdmin ? "/scopes/admin" : "")}/environments/{environmentName}/flows/{flowName}?api-version=2016-11-01", AccessToken).GetAwaiter().GetResult(); + var result = GraphHelper.GetAsync(Connection, baseUrl + $"providers /Microsoft.ProcessSimple{(AsAdmin ? "/scopes/admin" : "")}/environments/{environmentName}/flows/{flowName}?api-version=2016-11-01", AccessToken).GetAwaiter().GetResult(); WriteObject(result, false); } else @@ -79,7 +80,7 @@ protected override void ExecuteCmdlet() WriteVerbose($"Retrieving all Power Automate Flows within environment '{environmentName}'{(filter != null ? $" with filter '{filter}'" : "")}"); - var flows = GraphHelper.GetResultCollectionAsync(Connection, $"https://management.azure.com/providers/Microsoft.ProcessSimple{(AsAdmin ? "/scopes/admin" : "")}/environments/{environmentName}/flows?api-version=2016-11-01{(filter != null ? $"&$filter={filter}" : "")}", AccessToken).GetAwaiter().GetResult(); + var flows = GraphHelper.GetResultCollectionAsync(Connection, baseUrl + $"providers/Microsoft.ProcessSimple{(AsAdmin ? "/scopes/admin" : "")}/environments/{environmentName}/flows?api-version=2016-11-01{(filter != null ? $"&$filter={filter}" : "")}", AccessToken).GetAwaiter().GetResult(); WriteObject(flows, true); } From f86f381813e2cd75d580dc2f1ce37d1bb8b1725a Mon Sep 17 00:00:00 2001 From: Gautam Sheth Date: Tue, 9 Jan 2024 14:34:09 +0200 Subject: [PATCH 2/2] Update GetFlow.cs --- src/Commands/PowerPlatform/PowerAutomate/GetFlow.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Commands/PowerPlatform/PowerAutomate/GetFlow.cs b/src/Commands/PowerPlatform/PowerAutomate/GetFlow.cs index afb6dda75..6d97d5e2d 100644 --- a/src/Commands/PowerPlatform/PowerAutomate/GetFlow.cs +++ b/src/Commands/PowerPlatform/PowerAutomate/GetFlow.cs @@ -57,7 +57,7 @@ protected override void ExecuteCmdlet() WriteVerbose($"Retrieving specific Power Automate Flow with the provided name '{flowName}' within the environment '{environmentName}'"); - var result = GraphHelper.GetAsync(Connection, baseUrl + $"providers /Microsoft.ProcessSimple{(AsAdmin ? "/scopes/admin" : "")}/environments/{environmentName}/flows/{flowName}?api-version=2016-11-01", AccessToken).GetAwaiter().GetResult(); + var result = GraphHelper.GetAsync(Connection, baseUrl + $"providers/Microsoft.ProcessSimple{(AsAdmin ? "/scopes/admin" : "")}/environments/{environmentName}/flows/{flowName}?api-version=2016-11-01", AccessToken).GetAwaiter().GetResult(); WriteObject(result, false); } else @@ -86,4 +86,4 @@ protected override void ExecuteCmdlet() } } } -} \ No newline at end of file +}