add tags to resource models

slashburygin · slashburygin · commit c0f8665248d6 · 2026-07-30T13:58:04.000+03:00
diff --git a/exordos_core/boot_api/api/app.py b/exordos_core/boot_api/api/app.py
@@ -55,7 +55,6 @@ def get_openapi_engine():
             description=f"OpenAPI - Exordos Core {versions.API_VERSION_v1}",
         ),
         paths=openapi_structures.OpenApiPaths(),
-        components=openapi_structures.OpenApiComponents(),
     )
     return openapi_engine
 
diff --git a/exordos_core/common/constants.py b/exordos_core/common/constants.py
@@ -100,3 +100,29 @@
 REPOSITORY_URL = "https://repo.exordos.com"
 ELEMENTS_PATH = "exordos-elements"
 INVENTORY_URL = f"{REPOSITORY_URL}/{ELEMENTS_PATH}/inventory.json"
+
+
+TABLES_TO_MODELS = {
+    "em_services": "exordos_core.elements.dm.models:Service",
+    "nodes": "exordos_core.compute.dm.models:Node",
+    "compute_sets": "exordos_core.compute.dm.models:NodeSet",
+    "config_configs": "exordos_core.config.dm.models:Config",
+    "net_lb": "exordos_core.user_api.network.dm.models:LB",
+    "net_lb_vhosts": "exordos_core.user_api.network.dm.models:Vhost",
+    "net_lb_vhosts_routes": "exordos_core.user_api.network.dm.models:Route",
+    "net_lb_backendpools": "exordos_core.user_api.network.dm.models:BackendPool",
+    "secret_passwords": "exordos_core.secret.dm.models:Password",
+    "secret_certificates": "exordos_core.secret.dm.models:Certificate",
+    "dns_domains": "exordos_core.user_api.dns.dm.models:Domain",
+    "dns_records": "exordos_core.user_api.dns.dm.models:Record",
+    "iam_organizations": "exordos_core.user_api.iam.dm.models:Organization",
+    "iam_organization_members": "exordos_core.user_api.iam.dm.models:OrganizationMember",
+    "iam_roles": "exordos_core.user_api.iam.dm.models:Role",
+    "iam_binding_roles": "exordos_core.user_api.iam.dm.models:RoleBinding",
+    "iam_projects": "exordos_core.user_api.iam.dm.models:Project",
+    "iam_permissions": "exordos_core.user_api.iam.dm.models:Permission",
+    "iam_binding_permissions": "exordos_core.user_api.iam.dm.models:PermissionBinding",
+    "vs_profiles": "exordos_core.vs.dm.models:Profile",
+    "vs_variables": "exordos_core.vs.dm.models:Variable",
+    "vs_values": "exordos_core.vs.dm.models:Value",
+}
diff --git a/exordos_core/compute/dm/models.py b/exordos_core/compute/dm/models.py
@@ -303,6 +303,7 @@ class NodeSet(
     infra_models.NodeSet,
     ua_models.InstanceWithDerivativesMixin,
     QuotaModelMixin,
+    models.ModelWithTags,
     orm.SQLStorableMixin,
 ):
     __tablename__ = "compute_sets"
