here go

aslilac · aslilac · commit 096e2f7a625b · 2025-01-29T19:10:47.000Z
diff --git a/enterprise/coderd/idpsync.go b/enterprise/coderd/idpsync.go
@@ -3,6 +3,7 @@ package coderd
 import (
 	"fmt"
 	"net/http"
+	"slices"
 
 	"github.com/google/uuid"
 
@@ -373,6 +374,8 @@ func (api *API) patchOrganizationIDPSyncMapping(rw http.ResponseWriter, r *http.
 		}
 
 		// Remove entries
+
+		// Option 1: the way I was already doing it
 		for _, mapping := range req.Remove {
 			for i, it := range newMapping[mapping.Given] {
 				if it == mapping.Gets {
@@ -381,6 +384,26 @@ func (api *API) patchOrganizationIDPSyncMapping(rw http.ResponseWriter, r *http.
 			}
 		}
 
+		// Option 2: the way you suggested on the PR
+		for _, mapping := range req.Remove {
+			newMapping[mapping.Given] = slices.DeleteFunc(newMapping[mapping.Given], func(u uuid.UUID) bool {
+				return u == mapping.Gets
+			})
+		}
+
+		// Option 3: this "optimal" but comparatively very noisey and dense version
+		// Create a map[key][]thingsToRemove
+		removeMap := make(map[string][]uuid.UUID)
+		for _, mapping := range req.Remove {
+			removeMap[mapping.Given] = append(removeMap[mapping.Given], mapping.Gets)
+		}
+		// Use `DeleteFunc` to remove anything from the `newMapping` present in `removeMap`
+		for given, toRemove := range removeMap {
+			newMapping[given] = slices.DeleteFunc(newMapping[given], func(id uuid.UUID) bool {
+				return slices.Contains(toRemove, id)
+			})
+		}
+
 		settings = idpsync.OrganizationSyncSettings{
 			Field:         existing.Field,
 			Mapping:       newMapping,
@@ -393,7 +416,7 @@ func (api *API) patchOrganizationIDPSyncMapping(rw http.ResponseWriter, r *http.
 		}
 
 		return nil
-	}, &database.TxOptions{})
+	})
 	if err != nil {
 		httpapi.InternalServerError(rw, err)
 		return
