Merge branch 'main' into dg-refactor-cloud-logs-wf

elastic · Oct 31, 2024 · 64ed5af · 64ed5af
2 parents e93ef2f + 8467488
commit 64ed5af
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 30 deletions.
diff --git a/internal/inventory/gcpfetcher/fetcher_assets.go b/internal/inventory/gcpfetcher/fetcher_assets.go
@@ -54,6 +54,7 @@ var ResourcesToFetch = []ResourcesClassification{
 	{gcpinventory.ComputeForwardingRuleAssetType, inventory.AssetClassificationGcpForwardingRule},
 	{gcpinventory.CloudFunctionAssetType, inventory.AssetClassificationGcpCloudFunction},
 	{gcpinventory.CloudRunService, inventory.AssetClassificationGcpCloudRunService},
+	{gcpinventory.IamRoleAssetType, inventory.AssetClassificationGcpIamRole},
 }
 
 func newAssetsInventoryFetcher(logger *logp.Logger, provider inventoryProvider) inventory.AssetFetcher {

diff --git a/tests/product/tests/data/gcp_asset_inventory/test_cases.py b/tests/product/tests/data/gcp_asset_inventory/test_cases.py
@@ -29,12 +29,12 @@
         type_="subnet",
         sub_type="gcp-subnet",
     ),
-    # "[Asset Inventory][GCP][Project] assets found": AssetInventoryCase(
-    #     category="infrastructure",
-    #     sub_category="management",
-    #     type_="cloud-account",
-    #     sub_type="gcp-project",
-    # ),
+    "[Asset Inventory][GCP][Project] assets found": AssetInventoryCase(
+        category="infrastructure",
+        sub_category="management",
+        type_="cloud-account",
+        sub_type="gcp-project",
+    ),
     # "[Asset Inventory][GCP][Organization] assets found": AssetInventoryCase(
     #     category="infrastructure",
     #     sub_category="management",
@@ -47,18 +47,18 @@
     #     type_="resource-hierarchy",
     #     sub_type="gcp-folder",
     # ),
-    # "[Asset Inventory][GCP][Bucket] assets found": AssetInventoryCase(
-    #     category="infrastructure",
-    #     sub_category="storage",
-    #     type_="object-storage",
-    #     sub_type="gcp-bucket",
-    # ),
-    # "[Asset Inventory][GCP][Firewall] assets found": AssetInventoryCase(
-    #     category="infrastructure",
-    #     sub_category="network",
-    #     type_="firewall",
-    #     sub_type="gcp-firewall",
-    # ),
+    "[Asset Inventory][GCP][Bucket] assets found": AssetInventoryCase(
+        category="infrastructure",
+        sub_category="storage",
+        type_="object-storage",
+        sub_type="gcp-bucket",
+    ),
+    "[Asset Inventory][GCP][Firewall] assets found": AssetInventoryCase(
+        category="infrastructure",
+        sub_category="network",
+        type_="firewall",
+        sub_type="gcp-firewall",
+    ),
     # "[Asset Inventory][GCP][GKE Cluster] assets found": AssetInventoryCase(
     #     category="infrastructure",
     #     sub_category="container",
@@ -71,22 +71,22 @@
     #     type_="load-balancing",
     #     sub_type="gcp-forwarding-rule",
     # ),
-    # "[Asset Inventory][GCP][IAM Role] assets found": AssetInventoryCase(
-    #     category="identity",
-    #     sub_category="access-management",
-    #     type_="iam-role",
-    #     sub_type="gcp-iam-role",
-    # ),
+    "[Asset Inventory][GCP][IAM Role] assets found": AssetInventoryCase(
+        category="identity",
+        sub_category="access-management",
+        type_="iam-role",
+        sub_type="gcp-iam-role",
+    ),
     # "[Asset Inventory][GCP][Cloud Function] assets found": AssetInventoryCase(
     #     category="infrastructure",
     #     sub_category="serverless",
     #     type_="function",
     #     sub_type="gcp-cloud-function",
     # ),
-    # "[Asset Inventory][GCP][Cloud Run Service] assets found": AssetInventoryCase(
-    #     category="infrastructure",
-    #     sub_category="container",
-    #     type_="serverless",
-    #     sub_type="gcp-cloud-run-service",
-    # ),
+    "[Asset Inventory][GCP][Cloud Run Service] assets found": AssetInventoryCase(
+        category="infrastructure",
+        sub_category="container",
+        type_="serverless",
+        sub_type="gcp-cloud-run-service",
+    ),
 }