More SonarCloud feedback

Author: AlanCoding

ansible_base/rbac/management/__init__.py

@@ -45,7 +45,7 @@ def create_dab_permissions(app_config, verbosity=2, interactive=True, using=DEFA
 
 def is_safe_identifier(name: str) -> bool:
     """Returns True or False, name is a valid identifier in postgres, just for safety"""
-    return re.match(r'^[A-Za-z_][A-Za-z0-9_]*$', name) is not None
+    return re.match(r'^[A-Za-z_]\w*$', name) is not None
 
 
 def reset_ct_sequence(ct_cls):
@@ -130,6 +130,5 @@ def sync_dab_permissions(verbosity=2, using=DEFAULT_DB_ALIAS, apps=global_apps):
         logger.debug(f"Added DAB permissions for model {model_name}: {codename_prnt}")
 
     # Reset the sequence to avoid PK collision later
-    if connection.vendor == 'postgresql':
-        if new_cts:
-            reset_ct_sequence(dab_ct_cls)
+    if connection.vendor == 'postgresql' and new_cts:
+        reset_ct_sequence(dab_ct_cls)

ansible_base/rbac/management/create_types.py

@@ -10,7 +10,7 @@
 logger = logging.getLogger(__name__)
 
 
-def get_local_DAB_contenttypes(using: str, ct_model: Type[models.Model]) -> dict[tuple[str, str], models.Model]:
+def get_local_dab_contenttypes(using: str, ct_model: Type[models.Model]) -> dict[tuple[str, str], models.Model]:
     # This should work in migration scenarios, but other code checks for existence of it on manager
     ct_model.objects.clear_cache()
 
@@ -34,7 +34,7 @@ def create_DAB_contenttypes(
     dab_ct_cls = apps.get_model("dab_rbac", "DABContentType")
     ct_cls = apps.get_model("contenttypes", "ContentType")
 
-    content_types = get_local_DAB_contenttypes(using, dab_ct_cls)
+    content_types = get_local_dab_contenttypes(using, dab_ct_cls)
 
     ct_data = []
     for model in permission_registry.all_registered_models:

ansible_base/rbac/models/content_type.py

@@ -86,7 +86,6 @@ def get_for_models(
         self,
         *model_list: Union[Type[django_models.Model], django_models.Model],
         for_concrete_models: bool = True,
-        service: Optional[str] = None,
     ) -> Dict[Type[django_models.Model], django_models.Model]:
         """Return ``DABContentType`` objects for each model in ``model_list``.
 
@@ -104,12 +103,12 @@ def get_for_models(
         for model in model_list:
             opts = self._get_opts(model, for_concrete_models)
             # For local models, this will give the local service name of "shared" for shared models
-            service = get_resource_prefix(model)
+            model_service = get_resource_prefix(model)
             try:
-                ct = self._get_from_cache(opts, service)
+                ct = self._get_from_cache(opts, model_service)
             except KeyError:
-                needed_models[(service, opts.app_label)].add(opts.model_name)
-                needed_opts[(service, opts.app_label, opts.model_name)].append(model)
+                needed_models[(model_service, opts.app_label)].add(opts.model_name)
+                needed_opts[(model_service, opts.app_label, opts.model_name)].append(model)
             else:
                 results[model] = ct