Saved objects compatibility layer

src/core_plugins/kibana/server/lib/import/__tests__/import_dashboards.js

@@ -8,7 +8,7 @@ describe('importDashboards(req)', () => {
   let requestStub;
   beforeEach(() => {
     requestStub = sinon.stub().returns(Promise.resolve({
-      responses: []
+      items: []
     }));
 
     req = {
@@ -47,10 +47,10 @@ describe('importDashboards(req)', () => {
       expect(requestStub.args[0][1]).to.equal('bulk');
       expect(requestStub.args[0][2]).to.eql({
         body: [
-          { create: { _type: 'dashboard', _id: 'dashboard-01' } },
-          { panelJSON: '{}' },
-          { create: { _type: 'visualization', _id: 'panel-01' } },
-          { visState: '{}' }
+          { create: { _type: 'doc', _id: 'dashboard-01' } },
+          { dashboard: { panelJSON: '{}' }, type: 'dashboard' },
+          { create: { _type: 'doc', _id: 'panel-01' } },
+          { visualization: { visState: '{}' }, type: 'visualization' }
         ],
         index: '.kibana'
       });
@@ -64,10 +64,10 @@ describe('importDashboards(req)', () => {
       expect(requestStub.args[0][1]).to.equal('bulk');
       expect(requestStub.args[0][2]).to.eql({
         body: [
-          { index: { _type: 'dashboard', _id: 'dashboard-01' } },
-          { panelJSON: '{}' },
-          { index: { _type: 'visualization', _id: 'panel-01' } },
-          { visState: '{}' }
+          { index: { _type: 'doc', _id: 'dashboard-01' } },
+          { dashboard: { panelJSON: '{}' }, type: 'dashboard' },
+          { index: { _type: 'doc', _id: 'panel-01' } },
+          { visualization: { visState: '{}' }, type: 'visualization' }
         ],
         index: '.kibana'
       });
@@ -81,8 +81,8 @@ describe('importDashboards(req)', () => {
       expect(requestStub.args[0][1]).to.equal('bulk');
       expect(requestStub.args[0][2]).to.eql({
         body: [
-          { create: { _type: 'dashboard', _id: 'dashboard-01' } },
-          { panelJSON: '{}' }
+          { create: { _type: 'doc', _id: 'dashboard-01' } },
+          { dashboard: { panelJSON: '{}' }, type: 'dashboard' }
         ],
         index: '.kibana'
       });

src/server/saved_objects/client/__tests__/saved_objects_client.js

@@ -97,10 +97,10 @@ describe('SavedObjectsClient', () => {
 
       expect(args[0]).to.be('bulk');
       expect(args[1].body).to.eql([
-        { create: { _type: 'config', _id: 'one' } },
-        { title: 'Test One' },
-        { create: { _type: 'index-pattern', _id: 'two' } },
-        { title: 'Test Two' }
+        { create: { _type: 'doc', _id: 'one' } },
+        { config: { title: 'Test One' }, type: 'config' },
+        { create: { _type: 'doc', _id: 'two' } },
+        { 'index-pattern': { title: 'Test Two' }, type: 'index-pattern' }
       ]);
     });
 
@@ -116,10 +116,10 @@ describe('SavedObjectsClient', () => {
 
       expect(args[0]).to.be('bulk');
       expect(args[1].body).to.eql([
-        { index: { _type: 'config', _id: 'one' } },
-        { title: 'Test One' },
-        { index: { _type: 'index-pattern', _id: 'two' } },
-        { title: 'Test Two' }
+        { index: { _type: 'doc', _id: 'one' } },
+        { config: { title: 'Test One' }, type: 'config' },
+        { index: { _type: 'doc', _id: 'two' } },
+        { 'index-pattern': { title: 'Test Two' }, type: 'index-pattern' }
       ]);
     });
 
@@ -208,7 +208,9 @@ describe('SavedObjectsClient', () => {
 
   describe('#delete', () => {
     it('throws notFound when ES is unable to find the document', (done) => {
-      callAdminCluster.returns(Promise.resolve({ found: false }));
+      callAdminCluster.returns(Promise.resolve({
+        deleted: 0
+      }));
 
       savedObjectsClient.delete('index-pattern', 'logstash-*').then(() => {
         done('failed');
@@ -224,12 +226,43 @@ describe('SavedObjectsClient', () => {
       expect(callAdminCluster.calledOnce).to.be(true);
 
       const args = callAdminCluster.getCall(0).args;
-      expect(args[0]).to.be('delete');
+      expect(args[0]).to.be('deleteByQuery');
       expect(args[1]).to.eql({
-        type: 'index-pattern',
-        id: 'logstash-*',
         refresh: 'wait_for',
-        index: '.kibana-test'
+        index: '.kibana-test',
+        body: {
+          version: true,
+          query: {
+            bool: {
+              should: [
+                {
+                  ids: {
+                    type: 'index-pattern',
+                    values: 'logstash-*'
+                  }
+                },
+                {
+                  bool: {
+                    must: [
+                      {
+                        term: {
+                          id: {
+                            value: 'logstash-*'
+                          }
+                        }
+                      },
+                      {
+                        type: {
+                          value: 'doc'
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            }
+          }
+        }
       });
     });
   });
@@ -272,7 +305,23 @@ describe('SavedObjectsClient', () => {
       const expectedQuery = {
         bool: {
           must: [{ match_all: {} }],
-          filter: [{ term: { _type: 'index-pattern' } }]
+          filter: [
+            {
+              bool: {
+                should: [
+                  {
+                    term: {
+                      _type: 'index-pattern'
+                    }
+                  }, {
+                    term: {
+                      type: 'index-pattern'
+                    }
+                  }
+                ]
+              }
+            }
+          ]
         }
       };
 
@@ -294,11 +343,17 @@ describe('SavedObjectsClient', () => {
   describe('#get', () => {
     it('formats Elasticsearch response', async () => {
       callAdminCluster.returns(Promise.resolve({
-        _id: 'logstash-*',
-        _type: 'index-pattern',
-        _version: 2,
-        _source: {
-          title: 'Testing'
+        hits: {
+          hits: [
+            {
+              _id: 'logstash-*',
+              _type: 'index-pattern',
+              _version: 2,
+              _source: {
+                title: 'Testing'
+              }
+            }
+          ]
         }
       }));
 
@@ -325,10 +380,13 @@ describe('SavedObjectsClient', () => {
       expect(callAdminCluster.calledOnce).to.be(true);
 
       const options = callAdminCluster.getCall(0).args[1];
-      expect(options.body.docs).to.eql([
-        { _type: 'config', _id: 'one' },
-        { _type: 'index-pattern', _id: 'two' },
-        { _type: undefined, _id: 'three' }
+      expect(options.body).to.eql([
+        {},
+        { version: true, query: { bool: { should: [{ ids: { values: 'one', type: 'config' } }, { bool: { must: [{ term: { id: { value: 'one' } } }, { type: { value: 'doc' } }] } }] } } }, //eslint-disable-line max-len
+        {},
+        { version: true, query: { bool: { should: [{ ids: { values: 'two', type: 'index-pattern' } }, { bool: { must: [{ term: { id: { value: 'two' } } }, { type: { value: 'doc' } }] } }] } } }, //eslint-disable-line max-len
+        {},
+        { version: true, query: { bool: { should: [{ ids: { values: 'three' } }, { bool: { must: [{ term: { id: { value: 'three' } } }, { type: { value: 'doc' } }] } }] } } } //eslint-disable-line max-len
       ]);
     });
 
@@ -341,17 +399,25 @@ describe('SavedObjectsClient', () => {
 
     it('omits missed objects', async () => {
       callAdminCluster.returns(Promise.resolve({
-        docs:[{
-          _type: 'config',
-          _id: 'bad',
-          found: false
-        }, {
-          _type: 'config',
-          _id: 'good',
-          found: true,
-          _version: 2,
-          _source: { title: 'Test' }
-        }]
+        responses: [
+          {
+            hits: {
+              hits: [
+                {
+                  _id: 'good',
+                  _type: 'doc',
+                  _version: 2,
+                  _source: {
+                    type: 'config',
+                    config: {
+                      title: 'Test'
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        ]
       }));
 
       const { saved_objects: savedObjects } = await savedObjectsClient.bulkGet(
@@ -412,10 +478,10 @@ describe('SavedObjectsClient', () => {
 
       expect(args[0]).to.be('update');
       expect(args[1]).to.eql({
-        type: 'index-pattern',
+        type: 'doc',
         id: 'logstash-*',
         version: undefined,
-        body: { doc: { title: 'Testing' } },
+        body: { doc: { 'index-pattern': { title: 'Testing' } } },
         refresh: 'wait_for',
         index: '.kibana-test'
       });

src/server/saved_objects/client/lib/__tests__/create_find_query.js

@@ -13,8 +13,20 @@ describe('createFindQuery', () => {
       query: {
         bool: {
           filter: [{
-            term: {
-              _type: 'index-pattern'
+            bool: {
+              should: [
+                {
+                  term: {
+                    _type: 'index-pattern'
+                  }
+                },
+                {
+                  term: {
+                    type: 'index-pattern'
+                  }
+                }
+              ]
+
             }
           }],
           must: [{

src/server/saved_objects/client/lib/__tests__/create_id_query.js

@@ -0,0 +1,47 @@
+import expect from 'expect.js';
+import { createIdQuery } from '../create_id_query';
+
+describe('createIdQuery', () => {
+  it('takes an id and type', () => {
+    const query = createIdQuery({
+      id: 'foo',
+      type: 'bar'
+    });
+    const expectedQuery = {
+      version: true,
+      query: {
+        bool: {
+          should: [
+            {
+              ids: {
+                values: 'foo',
+                type: 'bar'
+              }
+            },
+            {
+              bool: {
+                must: [
+                  {
+                    term: {
+                      id: {
+                        value: 'foo'
+                      }
+                    }
+                  },
+                  {
+                    type: {
+                      value: 'doc'
+                    }
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      }
+    };
+
+    expect(query).to.eql(expectedQuery);
+  });
+
+});

src/server/saved_objects/client/lib/__tests__/get_doc_type.js

@@ -0,0 +1,37 @@
+import expect from 'expect.js';
+import { getDocType } from '../get_doc_type';
+
+describe('getDocType', () => {
+  it('gets the doc type from a legacy index', () => {
+    const legacyResponse = {
+      _index: '.kibana',
+      _type: 'config',
+      _id: '6.0.0-alpha2',
+      _score: 1,
+      _source: {
+        buildNum: 8467,
+        defaultIndex: '.kibana'
+      }
+    };
+
+    expect(getDocType(legacyResponse)).to.eql('config');
+  });
+
+  it('gets the doc type from a new index', () => {
+    const newResponse = {
+      _index: '.kibana',
+      _type: 'doc',
+      _id: 'AVzBOLGoIr2L3MkvUTRP',
+      _score: 1,
+      _source: {
+        type: 'config',
+        config: {
+          buildNum: 8467,
+          defaultIndex: '.kibana'
+        }
+      }
+    };
+
+    expect(getDocType(newResponse)).to.eql('config');
+  });
+});

src/server/saved_objects/client/lib/create_find_query.js

@@ -9,8 +9,19 @@ export function createFindQuery(options = {}) {
 
   if (type) {
     bool.filter.push({
-      term: {
-        _type: type
+      bool: {
+        should: [
+          {
+            term: {
+              _type: type
+            }
+          },
+          {
+            term: {
+              type
+            }
+          }
+        ]
       }
     });
   }