fix: Sorts group mappings in ldap.toml by org_role

CHANGELOG.md

@@ -4,6 +4,8 @@ This file is used to list changes made in each version of grafana.
 
 ## Unreleased
 
+- Fix: Sorts group mappings in ldap.toml by org_role
+
 ## 10.8.0 - *2024-09-27*
 
 - Added org_ids to ldap_mapping functions

resources/config_ldap_group_mapping.rb

@@ -93,15 +93,23 @@ def remove_group_mapping
       next if nil_or_empty?(new_resource.send(rp))
 
       [rp.to_s, new_resource.send(rp)]
-    end.compact.sort.to_h
+    end.compact.to_h
 
+    # Fjern eksisterende gruppemapping om den finnes
     remove_group_mapping if group_mapping_exist?
 
+    # Hent eksisterende group_mappings eller opprett en tom liste hvis ingen finnes
     ldap_server_config(new_resource.host)['group_mappings'] ||= []
+
+    # Legg til den nye gruppemappingen
     ldap_server_config(new_resource.host)['group_mappings'].push(mapping)
+
+    # Sorter group_mappings etter org_role
+    ldap_server_config(new_resource.host)['group_mappings'].sort_by! { |gm| gm['org_role'] }
   end
 end
 
+
 action :delete do
   converge_by("Remove LDAP server #{new_resource.host} group mapping for #{new_resource.group_dn} from OrgID #{new_resource.org_id}") { remove_group_mapping } if group_mapping_exist?
 end