Implement Dormant Features

src/spaceone/identity/interface/grpc/project.py

@@ -49,18 +49,6 @@ def remove_users(self, request, context):
         response: dict = project_svc.remove_users(params)
         return self.dict_to_message(response)
 
-    def add_user_groups(self, request, context):
-        params, metadata = self.parse_request(request, context)
-        project_svc = ProjectService(metadata)
-        response: dict = project_svc.add_user_groups(params)
-        return self.dict_to_message(response)
-
-    def remove_user_groups(self, request, context):
-        params, metadata = self.parse_request(request, context)
-        project_svc = ProjectService(metadata)
-        response: dict = project_svc.remove_user_groups(params)
-        return self.dict_to_message(response)
-
     def get(self, request, context):
         params, metadata = self.parse_request(request, context)
         project_svc = ProjectService(metadata)

src/spaceone/identity/model/project/database.py

@@ -10,7 +10,6 @@ class Project(MongoModel):
     )
     tags = DictField(default=None)
     users = ListField(StringField(max_length=40), default=None)
-    user_groups = ListField(StringField(max_length=255), default=None)
     created_by = StringField(max_length=255)
     reference_id = StringField(max_length=255, default=None, null=True)
     is_managed = BooleanField(default=False)
@@ -27,7 +26,6 @@ class Project(MongoModel):
             "project_type",
             "tags",
             "users",
-            "user_groups",
             "is_managed",
             "trusted_account_id",
             "project_group_id",
