PR review feedback

elastic · Oct 19, 2021 · 9be4f61 · 9be4f61
1 parent a6491bf
commit 9be4f61
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/core/server/saved_objects/service/lib/repository.ts b/src/core/server/saved_objects/service/lib/repository.ts
@@ -789,9 +789,8 @@ export class SavedObjectsRepository {
 
     // Construct kueryNode to filter legacy URL aliases (these space-agnostic objects do not use root-level "namespace/s" fields)
     const { buildNode } = esKuery.nodeTypes.function;
-    const targetNamespaceField = `${LEGACY_URL_ALIAS_TYPE}.targetNamespace`;
-    const match1 = buildNode('is', targetNamespaceField, namespace);
-    const match2 = buildNode('not', buildNode('exists', targetNamespaceField));
+    const match1 = buildNode('is', `${LEGACY_URL_ALIAS_TYPE}.targetNamespace`, namespace);
+    const match2 = buildNode('not', buildNode('is', 'type', LEGACY_URL_ALIAS_TYPE));
     const kueryNode = buildNode('or', [match1, match2]);
 
     const { body, statusCode, headers } = await this.client.updateByQuery(

diff --git a/x-pack/test/spaces_api_integration/common/suites/delete.ts b/x-pack/test/spaces_api_integration/common/suites/delete.ts
@@ -57,6 +57,10 @@ export function deleteTestSuiteFactory(
     // @ts-expect-error @elastic/elasticsearch doesn't defined `count.buckets`.
     const buckets = response.aggregations?.count.buckets;
 
+    // The test fixture contains three legacy URL aliases:
+    // (1) one for "space_1", (2) one for "space_2", and (3) one for "other_space", which is a non-existent space.
+    // Each test deletes "space_2", so the agg buckets should reflect that aliases (1) and (3) still exist afterwards.
+
     // Space 2 deleted, all others should exist
     const expectedBuckets = [
       {
@@ -84,7 +88,7 @@ export function deleteTestSuiteFactory(
             { key: 'visualization', doc_count: 3 },
             { key: 'dashboard', doc_count: 2 },
             { key: 'index-pattern', doc_count: 1 },
-            { key: 'legacy-url-alias', doc_count: 1 },
+            { key: 'legacy-url-alias', doc_count: 1 }, // alias (1)
           ],
         },
       },
@@ -94,7 +98,7 @@ export function deleteTestSuiteFactory(
         countByType: {
           doc_count_error_upper_bound: 0,
           sum_other_doc_count: 0,
-          buckets: [{ key: 'legacy-url-alias', doc_count: 1 }], // this alias is in a non-existent space (for other test suites)
+          buckets: [{ key: 'legacy-url-alias', doc_count: 1 }], // alias (3)
         },
       },
     ];