go with 2

aslilac · aslilac · commit e786ea3dc517 · 2025-01-29T20:41:08.000Z
diff --git a/enterprise/coderd/idpsync.go b/enterprise/coderd/idpsync.go
@@ -374,36 +374,12 @@ 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 {
-					newMapping[mapping.Given] = append(newMapping[mapping.Given][:i], newMapping[mapping.Given][i+1:]...)
-				}
-			}
-		}
-
-		// 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,
