Skip to content

Commit

Permalink
Clean up post-rebase artifacts
Browse files Browse the repository at this point in the history
Signed-off-by: Miki <miki@amazon.com>
  • Loading branch information
AMoo-Miki committed Feb 6, 2024
1 parent 53e8936 commit 54d2ebb
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 2 deletions.
1 change: 1 addition & 0 deletions src/core/server/saved_objects/import/check_conflicts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ export async function checkConflicts({
if (objects.length === 0) {
return { filteredObjects, errors, importIdMap, pendingOverwrites };
}

const retryMap = retries.reduce(
(acc, cur) => acc.set(`${cur.type}:${cur.id}`, cur),
new Map<string, SavedObjectsImportRetry>()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ export const createSavedObjects = async <T>({
dataSourceTitle,
}: CreateSavedObjectsParams<T>): Promise<CreateSavedObjectsResult<T>> => {
// filter out any objects that resulted in errors

const errorSet = accumulatedErrors.reduce(
(acc, { type, id }) => acc.add(`${type}:${id}`),
new Set<string>()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ export async function importSavedObjectsFromStream({
]);
}

// Check single-namespace objects for conflicts in this namespace, and check multi-namespace objects for conflicts across all namespaces
const checkConflictsResult = await checkConflicts(checkConflictsParams);
errorAccumulator = [...errorAccumulator, ...checkConflictsResult.errors];
importIdMap = new Map([...importIdMap, ...checkConflictsResult.importIdMap]);
Expand Down

0 comments on commit 54d2ebb

Please sign in to comment.