Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fixlib/fixlib/baseresources.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion plugins/aws/fix_plugin_aws/resource/sqs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 3 additions & 2 deletions plugins/azure/fix_plugin_azure/resource/storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
MetricUnit,
ModelReference,
PhantomBaseResource,
QueueType,
)
from fixlib.json_bender import K, Bender, S, ForallBend, Bend, AsBool
from fixlib.types import Json
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions plugins/gcp/fix_plugin_gcp/collector.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -36,6 +37,7 @@
+ firestore.resources
+ filestore.resources
+ cloudfunctions.resources
+ pubsub.resources
)


Expand Down
Loading
Loading