[resotolib][feat] Add base resources for organizations (#1896)

someengineering · Feb 2, 2024 · 04ba9e3 · 04ba9e3
1 parent d502962
commit 04ba9e3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/plugins/aws/resoto_plugin_aws/collector.py b/plugins/aws/resoto_plugin_aws/collector.py
@@ -47,7 +47,7 @@
 )
 from resoto_plugin_aws.resource.base import AwsAccount, AwsApiSpec, AwsRegion, AwsResource, GraphBuilder
 
-from resotolib.baseresources import Cloud, EdgeType
+from resotolib.baseresources import Cloud, EdgeType, BaseOrganizationalRoot, BaseOrganizationalUnit
 from resotolib.core.actions import CoreFeedback
 from resotolib.core.progress import ProgressDone, ProgressTree
 from resotolib.graph import Graph, BySearchCriteria, ByNodeId
@@ -373,14 +373,14 @@ def add_accounts(parent: Union[AwsOrganizationalRoot, AwsOrganizationalUnit]) ->
 
 
 @define(eq=False, slots=False)
-class AwsOrganizationalRoot(AwsResource):
+class AwsOrganizationalRoot(BaseOrganizationalRoot, AwsResource):
     kind: ClassVar[str] = "aws_organizational_root"
     kind_display: ClassVar[str] = "AWS Organizational Root"
     kind_description: ClassVar[str] = "An AWS Organizational Root is the root of an AWS Organization."
 
 
 @define(eq=False, slots=False)
-class AwsOrganizationalUnit(AwsResource):
+class AwsOrganizationalUnit(BaseOrganizationalUnit, AwsResource):
     kind: ClassVar[str] = "aws_organizational_unit"
     kind_display: ClassVar[str] = "AWS Organizational Unit"
     kind_description: ClassVar[str] = "An AWS Organizational Unit is a container for AWS Accounts."
diff --git a/resotolib/resotolib/baseresources.py b/resotolib/resotolib/baseresources.py
@@ -1248,6 +1248,22 @@ def _keys(self) -> tuple[Any, ...]:
         )
 
 
+@define(eq=False, slots=False)
+class BaseOrganizationalRoot(BaseResource):
+    kind: ClassVar[str] = "organizational_root"
+    kind_display: ClassVar[str] = "Organizational Root"
+    kind_description: ClassVar[str] = "An Organizational Root."
+    metadata: ClassVar[Dict[str, Any]] = {"icon": "resource", "group": "misc"}
+
+
+@define(eq=False, slots=False)
+class BaseOrganizationalUnit(BaseResource):
+    kind: ClassVar[str] = "organizational_unit"
+    kind_display: ClassVar[str] = "Organizational Unit"
+    kind_description: ClassVar[str] = "An Organizational Unit."
+    metadata: ClassVar[Dict[str, Any]] = {"icon": "resource", "group": "misc"}
+
+
 @define(eq=False, slots=False)
 class UnknownCloud(BaseCloud):
     kind: ClassVar[str] = "unknown_cloud"