[gcp][feat] Add Pub/Sub service collection (#2287)

Author: 1101-1

fixlib/fixlib/baseresources.py

@@ -1112,7 +1112,7 @@ class BaseQueue(BaseResource):
     _categories: ClassVar[List[Category]] = [Category.storage]
     queue_type: Optional[QueueType] = None
     approximate_message_count: Optional[int] = None
-    message_retention_period: Optional[int] = None
+    message_retention_period_days: Optional[int] = None
 
 
 @define(eq=False, slots=False)

plugins/aws/fix_plugin_aws/resource/sqs.py

@@ -81,7 +81,7 @@ class AwsSqsQueue(AwsResource, BaseQueue, HasResourcePolicy):
         "sqs_delay_seconds": S("DelaySeconds") >> AsInt(),
         "sqs_receive_message_wait_time_seconds": S("ReceiveMessageWaitTimeSeconds") >> AsInt(),
         "sqs_managed_sse_enabled": S("SqsManagedSseEnabled") >> AsBool(),
-        "message_retention_period": S("MessageRetentionPeriod") >> AsInt(),
+        "message_retention_period_days": S("MessageRetentionPeriod") >> AsInt(),
         "approximate_message_count": S("ApproximateNumberOfMessages") >> AsInt(),
     }
     sqs_queue_url: Optional[str] = field(default=None)

plugins/azure/fix_plugin_azure/resource/storage.py

@@ -26,6 +26,7 @@
     MetricUnit,
     ModelReference,
     PhantomBaseResource,
+    QueueType,
 )
 from fixlib.json_bender import K, Bender, S, ForallBend, Bend, AsBool
 from fixlib.types import Json
@@ -320,8 +321,8 @@ class AzureStorageQueue(MicrosoftResource, BaseQueue):
         "tags": S("tags", default={}),
         "name": S("name"),
         "queue_metadata": S("properties", "metadata"),
-        "queue_type": K("standard"),
-        "message_retention_period": K(7),
+        "queue_type": K(QueueType.STANDARD),
+        "message_retention_period_days": K(7),
         "approximate_message_count": S("properties", "approximateMessageCount"),
     }
     queue_metadata: Optional[Dict[str, str]] = field(default=None, metadata={'description': 'A name-value pair that represents queue metadata.'})  # fmt: skip

plugins/gcp/fix_plugin_gcp/collector.py

@@ -16,6 +16,7 @@
     filestore,
     cloudfunctions,
     monitoring,
+    pubsub,
 )
 from fix_plugin_gcp.resources.base import GcpResource, GcpProject, ExecutorQueue, GraphBuilder, GcpRegion, GcpZone
 from fix_plugin_gcp.utils import Credentials
@@ -36,6 +37,7 @@
     + firestore.resources
     + filestore.resources
     + cloudfunctions.resources
+    + pubsub.resources
 )