Merge pull request #123 from mivano/feat/checkscopedailycost

Make sure to check if we need to actually fetch the subscription id.
mivano · Mar 16, 2024 · d2773d6 · d2773d6
2 parents 6055aff + 2d54e08
commit d2773d6
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/src/Commands/Budgets/BudgetsCommand.cs b/src/Commands/Budgets/BudgetsCommand.cs
@@ -37,7 +37,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, BudgetsSett
         // Get the subscription ID from the settings
         var subscriptionId = settings.Subscription;
 
-        if (subscriptionId.GetValueOrDefault() == Guid.Empty)
+        if (subscriptionId.HasValue == false && (settings.GetScope.IsSubscriptionBased))
         {
             // Get the subscription ID from the Azure CLI
             try

diff --git a/src/Commands/CostByResource/CostByResourceCommand.cs b/src/Commands/CostByResource/CostByResourceCommand.cs
@@ -62,7 +62,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, CostByResou
         // Get the subscription ID from the settings
         var subscriptionId = settings.Subscription;
 
-        if (subscriptionId.GetValueOrDefault() == Guid.Empty)
+        if (subscriptionId.HasValue == false && (settings.GetScope.IsSubscriptionBased))
         {
             // Get the subscription ID from the Azure CLI
             try

diff --git a/src/Commands/CostByTag/CostByTagCommand.cs b/src/Commands/CostByTag/CostByTagCommand.cs
@@ -61,7 +61,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, CostByTagSe
         // Get the subscription ID from the settings
         var subscriptionId = settings.Subscription;
 
-        if (subscriptionId.GetValueOrDefault() == Guid.Empty)
+        if (subscriptionId.HasValue == false && (settings.GetScope.IsSubscriptionBased))
         {
             // Get the subscription ID from the Azure CLI
             try

diff --git a/src/Commands/DailyCost/DailyCost.cs b/src/Commands/DailyCost/DailyCost.cs
@@ -63,7 +63,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, DailyCostSe
         // Get the subscription ID from the settings
         var subscriptionId = settings.Subscription;
 
-        if (subscriptionId.GetValueOrDefault() == Guid.Empty)
+        if (subscriptionId.HasValue == false && (settings.GetScope.IsSubscriptionBased))
         {
             // Get the subscription ID from the Azure CLI
             try

diff --git a/src/Commands/DetectAnomaly/DetectAnomaly.cs b/src/Commands/DetectAnomaly/DetectAnomaly.cs
@@ -60,7 +60,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, DetectAnoma
         // Get the subscription ID from the settings
         var subscriptionId = settings.Subscription;
 
-        if (subscriptionId.GetValueOrDefault() == Guid.Empty)
+        if (subscriptionId.HasValue == false && (settings.GetScope.IsSubscriptionBased))
         {
             // Get the subscription ID from the Azure CLI
             try

diff --git a/src/Commands/WhatIf/DevTestWhatIfCommand.cs b/src/Commands/WhatIf/DevTestWhatIfCommand.cs
@@ -38,7 +38,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, WhatIfSetti
         // Get the subscription ID from the settings
         var subscriptionId = settings.Subscription;
 
-        if (subscriptionId.GetValueOrDefault() == Guid.Empty)
+        if (subscriptionId.HasValue == false && (settings.GetScope.IsSubscriptionBased))
         {
             // Get the subscription ID from the Azure CLI
             try

diff --git a/src/Commands/WhatIf/RegionWhatIfCommand.cs b/src/Commands/WhatIf/RegionWhatIfCommand.cs
@@ -37,7 +37,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, WhatIfSetti
         // Get the subscription ID from the settings
         var subscriptionId = settings.Subscription;
 
-        if (subscriptionId.GetValueOrDefault() == Guid.Empty)
+        if (subscriptionId.HasValue == false && (settings.GetScope.IsSubscriptionBased))
         {
             // Get the subscription ID from the Azure CLI
             try