@@ -43,13 +41,11 @@ class Project(MongoModel):
         "change_query_keys": {
             "user_projects": "project_id",
             "user_id": "users",
-            "user_group_id": "user_groups",
         },
         "ordering": ["name"],
         "indexes": [
             "project_type",
             "users",
-            "user_groups",
             "project_group_id",
             "workspace_id",
             "domain_id",

src/spaceone/identity/model/project/request.py

@@ -8,8 +8,6 @@
     "ProjectDeleteRequest",
     "ProjectAddUsersRequest",
     "ProjectRemoveUsersRequest",
-    "ProjectAddUserGroupsRequest",
-    "ProjectRemoveUserGroupsRequest",
     "ProjectGetRequest",
     "ProjectSearchQueryRequest",
     "ProjectStatQueryRequest",
@@ -74,22 +72,6 @@ class ProjectRemoveUsersRequest(BaseModel):
     user_projects: Union[list, None] = None
 
 
-class ProjectAddUserGroupsRequest(BaseModel):
-    project_id: str
-    user_groups: List[str]
-    workspace_id: str
-    domain_id: str
-    user_projects: Union[list, None] = None
-
-
-class ProjectRemoveUserGroupsRequest(BaseModel):
-    project_id: str
-    user_groups: List[str]
-    workspace_id: str
-    domain_id: str
-    user_projects: Union[list, None] = None
-
-
 class ProjectGetRequest(BaseModel):
     project_id: str
     workspace_id: Union[str, None] = None
@@ -105,7 +87,6 @@ class ProjectSearchQueryRequest(BaseModel):
     created_by: Union[str, None] = None
     include_children: Union[bool, None] = None
     user_id: Union[str, None] = None
-    user_group_id: Union[str, None] = None
     project_group_id: Union[str, None] = None
     workspace_id: Union[str, None] = None
     domain_id: str

src/spaceone/identity/model/project/response.py

@@ -15,7 +15,6 @@ class ProjectResponse(BaseModel):
     project_type: Union[ProjectType, None] = None
     tags: Union[dict, None] = None
     users: Union[List[str], None] = None
-    user_groups: Union[List[str], None] = None
     created_by: Union[str, None] = None
     reference_id: Union[str, None] = None
     is_managed: Union[bool, None] = None

src/spaceone/identity/model/service_account/database.py

@@ -7,11 +7,18 @@ class ServiceAccount(MongoModel):
     name = StringField(
         max_length=255, unique_with=["domain_id", "workspace_id", "project_id"]
     )
+    state = StringField(
+        max_length=20,
+        required=True,
+        choices=["PENDING", "ACTIVE", "INACTIVE", "DELETED"],
+    )
     data = DictField(default=None)
     provider = StringField(max_length=40)
     tags = DictField(default=None)
     reference_id = StringField(max_length=255, default=None, null=True)
     is_managed = BooleanField(default=False)
+    asset_info = DictField(default=None)
+    cost_info = DictField(default=None)
     secret_schema_id = StringField(max_length=40)
     secret_id = StringField(max_length=40)
     trusted_account_id = StringField(max_length=40, null=True, default=None)
@@ -20,13 +27,18 @@ class ServiceAccount(MongoModel):
     domain_id = StringField(max_length=40)
     created_at = DateTimeField(auto_now_add=True)
     last_synced_at = DateTimeField(default=None, null=True)
+    deleted_at = DateTimeField(default=None, null=True)
+    inactivated_at = DateTimeField(default=None, null=True)
 
     meta = {
         "updatable_fields": [
             "name",
+            "state",
             "data",
             "tags",
             "is_managed",
+            "asset_info",
+            "cost_info",
             "secret_schema_id",
             "secret_id",
             "trusted_account_id",
@@ -36,6 +48,7 @@ class ServiceAccount(MongoModel):
         "minimal_fields": [
             "service_account_id",
             "name",
+            "state",
             "provider",
             "is_managed",
             "trusted_account_id",
@@ -46,6 +59,7 @@ class ServiceAccount(MongoModel):
         "ordering": ["name"],
         "indexes": [
             "name",
+            "state",
             "provider",
             "secret_schema_id",
             "secret_id",

src/spaceone/identity/model/service_account/request.py

@@ -1,4 +1,4 @@
-from typing import Union
+from typing import Union, Literal
 from pydantic import BaseModel
 
 __all__ = [
@@ -10,8 +10,11 @@
     "ServiceAccountGetRequest",
     "ServiceAccountSearchQueryRequest",
     "ServiceAccountStatQueryRequest",
+    "State",
 ]
 
+State = Literal["PENDING", "ACTIVE", "INACTIVE", "DELETED"]
+
 
 class ServiceAccountCreateRequest(BaseModel):
     name: str
@@ -72,6 +75,7 @@ class ServiceAccountSearchQueryRequest(BaseModel):
     query: Union[dict, None] = None
     service_account_id: Union[str, None] = None
     name: Union[str, None] = None
+    state: Union[State, None] = None
     provider: Union[str, None] = None
     secret_schema_id: Union[str, None] = None
     secret_id: Union[str, None] = None

src/spaceone/identity/model/service_account/response.py

@@ -2,13 +2,15 @@
 from typing import Union, List
 from pydantic import BaseModel
 from spaceone.core import utils
+from spaceone.identity.model.service_account.request import State
 
 __all__ = ["ServiceAccountResponse", "ServiceAccountsResponse"]
 
 
 class ServiceAccountResponse(BaseModel):
     service_account_id: Union[str, None] = None
     name: Union[str, None] = None
+    state: Union[State, None] = None
     data: Union[dict, None] = None
     provider: Union[str, None] = None
     tags: Union[dict, None] = None
@@ -22,11 +24,15 @@ class ServiceAccountResponse(BaseModel):
     domain_id: Union[str, None] = None
     created_at: Union[datetime, None] = None
     last_synced_at: Union[datetime, None] = None
+    deleted_at: Union[datetime, None] = None
+    inactivated_at: Union[datetime, None] = None
 
     def dict(self, *args, **kwargs):
         data = super().dict(*args, **kwargs)
         data["created_at"] = utils.datetime_to_iso8601(data["created_at"])
         data["last_synced_at"] = utils.datetime_to_iso8601(data.get("last_synced_at"))
+        data["deleted_at"] = utils.datetime_to_iso8601(data.get("deleted_at"))
+        data["inactivated_at"] = utils.datetime_to_iso8601(data.get("inactivated_at"))
         return data
 
 

src/spaceone/identity/model/user_profile/response.py

@@ -19,15 +19,20 @@ class MyWorkspaceResponse(BaseModel):
     created_by: Union[str, None] = None
     reference_id: Union[str, None] = None
     is_managed: Union[bool, None] = None
+    is_dormant: Union[bool, None] = None
     role_id: Union[str, None] = None
     domain_id: Union[str, None] = None
     created_at: Union[datetime, None] = None
     last_synced_at: Union[datetime, None] = None
+    dormant_updated_at: Union[datetime, None] = None
 
     def dict(self, *args, **kwargs):
         data = super().dict(*args, **kwargs)
         data["created_at"] = utils.datetime_to_iso8601(data["created_at"])
         data["last_synced_at"] = utils.datetime_to_iso8601(data.get("last_synced_at"))
+        data["dormant_updated_at"] = utils.datetime_to_iso8601(
+            data.get("dormant_updated_at")
+        )
         return data
 
 

src/spaceone/identity/model/workspace/database.py

@@ -15,18 +15,29 @@ class Workspace(MongoModel):
     created_by = StringField(max_length=255)
     references = ListField(StringField(max_length=255), default=None, null=True)
     is_managed = BooleanField(default=False)
+
+    is_dormant = BooleanField(default=False)
+    dormant_ttl = IntField(default=None)
+    service_account_count = IntField(default=None)
+    cost_info = DictField(default=None)
+
     trusted_account_id = StringField(max_length=40, default=None, null=True)
     domain_id = StringField(max_length=40)
     created_at = DateTimeField(auto_now_add=True)
     deleted_at = DateTimeField(default=None, null=True)
     last_synced_at = DateTimeField(default=None, null=True)
+    dormant_updated_at = DateTimeField(default=None, null=True)
 
     meta = {
         "updatable_fields": [
             "name",
             "state",
             "tags",
             "is_managed",
+            "is_dormant",
+            "dormant_ttl",
+            "service_account_count",
+            "cost_info",
             "trusted_account_id",
             "references",
             "deleted_at",
@@ -37,12 +48,20 @@ class Workspace(MongoModel):
             "name",
             "state",
             "is_managed",
+            "is_dormant",
         ],
         "change_query_keys": {
             "reference_id": "references",
         },
         "ordering": ["name"],
-        "indexes": ["name", "domain_id"],
+        "indexes": [
+            "name",
+            "state",
+            "domain_id",
+            "created_by",
+            "is_managed",
+            "is_dormant",
+        ],
     }
 
     @queryset_manager

src/spaceone/identity/model/workspace/request.py

@@ -1,4 +1,4 @@
-from typing import Union
+from typing import Union, Literal
 from pydantic import BaseModel
 
 __all__ = [
@@ -11,8 +11,11 @@
     "WorkspaceCheckRequest",
     "WorkspaceSearchQueryRequest",
     "WorkspaceStatQueryRequest",
+    "State",
 ]
 
+State = Literal["ENABLED", "DISABLED"]
+
 
 class WorkspaceCreateRequest(BaseModel):
     name: str
@@ -56,8 +59,11 @@ class WorkspaceCheckRequest(BaseModel):
 class WorkspaceSearchQueryRequest(BaseModel):
     query: Union[dict, None] = None
     name: Union[str, None] = None
+    state: Union[State, None] = None
     workspace_id: Union[str, None] = None
     created_by: Union[str, None] = None
+    is_managed: Union[bool, None] = None
+    is_dormant: Union[bool, None] = None
     domain_id: str
 
 

src/spaceone/identity/model/workspace/response.py

@@ -1,13 +1,12 @@
 from datetime import datetime
-from typing import Union, List, Literal
+from typing import Union, List
 from pydantic import BaseModel
 
 from spaceone.core import utils
+from spaceone.identity.model.workspace.request import State
 
 __all__ = ["WorkspaceResponse", "WorkspacesResponse"]
 
-State = Literal["ENABLED", "DISABLED"]
-
 
 class WorkspaceResponse(BaseModel):
     workspace_id: Union[str, None] = None
@@ -17,15 +16,23 @@ class WorkspaceResponse(BaseModel):
     created_by: Union[str, None] = None
     references: Union[list, None] = None
     is_managed: Union[bool, None] = None
+    is_dormant: Union[bool, None] = None
+    dormant_ttl: Union[int, None] = None
+    service_account_count: Union[int, None] = None
+    cost_info: Union[dict, None] = None
     trusted_account_id: Union[str, None] = None
     domain_id: Union[str, None] = None
     created_at: Union[datetime, None] = None
     last_synced_at: Union[datetime, None] = None
+    dormant_updated_at: Union[datetime, None] = None
 
     def dict(self, *args, **kwargs):
         data = super().dict(*args, **kwargs)
         data["created_at"] = utils.datetime_to_iso8601(data["created_at"])
         data["last_synced_at"] = utils.datetime_to_iso8601(data.get("last_synced_at"))
+        data["dormant_updated_at"] = utils.datetime_to_iso8601(
+            data.get("dormant_updated_at")
+        )
         return data