diff --git a/exordos_core/config/dm/models.py b/exordos_core/config/dm/models.py
@@ -77,6 +77,7 @@ def from_command(cls, command: str) -> "OnChangeShell":
 
 class Config(
     cm.ModelWithFullAsset,
+    models.ModelWithTags,
     orm.SQLStorableMixin,
     ua_models.TargetResourceMixin,
     ua_models.TargetResourceSQLStorableMixin,
diff --git a/exordos_core/elements/dm/models.py b/exordos_core/elements/dm/models.py
@@ -1266,6 +1266,7 @@ def get_dp_obj(self):
 
 class Service(
     cm.ModelWithFullAsset,
+    models.ModelWithTags,
     orm.SQLStorableMixin,
     ua_models.TargetResourceMixin,
     ua_models.TargetResourceSQLStorableMixin,
diff --git a/exordos_core/quota/dm/models.py b/exordos_core/quota/dm/models.py
@@ -26,6 +26,8 @@
 from restalchemy.dm import types
 from restalchemy.storage.sql import orm
 
+from exordos_core.common import constants
+
 LOG = logging.getLogger(__name__)
 
 
@@ -60,20 +62,11 @@ def __init__(
 DEFAULT_QUOTA_FIELD_LIMITS: tp.Dict[str, tp.Dict[str, int]] = {
     "nodes": {"cores": 10000},
 }
-QUOTA_RESOURCE_MODELS = {
-    "net_lb": "exordos_core.user_api.network.dm.models:LB",
-    "compute_sets": "exordos_core.compute.dm.models:NodeSet",
-    "nodes": "exordos_core.compute.dm.models:Node",
-    "secret_passwords": "exordos_core.secret.dm.models:Password",
-    "secret_certificates": "exordos_core.secret.dm.models:Certificate",
-    "secret_rsa_keys": "exordos_core.secret.dm.models:RSAKey",
-    "secret_ssh_keys": "exordos_core.secret.dm.models:SSHKey",
-}
 
 
 def get_quota_resource_model(resource_name: str) -> type:
     try:
-        module_name, class_name = QUOTA_RESOURCE_MODELS[resource_name].split(":")
+        module_name, class_name = constants.TABLES_TO_MODELS[resource_name].split(":")
     except KeyError:
         raise ValueError(f"Unknown quota resource: {resource_name}")
 
diff --git a/exordos_core/secret/dm/models.py b/exordos_core/secret/dm/models.py
@@ -138,6 +138,7 @@ class DNSCoreCertificateMethod(AbstractCertificateMethod):
 
 class Certificate(
     Secret,
+    ra_models.ModelWithTags,
     QuotaModelMixin,
     orm.SQLStorableWithJSONFieldsMixin,
     ua_models.TargetResourceSQLStorableMixin,
diff --git a/exordos_core/user_api/dns/dm/models.py b/exordos_core/user_api/dns/dm/models.py
@@ -47,7 +47,12 @@ class CommonModel(
     pass
 
 
-class Domain(CommonModel, models.ModelWithProject, ua_models.TargetResourceMixin):
+class Domain(
+    CommonModel,
+    models.ModelWithTags,
+    models.ModelWithProject,
+    ua_models.TargetResourceMixin,
+):
     __tablename__ = "dns_domains"
     name = properties.property(types.String(), required=True)
     sync_to_ecosystem = properties.property(types.Boolean(), default=False)
diff --git a/exordos_core/user_api/iam/dm/models.py b/exordos_core/user_api/iam/dm/models.py
@@ -625,6 +625,7 @@ class Permission(
     models.ModelWithUUID,
     models.ModelWithRequiredNameDesc,
     models.ModelWithTimestamp,
+    models.ModelWithTags,
     ModelWithAlwaysActiveStatus,
     ua_models.TargetResourceMixin,
     orm.SQLStorableMixin,
diff --git a/exordos_core/user_api/network/dm/models.py b/exordos_core/user_api/network/dm/models.py
@@ -69,6 +69,7 @@ class LB(
     models.ModelWithNameDesc,
     models.ModelWithTimestamp,
     models.ModelWithProject,
+    models.ModelWithTags,
     QuotaModelMixin,
     orm.SQLStorableMixin,
     ua_models.TargetResourceMixin,
diff --git a/exordos_core/vs/dm/models.py b/exordos_core/vs/dm/models.py
@@ -23,6 +23,7 @@
 from gcl_sdk.infra import exceptions as infra_exc
 from gcl_sdk.infra.dm import models as infra_models
 from restalchemy.dm import filters as dm_filters
+from restalchemy.dm import models
 from restalchemy.dm import properties
 from restalchemy.dm import relationships
 from restalchemy.dm import types
@@ -295,6 +296,7 @@ def release_value(self):
 
 class Value(
     infra_models.Value,
+    models.ModelWithTags,
     AnySimpleTypeValueFieldSQLMixin,
 ):
     __tablename__ = "vs_values"
diff --git a/migrations/0001-add-tags-to-models-9e4b2d1f.py b/migrations/0001-add-tags-to-models-9e4b2d1f.py
@@ -0,0 +1,49 @@
+#    Copyright 2026 Genesis Corporation.
+#
+#    All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from restalchemy.storage.sql import migrations
+
+from exordos_core.common import constants
+
+
+class MigrationStep(migrations.AbstarctMigrationStep):
+    def __init__(self):
+        self._depends = ["0000-squashed-current-7f2e4a.py"]
+
+    @property
+    def migration_id(self):
+        return "9e4b2d1f-58cc-4372-a567-0e02b2c3d479"
+
+    @property
+    def is_manual(self):
+        return False
+
+    def upgrade(self, session):
+        for table in constants.TABLES_TO_MODELS.keys():
+            session.execute(
+                f"ALTER TABLE public.{table} ADD COLUMN tags TEXT[] NOT NULL DEFAULT '{{}}';"
+            )
+            session.execute(
+                f"CREATE INDEX idx_{table}_tags ON public.{table} USING GIN (tags);"
+            )
+
+    def downgrade(self, session):
+        for table in constants.TABLES_TO_MODELS.keys():
+            session.execute(f"DROP INDEX IF EXISTS public.idx_{table}_tags;")
+            session.execute(f"ALTER TABLE public.{table} DROP COLUMN IF EXISTS tags;")
+
+
+migration_step = MigrationStep()

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ def get_openapi_engine():`
`55`	`55`	`description=f"OpenAPI - Exordos Core {versions.API_VERSION_v1}",`
`56`	`56`	`),`
`57`	`57`	`paths=openapi_structures.OpenApiPaths(),`
`58`		`- components=openapi_structures.OpenApiComponents(),`
`59`	`58`	`)`
`60`	`59`	`return openapi_engine`
`61`	`60`