Fix integration tests

elastic · Jan 9, 2019 · 062b72b · 062b72b
1 parent d635889
commit 062b72b
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 31 deletions.
diff --git a/src/legacy/core_plugins/kibana/server/lib/__tests__/relationships.js b/src/legacy/core_plugins/kibana/server/lib/__tests__/relationships.js
@@ -56,12 +56,12 @@ describe('findRelationships', () => {
         ],
       })
     };
-    const result = await findRelationships(
+    const result = await findRelationships({
       type,
       id,
       size,
       savedObjectsClient
-    );
+    });
     expect(result).to.eql([
       { id: '1', title: 'Foo', type: 'visualization' },
       { id: '2', title: 'Bar', type: 'visualization' },
@@ -114,12 +114,12 @@ describe('findRelationships', () => {
       })
     };
 
-    const result = await findRelationships(
+    const result = await findRelationships({
       type,
       id,
       size,
       savedObjectsClient
-    );
+    });
     expect(result).to.eql([
       { id: '1', title: 'My Dashboard', type: 'dashboard' },
       { id: '2', title: 'Your Dashboard', type: 'dashboard' },
@@ -177,12 +177,12 @@ describe('findRelationships', () => {
       })
     };
 
-    const result = await findRelationships(
+    const result = await findRelationships({
       type,
       id,
       size,
       savedObjectsClient
-    );
+    });
     expect(result).to.eql([
       { id: '1', title: 'Foo', type: 'visualization' },
       { id: '2', title: 'Bar', type: 'visualization' },
@@ -282,12 +282,12 @@ describe('findRelationships', () => {
       }
     };
 
-    const result = await findRelationships(
+    const result = await findRelationships({
       type,
       id,
       size,
       savedObjectsClient
-    );
+    });
     expect(result).to.eql([
       { id: '1', type: 'visualization', title: 'Foo' },
       { id: '2', type: 'visualization', title: 'Bar' },
@@ -298,7 +298,7 @@ describe('findRelationships', () => {
 
   it('should return an empty object for invalid types', async () => {
     const type = 'invalid';
-    const result = await findRelationships(type);
+    const result = await findRelationships({ type });
     expect(result).to.eql({});
   });
 });
diff --git a/src/legacy/core_plugins/kibana/server/lib/management/saved_objects/relationships.js b/src/legacy/core_plugins/kibana/server/lib/management/saved_objects/relationships.js
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-async function findDashboardRelationships(id, size, savedObjectsClient) {
-  const dashboard = await savedObjectsClient.get('dashboard', id);
+async function findDashboardRelationships({ id, size, namespace, savedObjectsClient }) {
+  const dashboard = await savedObjectsClient.get('dashboard', id, { namespace });
   const visualizations = [];
 
   // TODO: should we handle exceptions here or at the parent level?
@@ -29,7 +29,8 @@ async function findDashboardRelationships(id, size, savedObjectsClient) {
       visualizationIds.slice(0, size).map(id => ({
         id,
         type: 'visualization',
-      }))
+      })),
+      { namespace }
     );
 
     visualizations.push(
@@ -49,9 +50,10 @@ async function findDashboardRelationships(id, size, savedObjectsClient) {
   return visualizations;
 }
 
-async function findVisualizationRelationships(id, size, savedObjectsClient) {
-  await savedObjectsClient.get('visualization', id);
+async function findVisualizationRelationships({ id, size, namespace, savedObjectsClient }) {
+  await savedObjectsClient.get('visualization', id, { namespace });
   const allDashboardsResponse = await savedObjectsClient.find({
+    namespace,
     type: 'dashboard',
     fields: ['title', 'panelsJSON'],
   });
@@ -81,20 +83,21 @@ async function findVisualizationRelationships(id, size, savedObjectsClient) {
   return dashboards;
 }
 
-async function findSavedSearchRelationships(id, size, savedObjectsClient) {
-  const search = await savedObjectsClient.get('search', id);
+async function findSavedSearchRelationships({ id, namespace, savedObjectsClient }) {
+  const search = await savedObjectsClient.get('search', id, { namespace });
 
   const searchSourceJSON = JSON.parse(search.attributes.kibanaSavedObjectMeta.searchSourceJSON);
 
   const indexPatterns = [];
   try {
-    const indexPattern = await savedObjectsClient.get('index-pattern', searchSourceJSON.index);
+    const indexPattern = await savedObjectsClient.get('index-pattern', searchSourceJSON.index, { namespace });
     indexPatterns.push({ id: indexPattern.id, type: 'index-pattern', title: indexPattern.attributes.title });
   } catch (err) {
     // Do nothing
   }
 
   const allVisualizationsResponse = await savedObjectsClient.find({
+    namespace,
     type: 'visualization',
     searchFields: ['savedSearchId'],
     search: id,
@@ -115,16 +118,18 @@ async function findSavedSearchRelationships(id, size, savedObjectsClient) {
   return visualizations.concat(indexPatterns);
 }
 
-async function findIndexPatternRelationships(id, size, savedObjectsClient) {
-  await savedObjectsClient.get('index-pattern', id);
+async function findIndexPatternRelationships({ id, size, namespace, savedObjectsClient }) {
+  await savedObjectsClient.get('index-pattern', id, { namespace });
   const [allVisualizationsResponse, savedSearchResponse] = await Promise.all([
     savedObjectsClient.find({
+      namespace,
       type: 'visualization',
       searchFields: ['kibanaSavedObjectMeta.searchSourceJSON'],
       search: '*',
       fields: [`title`, `kibanaSavedObjectMeta.searchSourceJSON`],
     }),
     savedObjectsClient.find({
+      namespace,
       type: 'search',
       searchFields: ['kibanaSavedObjectMeta.searchSourceJSON'],
       search: '*',
@@ -172,16 +177,16 @@ async function findIndexPatternRelationships(id, size, savedObjectsClient) {
   return visualizations.concat(searches);
 }
 
-export async function findRelationships(type, id, size, savedObjectsClient) {
+export async function findRelationships({ type, id, namespace, size, savedObjectsClient }) {
   switch (type) {
     case 'dashboard':
-      return await findDashboardRelationships(id, size, savedObjectsClient);
+      return await findDashboardRelationships({ id, size, namespace, savedObjectsClient });
     case 'visualization':
-      return await findVisualizationRelationships(id, size, savedObjectsClient);
+      return await findVisualizationRelationships({ id, size, namespace, savedObjectsClient });
     case 'search':
-      return await findSavedSearchRelationships(id, size, savedObjectsClient);
+      return await findSavedSearchRelationships({ id, size, namespace, savedObjectsClient });
     case 'index-pattern':
-      return await findIndexPatternRelationships(id, size, savedObjectsClient);
+      return await findIndexPatternRelationships({ id, size, namespace, savedObjectsClient });
   }
   return [];
 }
diff --git a/src/legacy/core_plugins/kibana/server/routes/api/management/saved_objects/relationships.js b/src/legacy/core_plugins/kibana/server/routes/api/management/saved_objects/relationships.js
@@ -38,7 +38,7 @@ export function registerRelationships(server) {
     handler: async (req) => {
       const type = req.params.type;
       const id = req.params.id;
-      const size = req.query.size || 10;
+      const size = req.query.size || 10000;
       const savedObjectsClient = req.getSavedObjectsClient();
 
       return await savedObjectsClient.findRelationships(type, id, { size });

diff --git a/src/server/saved_objects/service/lib/repository.js b/src/server/saved_objects/service/lib/repository.js
@@ -624,7 +624,7 @@ export class SavedObjectsRepository {
     // This code will be removed as these types migrate to use "references"
     let legacyFindRelationshipsCall;
     if (['dashboard', 'visualization', 'search', 'index-pattern'].includes(type)) {
-      legacyFindRelationshipsCall = legacyFindRelationships(type, id, size, this);
+      legacyFindRelationshipsCall = legacyFindRelationships({ type, size, namespace, id, savedObjectsClient: this });
     }
     const bulkGetOpts = (sourceObject.references || []).map(ref => ({ id: ref.id, type: ref.type }));
     const searchTypes = Array.isArray(filterTypes)
@@ -654,7 +654,7 @@ export class SavedObjectsRepository {
 
     const relationshipObjects = [].concat(
       referencedObjects.map(obj => ({ id: obj.id, type: obj.type, ...obj.attributes })),
-      legacyResponse || [],
+      (legacyResponse || []).filter(obj => searchTypes.includes(obj.type)),
       referencedResponse.hits.hits
         .map(hit => this._rawToSavedObject(hit))
         .map(obj => ({ id: obj.id, type: obj.type, ...obj.attributes }))

diff --git a/...t/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json b/...t/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
@@ -195,7 +195,7 @@
         "description": "",
         "version": 1,
         "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"index\":\"91200a00-9efd-11e7-acb3-3dab96693fab\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
+          "searchSourceJSON": "{\"index\":\"space_1-91200a00-9efd-11e7-acb3-3dab96693fab\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
         }
       }
     }
@@ -216,7 +216,7 @@
         "title": "Requests",
         "hits": 0,
         "description": "",
-        "panelsJSON": "[{\"size_x\":6,\"size_y\":3,\"panelIndex\":1,\"type\":\"visualization\",\"id\":\"dd7caf20-9efd-11e7-acb3-3dab96693fab\",\"col\":1,\"row\":1}]",
+        "panelsJSON": "[{\"size_x\":6,\"size_y\":3,\"panelIndex\":1,\"type\":\"visualization\",\"id\":\"space_1-dd7caf20-9efd-11e7-acb3-3dab96693fab\",\"col\":1,\"row\":1}]",
         "optionsJSON": "{\"darkTheme\":false}",
         "uiStateJSON": "{}",
         "version": 1,
@@ -291,7 +291,7 @@
         "description": "",
         "version": 1,
         "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"index\":\"91200a00-9efd-11e7-acb3-3dab96693fab\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
+          "searchSourceJSON": "{\"index\":\"space_2-91200a00-9efd-11e7-acb3-3dab96693fab\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
         }
       }
     }
@@ -312,7 +312,7 @@
         "title": "Requests",
         "hits": 0,
         "description": "",
-        "panelsJSON": "[{\"size_x\":6,\"size_y\":3,\"panelIndex\":1,\"type\":\"visualization\",\"id\":\"dd7caf20-9efd-11e7-acb3-3dab96693fab\",\"col\":1,\"row\":1}]",
+        "panelsJSON": "[{\"size_x\":6,\"size_y\":3,\"panelIndex\":1,\"type\":\"visualization\",\"id\":\"space_2-dd7caf20-9efd-11e7-acb3-3dab96693fab\",\"col\":1,\"row\":1}]",
         "optionsJSON": "{\"darkTheme\":false}",
         "uiStateJSON": "{}",
         "version": 1,