[Asset Inventory][Azure] Add storage asset fetchers

internal/inventory/asset.go

@@ -107,6 +107,7 @@ var (
 	AssetClassificationAzureStorageBlobService  = AssetClassification{CategoryStorageBucket, "Azure Storage Blob Service"}
 	AssetClassificationAzureStorageQueue        = AssetClassification{CategoryMessagingService, "Azure Storage Queue"}
 	AssetClassificationAzureStorageQueueService = AssetClassification{CategoryMessagingService, "Azure Storage Queue Service"}
+	AssetClassificationAzureStorageTableService = AssetClassification{CategoryMessagingService, "Azure Storage Table Service"}
 	AssetClassificationAzureSubscription        = AssetClassification{CategoryAccessManagement, "Azure Subscription"}
 	AssetClassificationAzureTenant              = AssetClassification{CategoryAccessManagement, "Azure Tenant"}
 	AssetClassificationAzureVirtualMachine      = AssetClassification{CategoryHost, "Azure Virtual Machine"}

internal/inventory/azurefetcher/fetcher_storage.go

@@ -39,6 +39,7 @@ type (
 		ListStorageAccountBlobServices(ctx context.Context, storageAccounts []azurelib.AzureAsset) ([]azurelib.AzureAsset, error)
 		ListStorageAccountQueues(ctx context.Context, storageAccounts []azurelib.AzureAsset) ([]azurelib.AzureAsset, error)
 		ListStorageAccountQueueServices(ctx context.Context, storageAccounts []azurelib.AzureAsset) ([]azurelib.AzureAsset, error)
+		ListStorageAccountTableServices(ctx context.Context, storageAccounts []azurelib.AzureAsset) ([]azurelib.AzureAsset, error)
 		ListStorageAccounts(ctx context.Context, storageAccountsSubscriptionsIds []string) ([]azurelib.AzureAsset, error)
 	}
 )
@@ -59,6 +60,7 @@ func (f *storageFetcher) Fetch(ctx context.Context, assetChan chan<- inventory.A
 		{"Storage Blob Services", f.provider.ListStorageAccountBlobServices, inventory.AssetClassificationAzureStorageBlobService},
 		{"Storage Queue Services", f.provider.ListStorageAccountQueueServices, inventory.AssetClassificationAzureStorageQueueService},
 		{"Storage Queues", f.provider.ListStorageAccountQueues, inventory.AssetClassificationAzureStorageQueue},
+		{"Storage Table Services", f.provider.ListStorageAccountTableServices, inventory.AssetClassificationAzureStorageTableService},
 	}
 
 	storageAccounts, err := f.listStorageAccounts(ctx)

internal/inventory/azurefetcher/fetcher_storage_test.go

@@ -51,6 +51,11 @@ func TestStorageFetcher_Fetch(t *testing.T) {
 		Name:        "queue",
 		DisplayName: "queue",
 	}
+	azureTableService := azurelib_inventory.AzureAsset{
+		Id:          "queue",
+		Name:        "queue",
+		DisplayName: "queue",
+	}
 
 	expected := []inventory.AssetEvent{
 		inventory.NewAssetEvent(
@@ -83,6 +88,16 @@ func TestStorageFetcher_Fetch(t *testing.T) {
 				ServiceName: "Azure",
 			}),
 		),
+		inventory.NewAssetEvent(
+			inventory.AssetClassificationAzureStorageTableService,
+			azureQueue.Id,
+			azureQueue.Name,
+			inventory.WithRawAsset(azureTableService),
+			inventory.WithCloud(inventory.Cloud{
+				Provider:    inventory.AzureCloudProvider,
+				ServiceName: "Azure",
+			}),
+		),
 	}
 
 	// setup
@@ -119,6 +134,12 @@ func TestStorageFetcher_Fetch(t *testing.T) {
 		[]azurelib_inventory.AzureAsset{azureQueue}, nil,
 	)
 
+	provider.EXPECT().ListStorageAccountTableServices(
+		mock.Anything, mock.Anything,
+	).Return(
+		[]azurelib_inventory.AzureAsset{azureTableService}, nil,
+	)
+
 	fetcher := newStorageFetcher(logger, provider)
 	// test & compare
 	testutil.CollectResourcesAndMatch(t, fetcher, expected)

