fix: added org_id to ldap group mapping functions (#466)

* fix: added org_id to ldap group mapping functions to support more than one org pr instance * fix: added org_id to ldap group mapping functions to support more than one org pr instance * doc: added to to the changelog * fix: cookstyle error * fix: markdown error * fix: markdown error --------- Co-authored-by: Simen Andrè Vikestrand Skogum <[email protected]>
sous-chefs · Sep 27, 2024 · c69b263 · c69b263
1 parent 9f1efe3
commit c69b263
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@ This file is used to list changes made in each version of grafana.
 
 ## Unreleased
 
+- Added org_ids to ldap_mapping functions
+
 ## 10.7.4 - *2024-07-15*
 
 Standardise files with files in sous-chefs/repo-management

diff --git a/resources/config_ldap_group_mapping.rb b/resources/config_ldap_group_mapping.rb
@@ -71,7 +71,7 @@ def group_mapping_exist?
 
     return unless group_mappings
 
-    group_mappings.any? { |gm| gm['group_dn'].eql?(new_resource.group_dn) && gm['org_role'].eql?(new_resource.org_role) }
+    group_mappings.any? { |gm| gm['group_dn'].eql?(new_resource.group_dn) && gm['org_role'].eql?(new_resource.org_role) && gm['org_id'].eql?(new_resource.org_id) }
   end
 
   def remove_group_mapping
@@ -81,7 +81,7 @@ def remove_group_mapping
 
     return unless group_mappings
 
-    group_mappings.delete_if { |gm| gm['group_dn'].eql?(new_resource.group_dn) && gm['org_role'].eql?(new_resource.org_role) }
+    group_mappings.delete_if { |gm| gm['group_dn'].eql?(new_resource.group_dn) && gm['org_role'].eql?(new_resource.org_role) && gm['org_id'].eql?(new_resource.org_id) }
   end
 end
 
@@ -103,5 +103,5 @@ def remove_group_mapping
 end
 
 action :delete do
-  converge_by("Remove LDAP server #{new_resource.host} group mapping for #{new_resource.group_dn}") { remove_group_mapping } if group_mapping_exist?
+  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