Pull resource group from instance id (#519)

* Pull resource group name from instance_id
project-koku · Jul 26, 2024 · e7295d0 · e7295d0
1 parent e143da9
commit e7295d0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/nise/__init__.py b/nise/__init__.py
@@ -1,3 +1,3 @@
-__version__ = "4.6.1"
+__version__ = "4.6.2"
 
 VERSION = __version__.split(".")
diff --git a/nise/generators/azure/azure_generator.py b/nise/generators/azure/azure_generator.py
@@ -72,7 +72,6 @@
     "BillingPeriodEndDate",
     "BillingProfileId",
     "BillingProfileName",
-    "InstanceName",
     "InvoiceSectionId",
     "IsAzureCreditEligible",
     "PartNumber",
@@ -85,7 +84,6 @@
     "resellerMpnId",
     "servicePeriodEndDate",
     "servicePeriodStartDate",
-    "Product",
     "ProductId",
     "publisherId",
     "Location",
@@ -419,6 +417,9 @@ def _update_data(self, row, start, end, **kwargs):
             row, meter_sub, str(amount), str(rate), str(cost), instance_id, service_tier
         )
 
+        if instance_id and "resourceGroups/" in instance_id:
+            resource_group = instance_id.split("resourceGroups/")[-1].split("/")[0]
+
         if self.azure_columns is AZURE_COLUMNS_V2_SUBSCRIPTION:
             row["SubscriptionId"] = self.subscription_guid
             row["ResourceGroupName"] = resource_group