internal/resources/providers/azurelib/inventory/storage_provider.go

@@ -40,6 +40,7 @@ type storageAccountAzureClientWrapper struct {
 	AssetBlobServices       func(ctx context.Context, subID string, clientOptions *arm.ClientOptions, resourceGroup, storageAccountName string, options *armstorage.BlobServicesClientListOptions) ([]armstorage.BlobServicesClientListResponse, error)
 	AssetQueues             func(ctx context.Context, subID string, clientOptions *arm.ClientOptions, resourceGroup, storageAccountName string, options *armstorage.QueueClientListOptions) ([]armstorage.QueueClientListResponse, error)
 	AssetQueueServices      func(ctx context.Context, subID string, clientOptions *arm.ClientOptions, resourceGroup, storageAccountName string, options *armstorage.QueueServicesClientListOptions) (armstorage.QueueServicesClientListResponse, error)
+	AssetTableServices      func(ctx context.Context, subID string, clientOptions *arm.ClientOptions, resourceGroup, storageAccountName string, options *armstorage.TableServicesClientListOptions) (armstorage.TableServicesClientListResponse, error)
 	AssetAccountStorage     func(ctx context.Context, subID string, clientOptions *arm.ClientOptions) ([]armstorage.AccountsClientListResponse, error)
 }
 
@@ -50,6 +51,7 @@ type StorageAccountProviderAPI interface {
 	ListStorageAccountQueueServices(ctx context.Context, storageAccounts []AzureAsset) ([]AzureAsset, error)
 	ListStorageAccountsBlobDiagnosticSettings(ctx context.Context, storageAccounts []AzureAsset) ([]AzureAsset, error)
 	ListStorageAccountsTableDiagnosticSettings(ctx context.Context, storageAccounts []AzureAsset) ([]AzureAsset, error)
+	ListStorageAccountTableServices(ctx context.Context, storageAccounts []AzureAsset) ([]AzureAsset, error)
 	ListStorageAccountsQueueDiagnosticSettings(ctx context.Context, storageAccounts []AzureAsset) ([]AzureAsset, error)
 	ListStorageAccounts(ctx context.Context, storageAccountsSubscriptionsIds []string) ([]AzureAsset, error)
 }
@@ -88,6 +90,13 @@ func NewStorageAccountProvider(log *logp.Logger, diagnosticSettingsClient *armmo
 			}
 			return cl.List(ctx, resourceGroupName, storageAccountName, options)
 		},
