Merge pull request #152 from MvRoo/michael

Added ability to change http timeout via command line for cost retrieval

.gitattributes

@@ -0,0 +1 @@
+*.sh text eol=lf

src/Commands/AccumulatedCost/AccumulatedCostCommand.cs

@@ -9,13 +9,13 @@ namespace AzureCostCli.Commands.AccumulatedCost;
 public class AccumulatedCostCommand : AsyncCommand<AccumulatedCostSettings>
 {
     private readonly ICostRetriever _costRetriever;
-    
+
     private readonly Dictionary<OutputFormat, BaseOutputFormatter> _outputFormatters = new();
 
     public AccumulatedCostCommand(ICostRetriever costRetriever)
     {
         _costRetriever = costRetriever;
-        
+
         // Add the output formatters
         _outputFormatters.Add(OutputFormat.Console, new ConsoleOutputFormatter());
         _outputFormatters.Add(OutputFormat.Json, new JsonOutputFormatter());
@@ -56,7 +56,8 @@ public override async Task<int> ExecuteAsync(CommandContext context, Accumulated
             AnsiConsole.WriteLine($"Version: {typeof(AccumulatedCostCommand).Assembly.GetName().Version}");
 
         _costRetriever.CostApiAddress = settings.CostApiAddress;
-
+        _costRetriever.HttpTimeout = TimeSpan.FromSeconds(settings.HttpTimeout);
+
         // Get the subscription ID from the settings
         var subscriptionId = settings.Subscription;
 
@@ -67,12 +68,12 @@ public override async Task<int> ExecuteAsync(CommandContext context, Accumulated
             {
                 if (settings.Debug)
                     AnsiConsole.WriteLine("No subscription ID specified. Trying to retrieve the default subscription ID from Azure CLI.");
-                
+
                 subscriptionId = Guid.Parse(AzCommand.GetDefaultAzureSubscriptionId());
-                
+
                 if (settings.Debug)
                     AnsiConsole.WriteLine($"Default subscription ID retrieved from az cli: {subscriptionId}");
-                
+
                 settings.Subscription = subscriptionId;
             }
             catch (Exception e)
@@ -86,18 +87,18 @@ public override async Task<int> ExecuteAsync(CommandContext context, Accumulated
         AccumulatedCostDetails accumulatedCost = null;
 
         Subscription subscription = null;
-       
+
         await AnsiConsoleExt.Status()
             .StartAsync("Fetching cost data...", async ctx =>
             {
-                
+
                 if (settings.GetScope.IsSubscriptionBased)
                 {
                     ctx.Status = "Fetching subscription details...";
                     // Fetch the subscription details
                     subscription = await _costRetriever.RetrieveSubscription(settings.Debug, subscriptionId.Value);
                 }
-                else 
+                else
                 {
                     ctx.Status = "Fetching Enrollment details...";
                     // Fetch the enrollment details //TODO
@@ -156,7 +157,7 @@ await AnsiConsoleExt.Status()
                 }
 
                 IEnumerable<CostNamedItem> bySubscriptionCosts = null;
-                if (settings.GetScope.IsSubscriptionBased==false)
+                if (settings.GetScope.IsSubscriptionBased == false)
                 {
                     ctx.Status = "Fetching cost data by subscription...";
                     bySubscriptionCosts = await _costRetriever.RetrieveCostBySubscription(settings.Debug,
@@ -166,14 +167,14 @@ await AnsiConsoleExt.Status()
                 ctx.Status = "Fetching cost data by service name...";
                 var byServiceNameCosts = await _costRetriever.RetrieveCostByServiceName(settings.Debug,
                     settings.GetScope, settings.Filter, settings.Metric, settings.Timeframe, settings.From, settings.To);
-                
+
                 ctx.Status = "Fetching cost data by location...";
                 var byLocationCosts = await _costRetriever.RetrieveCostByLocation(settings.Debug, settings.GetScope,
                     settings.Filter,
                     settings.Metric,
                     settings.Timeframe, settings.From, settings.To);
-                
-                ctx.Status= "Fetching cost data by resource group...";
+
+                ctx.Status = "Fetching cost data by resource group...";
                 var byResourceGroupCosts = await _costRetriever.RetrieveCostByResourceGroup(settings.Debug,
                     settings.GetScope,
                     settings.Filter,
@@ -184,10 +185,10 @@ await AnsiConsoleExt.Status()
                     byLocationCosts, byResourceGroupCosts, bySubscriptionCosts);
 
             });
-        
+
         // Write the output
         await _outputFormatters[settings.Output]
-            .WriteAccumulatedCost(settings,accumulatedCost);
+            .WriteAccumulatedCost(settings, accumulatedCost);
 
         return 0;
     }

src/Commands/Budgets/BudgetsCommand.cs

@@ -7,7 +7,7 @@
 
 namespace AzureCostCli.Commands.Budgets;
 
-public class BudgetsCommand: AsyncCommand<BudgetsSettings>
+public class BudgetsCommand : AsyncCommand<BudgetsSettings>
 {
     private readonly ICostRetriever _costRetriever;
 
@@ -16,7 +16,7 @@ public class BudgetsCommand: AsyncCommand<BudgetsSettings>
     public BudgetsCommand(ICostRetriever costRetriever)
     {
         _costRetriever = costRetriever;
-        
+
         // Add the output formatters
         _outputFormatters.Add(OutputFormat.Console, new ConsoleOutputFormatter());
         _outputFormatters.Add(OutputFormat.Json, new JsonOutputFormatter());
@@ -31,9 +31,10 @@ public override async Task<int> ExecuteAsync(CommandContext context, BudgetsSett
         // Show version
         if (settings.Debug)
             AnsiConsole.WriteLine($"Version: {typeof(CostByResourceCommand).Assembly.GetName().Version}");
-        
+
         _costRetriever.CostApiAddress = settings.CostApiAddress;
-
+        _costRetriever.HttpTimeout = TimeSpan.FromSeconds(settings.HttpTimeout);
+
         // Get the subscription ID from the settings
         var subscriptionId = settings.Subscription;
 
@@ -44,12 +45,12 @@ public override async Task<int> ExecuteAsync(CommandContext context, BudgetsSett
             {
                 if (settings.Debug)
                     AnsiConsole.WriteLine("No subscription ID specified. Trying to retrieve the default subscription ID from Azure CLI.");
-                
+
                 subscriptionId = Guid.Parse(AzCommand.GetDefaultAzureSubscriptionId());
-                
+
                 if (settings.Debug)
                     AnsiConsole.WriteLine($"Default subscription ID retrieved from az cli: {subscriptionId}");
-                
+
                 settings.Subscription = subscriptionId;
             }
             catch (Exception e)
@@ -69,6 +70,6 @@ await _outputFormatters[settings.Output]
 
         return 0;
     }
-    
-    
+
+
 }

src/Commands/CostByResource/CostByResourceCommand.cs

@@ -58,7 +58,8 @@ public override async Task<int> ExecuteAsync(CommandContext context, CostByResou
             AnsiConsole.WriteLine($"Version: {typeof(CostByResourceCommand).Assembly.GetName().Version}");
 
         _costRetriever.CostApiAddress = settings.CostApiAddress;
-
+        _costRetriever.HttpTimeout = TimeSpan.FromSeconds(settings.HttpTimeout);
+
         // Get the subscription ID from the settings
         var subscriptionId = settings.Subscription;
 

src/Commands/CostByTag/CostByTagCommand.cs

@@ -57,7 +57,8 @@ public override async Task<int> ExecuteAsync(CommandContext context, CostByTagSe
             AnsiConsole.WriteLine($"Version: {typeof(CostByResourceCommand).Assembly.GetName().Version}");
 
         _costRetriever.CostApiAddress = settings.CostApiAddress;
-
+        _costRetriever.HttpTimeout = TimeSpan.FromSeconds(settings.HttpTimeout);
+
         // Get the subscription ID from the settings
         var subscriptionId = settings.Subscription;
 

src/Commands/CostSettings.cs

@@ -84,7 +84,10 @@ public class CostSettings : LogCommandSettings, ICostSettings
     [CommandOption("--priceApiBaseAddress <BASE_ADDRESS>")]
     [Description("The base address for the Price API. Defaults to https://prices.azure.com/")]
     public string PriceApiAddress { get; set; } = "https://prices.azure.com/";
-
+
+    [CommandOption("--httpTimeout <TIMEOUT>")]
+    [Description("Allows overriding the default HTTP timeout in seconds. Defaults to 100 seconds.")]
+    public int HttpTimeout { get; set; } = 100;
 
     public Scope GetScope
     {

src/Commands/DailyCost/DailyCost.cs

@@ -59,7 +59,8 @@ public override async Task<int> ExecuteAsync(CommandContext context, DailyCostSe
 
 
         _costRetriever.CostApiAddress = settings.CostApiAddress;
-
+        _costRetriever.HttpTimeout = TimeSpan.FromSeconds(settings.HttpTimeout);
+
         // Get the subscription ID from the settings
         var subscriptionId = settings.Subscription;
 
@@ -90,7 +91,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, DailyCostSe
         IEnumerable<CostDailyItem> dailyCost = new List<CostDailyItem>();
 
         // if output format is not csv, json, or jsonc, then don't include tags
-        if (settings.Output != OutputFormat.Json && 
+        if (settings.Output != OutputFormat.Json &&
             settings.Output != OutputFormat.Jsonc &&
             settings.Output != OutputFormat.Csv)
         {

src/Commands/DetectAnomaly/DetectAnomaly.cs

@@ -56,6 +56,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, DetectAnoma
         if (settings.Debug)
             AnsiConsole.WriteLine($"Version: {typeof(AccumulatedCostCommand).Assembly.GetName().Version}");
         _costRetriever.CostApiAddress = settings.CostApiAddress;
+        _costRetriever.HttpTimeout = TimeSpan.FromSeconds(settings.HttpTimeout);
 
         // Get the subscription ID from the settings
         var subscriptionId = settings.Subscription;