[aws][fix] Add test for s3 storage metrics (#2059)

Author: aquamatthias

plugins/aws/test/resources/__init__.py

@@ -2,6 +2,7 @@
 import os
 import re
 from concurrent.futures import ThreadPoolExecutor
+from datetime import datetime, timezone, timedelta
 from queue import Queue
 from typing import Type, Any, Callable, Set, Tuple, Optional
 
@@ -139,7 +140,18 @@ def build_graph(cls: Type[AwsResourceType], region_name: Optional[str] = None) -
         region = AwsRegion(id=region_name, name=region_name)
         feedback = CoreFeedback("test", "test", "collect", Queue())
         account = AwsAccount(id="test", mfa_devices=12, mfa_devices_in_use=12)
-        builder = GraphBuilder(Graph(), Cloud(id="test"), account, region, client, queue, feedback)
+        now = datetime(2024, 5, 1, 12, 0, 0, tzinfo=timezone.utc)
+        builder = GraphBuilder(
+            Graph(),
+            Cloud(id="test"),
+            account,
+            region,
+            client,
+            queue,
+            feedback,
+            last_run_started_at=now - timedelta(hours=1),
+        )
+        builder.created_at = now
         cls.collect_resources(builder)
         builder.executor.wait_for_submitted_work()
         return builder

plugins/aws/test/resources/files/cloudwatch/get-metric-data__2024_05_01_12_00_00_00_00_numberofobjects_aws_s3_bucketname_bucket_1_storagetype_allstoragetypes_average_AWS_S3_NumberOfObjects_BucketName_bucket_1_StorageType_AllStorageTypes_86400_Average_Count_True_bucketsizebytes_a.json

@@ -0,0 +1,26 @@
+{
+    "MetricDataResults": [
+        {
+            "Id": "bucketsizebytes_aws_s3_bucketname_bucket_1_storagetype_standardstorage_average",
+            "Label": "BucketSizeBytes",
+            "Timestamps": [ "2024-04-30T12:50:00+00:00" ],
+            "Values": [ 1 ],
+            "StatusCode": "Complete"
+        },
+        {
+            "Id": "bucketsizebytes_aws_s3_bucketname_bucket_1_storagetype_intelligenttieringstorage_average",
+            "Label": "BucketSizeBytes",
+            "Timestamps": [ "2024-04-30T12:50:00+00:00" ],
+            "Values": [ 2 ],
+            "StatusCode": "Complete"
+        },
+        {
+            "Id": "bucketsizebytes_aws_s3_bucketname_bucket_1_storagetype_standardiastorage_average",
+            "Label": "BucketSizeBytes",
+            "Timestamps": [ "2024-04-30T12:50:00+00:00" ],
+            "Values": [ 3 ],
+            "StatusCode": "Complete"
+        }
+    ],
+    "Messages": []
+}

plugins/aws/test/resources/s3_test.py

@@ -60,3 +60,12 @@ def validate_delete_args(aws_service: str, fn: Callable[[Any], None]) -> Any:
 
     client = cast(AwsClient, SimpleNamespace(with_resource=validate_delete_args))
     bucket.delete_resource(client, Graph())
+
+
+def test_s3_usage_metrics() -> None:
+    bucket, _ = round_trip_for(AwsS3Bucket)
+    assert bucket._resource_usage["standard_storage_bucket_size_bytes"]["avg"] == 1.0
+    assert bucket._resource_usage["intelligent_tiering_storage_bucket_size_bytes"]["avg"] == 2.0
+    assert bucket._resource_usage["standard_ia_storage_bucket_size_bytes"]["avg"] == 3.0
+    # This values is computed internally using the other values. If the number does not match, the logic is broken!
+    assert bucket._resource_usage["bucket_size_bytes"]["avg"] == 6.0