+		AssetTableServices: func(ctx context.Context, subID string, clientOptions *arm.ClientOptions, resourceGroupName, storageAccountName string, options *armstorage.TableServicesClientListOptions) (armstorage.TableServicesClientListResponse, error) {
+			cl, err := armstorage.NewTableServicesClient(subID, credentials, clientOptions)
+			if err != nil {
+				return armstorage.TableServicesClientListResponse{}, err
+			}
+			return cl.List(ctx, resourceGroupName, storageAccountName, options)
+		},
 		AssetAccountStorage: func(ctx context.Context, subID string, clientOptions *arm.ClientOptions) ([]armstorage.AccountsClientListResponse, error) {
 			accountsClient, err := armstorage.NewAccountsClient(subID, credentials, clientOptions)
 			if err != nil {
@@ -231,6 +240,38 @@ func (p *storageAccountProvider) ListStorageAccountQueueServices(ctx context.Con
 	return assets, nil
 }
 
+func (p *storageAccountProvider) ListStorageAccountTableServices(ctx context.Context, storageAccounts []AzureAsset) ([]AzureAsset, error) {
+	var assets []AzureAsset
+	for _, sa := range storageAccounts {
+		response, err := p.client.AssetTableServices(ctx, sa.SubscriptionId, nil, sa.ResourceGroup, sa.Name, nil)
+		if err != nil {
+			return nil, fmt.Errorf("error while fetching azure table services for storage accounts %s: %w", sa.Id, err)
+		}
+
+		for _, item := range response.Value {
+			properties, err := maps.AsMapStringAny(item.TableServiceProperties)
+			if err != nil {
+				p.log.Errorf("error while transforming azure table services for storage accounts %s: %v", sa.Id, err)
+			}
+
+			assets = append(assets, AzureAsset{
+				Id:             pointers.Deref(item.ID),
+				Name:           pointers.Deref(item.Name),
+				Type:           strings.ToLower(pointers.Deref(item.Type)),
+				ResourceGroup:  sa.ResourceGroup,
+				SubscriptionId: sa.SubscriptionId,
+				TenantId:       sa.TenantId,
+				Properties:     properties,
+				Extension: map[string]any{
+					ExtensionStorageAccountID:   sa.Id,
+					ExtensionStorageAccountName: sa.Name,
+				},
+			})
+		}
+	}
+	return assets, nil
+}
+
 func transformBlobServices(servicesPages []armstorage.BlobServicesClientListResponse, storageAccount AzureAsset) ([]AzureAsset, error) {
 	var errs error
 	return lo.FlatMap(servicesPages, func(response armstorage.BlobServicesClientListResponse, _ int) []AzureAsset {

tests/product/tests/data/azure_asset_inventory/test_cases.py

@@ -77,4 +77,8 @@
         category="Storage Bucket",
         type_="Azure Storage Blob Service",
     ),
+    "[Asset Inventory][Azure][Azure Table Service] assets found": AssetInventoryCase(
+        category="Messaging Service",
+        type_="Azure Storage Table Service",
+    ),
 }

tests/product/tests/test_aws_asset_inventory.py

@@ -33,7 +33,7 @@ def test_aws_asset_inventory(
     assert isinstance(entities, list) and len(entities) > 0, "Expected the list to be non-empty"
     for entity in entities:
         assert entity.cloud, "Expected .cloud section"
-        assert entity.cloud.Provider == "aws", f'Expected "aws" provider, got {entity.cloud.Provider}'
+        assert entity.cloud.provider == "aws", f'Expected "aws" provider, got {entity.cloud.provider}'
         assert len(entity.entity.id) > 0, "Expected .entity.id list to contain an ID"
         assert len(entity.entity.id[0]) > 0, "Expected the ID to be non-empty"
         assert entity.Attributes, "Expected the resource under .Attributes"

tests/product/tests/test_azure_asset_inventory.py

@@ -34,7 +34,7 @@ def test_azure_asset_inventory(
     assert isinstance(entities, list) and len(entities) > 0, "Expected the list to be non-empty"
     for entity in entities:
         assert entity.cloud, "Expected .cloud section"
-        assert entity.cloud.Provider == "azure", f'Expected "aws" provider, got {entity.cloud.Provider}'
+        assert entity.cloud.provider == "azure", f'Expected "aws" provider, got {entity.cloud.provider}'
         assert len(entity.entity.id) > 0, "Expected .entity.id list to contain an ID"
         assert len(entity.entity.id[0]) > 0, "Expected the ID to be non-empty"
         assert entity.Attributes, "Expected the resource under .Attributes"

tests/product/tests/test_gcp_asset_inventory.py

@@ -34,7 +34,7 @@ def test_gcp_asset_inventory(
     assert isinstance(entities, list) and len(entities) > 0, "Expected the list to be non-empty"
     for entity in entities:
         assert entity.cloud, "Expected .cloud section"
-        assert entity.cloud.Provider == "gcp", f'Expected "gcp" provider, got {entity.cloud.Provider}'
+        assert entity.cloud.provider == "gcp", f'Expected "gcp" provider, got {entity.cloud.provider}'
         assert len(entity.entity.id) > 0, "Expected .entity.id list to contain an ID"
         assert len(entity.entity.id[0]) > 0, "Expected the ID to be non-empty"
         assert entity.Attributes, "Expected the resource under .Attributes"

tests/pyproject.toml

@@ -27,9 +27,13 @@ dependencies = [
 packages = [
     {include="fleet_api"}
 ]
+name = "tests"
+version = "0.1.0"
+description = "Test project for cloudbeat agent"
+authors = ["Cloudbeat Team"]
 
-[tool.poetry.requires-plugins]
-poetry-plugin-export = ">=1.8"
+#[tool.poetry.requires-plugins]
+#poetry-plugin-export = ">=1.8"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]