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

[feat][fixlib] Extend base resources with additional common properties #2278

Merged
merged 17 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
improve prop types
  • Loading branch information
aquamatthias committed Nov 13, 2024
commit 6f2f70749d4fe51e991943cda136767be7f66b8e
14 changes: 8 additions & 6 deletions fixlib/fixlib/baseresources.py
Original file line number Diff line number Diff line change
Expand Up @@ -1093,17 +1093,21 @@ class BaseBucket(BaseResource):
versioning_enabled: Optional[bool] = None


@unique
class QueueType(Enum):
kind: ClassVar[str] = "queue_type"
STANDARD = "standard"
FIFO = "fifo"

@define(eq=False, slots=False)
class BaseQueue(BaseResource):
kind: ClassVar[str] = "queue"
_kind_display: ClassVar[str] = "Storage Queue"
_kind_description: ClassVar[str] = "A storage queue."
_metadata: ClassVar[Dict[str, Any]] = {"icon": "queue", "group": "storage"}
_categories: ClassVar[List[Category]] = [Category.storage]
# Type of queue (e.g., standard, FIFO)
queue_type: Optional[str] = None
queue_type: Optional[QueueType] = None
approximate_message_count: Optional[int] = None
# Message retention period in seconds
message_retention_period: Optional[int] = None


Expand Down Expand Up @@ -1344,8 +1348,6 @@ class BaseUser(BaseResource):
_kind_description: ClassVar[str] = "A user."
_metadata: ClassVar[Dict[str, Any]] = {"icon": "user", "group": "access_control"}
_categories: ClassVar[List[Category]] = [Category.access_control]
# Name associated with the user account
username: Optional[str] = None


@define(eq=False, slots=False)
Expand Down Expand Up @@ -1391,7 +1393,7 @@ class BaseAccessKey(BaseResource):
_kind_description: ClassVar[str] = "An access key."
_metadata: ClassVar[Dict[str, Any]] = {"icon": "key", "group": "access_control"}
_categories: ClassVar[List[Category]] = [Category.access_control, Category.security]
access_key_status: str = ""
access_key_status: Optional[str] = None


@define(eq=False, slots=False)
Expand Down
6 changes: 2 additions & 4 deletions plugins/aws/fix_plugin_aws/resource/sqs.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
ModelReference,
PolicySource,
PolicySourceKind,
QueueType,
)
from fixlib.graph import Graph
from fixlib.json_bender import F, Bender, S, AsInt, AsBool, Bend, ParseJson, Sorted
Expand Down Expand Up @@ -130,10 +131,7 @@ def add_instance(queue_url: str) -> None:
queue_attributes["QueueName"] = queue_url.rsplit("/", 1)[-1]
if instance := AwsSqsQueue.from_api(queue_attributes, builder):
builder.add_node(instance, queue_attributes)
if instance.sqs_fifo_queue:
instance.queue_type = "FIFO"
else:
instance.queue_type = "default"
instance.queue_type = QueueType.FIFO if instance.sqs_fifo_queue else QueueType.STANDARD
builder.submit_work(service_name, add_tags, instance)

def add_tags(queue: AwsSqsQueue) -> None:
Expand Down
2 changes: 1 addition & 1 deletion plugins/azure/fix_plugin_azure/resource/storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ class AzureStorageQueue(MicrosoftResource, BaseQueue):
"tags": S("tags", default={}),
"name": S("name"),
"queue_metadata": S("properties", "metadata"),
"queue_type": K("default"),
"queue_type": K("standard"),
"message_retention_period": K(7),
"approximate_message_count": S("properties", "approximateMessageCount"),
}
Expand Down
Loading