From b575f2ff68e8f6deda1157de090bbaac2c9af963 Mon Sep 17 00:00:00 2001 From: Keepers Date: Fri, 23 Dec 2022 13:38:16 -0700 Subject: [PATCH] check for conflicts on tombstone collections (#1927) ## Description Ensure that we do not generate both a regular collection and a tombstone for the same id. ## Does this PR need a docs update or release note? - [x] :no_entry: No ## Type of change - [x] :hamster: Trivial/Minor ## Issue(s) * #1923 ## Test Plan - [x] :green_heart: E2E --- src/internal/connector/exchange/service_iterators.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/internal/connector/exchange/service_iterators.go b/src/internal/connector/exchange/service_iterators.go index b6b31e4eb..5610c42d4 100644 --- a/src/internal/connector/exchange/service_iterators.go +++ b/src/internal/connector/exchange/service_iterators.go @@ -141,7 +141,12 @@ func filterContainersAndFillCollections( for id, p := range tombstones { service, err := createService(qp.Credentials) if err != nil { - errs = support.WrapAndAppend(qp.ResourceOwner, err, errs) + errs = support.WrapAndAppend(p, err, errs) + continue + } + + if collections[id] != nil { + errs = support.WrapAndAppend(p, errors.New("conflict: tombstone exists for a live collection"), errs) continue }