ADCM-5652 Removed validate_object_type

Sealwing · Sealwing · commit d3fd91d8c14a · 2024-06-05T07:33:39.000Z
Since `parametrized_by_type` is created internally, validation is removed and put on user to create it correctly
diff --git a/python/rbac/migrations/0001_initial.py b/python/rbac/migrations/0001_initial.py
@@ -12,22 +12,13 @@
 
 # Generated by Django 3.2.9 on 2022-01-28 13:12
 
-from django.core.exceptions import ValidationError
 from django.db import connection, migrations, models
 import django.db.models.deletion
 import django.contrib.auth.models
 
 types = {"cluster", "service", "component", "provider", "host"}
 
 
-def validate(value):
-    if not isinstance(value, list):
-        raise ValidationError("Not a valid list.")
-
-    if not all(v in types for v in value):
-        raise ValidationError("Not a valid object type.")
-
-
 def upgrade_users(apps, schema_editor):
     query = """
             INSERT INTO "rbac_user" ("user_ptr_id", "profile", "built_in")
@@ -143,7 +134,7 @@ class Migration(migrations.Migration):
                 ("any_category", models.BooleanField(default=False)),
                 (
                     "parametrized_by_type",
-                    models.JSONField(default=list, validators=[validate]),
+                    models.JSONField(default=list),
                 ),
                 (
                     "bundle",
diff --git a/python/rbac/models.py b/python/rbac/models.py
@@ -41,7 +41,6 @@
 from django.db.transaction import atomic
 from guardian.models import GroupObjectPermission
 from guardian.shortcuts import get_perms_for_model
-from rest_framework.exceptions import ValidationError
 
 from rbac.utils import get_query_tuple_str
 
@@ -65,14 +64,6 @@ class RoleTypes(TextChoices):
     HIDDEN = "hidden", "hidden"
 
 
-def validate_object_type(value):
-    if not isinstance(value, list):
-        raise ValidationError("Not a valid list.")
-
-    if not all(v in ObjectType.values for v in value):
-        raise ValidationError("Not a valid object type.")
-
-
 class User(AuthUser):
     profile = JSONField(default=str)
     built_in = BooleanField(default=False, null=False)
@@ -118,7 +109,8 @@ class Role(Model):
     type = CharField(max_length=1000, choices=RoleTypes.choices, null=False, default=RoleTypes.ROLE)
     category = ManyToManyField(ProductCategory)
     any_category = BooleanField(default=False)
-    parametrized_by_type = JSONField(default=list, null=False, validators=[validate_object_type])
+    # should be a list of `ObjectType` strings
+    parametrized_by_type = JSONField(default=list, null=False)
     __obj__ = None
 
     class Meta:
