[7.17] Remove deprecated "type" field (#122919)

* fix packages tests * remove from es-archiver * do no include deprecated type field * remove another usage * Remove _type from saved_objects_management archives Co-authored-by: Rudolf Meijering <[email protected]>
elastic · Jan 13, 2022 · 63f7741 · 63f7741
1 parent 686ce4b
commit 63f7741
Show file tree

Hide file tree

Showing 6 changed files with 385 additions and 392 deletions.
diff --git a/packages/kbn-es-archiver/src/lib/docs/generate_doc_records_stream.test.ts b/packages/kbn-es-archiver/src/lib/docs/generate_doc_records_stream.test.ts
@@ -27,7 +27,6 @@ interface SearchResponses {
         total: number;
         hits: Array<{
           _index: string;
-          _type: string;
           _id: string;
           _source: Record<string, unknown>;
         }>;
@@ -59,9 +58,9 @@ describe('esArchiver: createGenerateDocRecordsStream()', () => {
             hits: {
               total: 5,
               hits: [
-                { _index: 'foo', _type: '_doc', _id: '0', _source: {} },
-                { _index: 'foo', _type: '_doc', _id: '1', _source: {} },
-                { _index: 'foo', _type: '_doc', _id: '2', _source: {} },
+                { _index: 'foo', _id: '0', _source: {} },
+                { _index: 'foo', _id: '1', _source: {} },
+                { _index: 'foo', _id: '2', _source: {} },
               ],
             },
           },
@@ -71,8 +70,8 @@ describe('esArchiver: createGenerateDocRecordsStream()', () => {
             hits: {
               total: 5,
               hits: [
-                { _index: 'foo', _type: '_doc', _id: '3', _source: {} },
-                { _index: 'foo', _type: '_doc', _id: '4', _source: {} },
+                { _index: 'foo', _id: '3', _source: {} },
+                { _index: 'foo', _id: '4', _source: {} },
               ],
             },
           },
@@ -84,8 +83,8 @@ describe('esArchiver: createGenerateDocRecordsStream()', () => {
             hits: {
               total: 2,
               hits: [
-                { _index: 'bar', _type: '_doc', _id: '0', _source: {} },
-                { _index: 'bar', _type: '_doc', _id: '1', _source: {} },
+                { _index: 'bar', _id: '0', _source: {} },
+                { _index: 'bar', _id: '1', _source: {} },
               ],
             },
           },
@@ -108,7 +107,6 @@ describe('esArchiver: createGenerateDocRecordsStream()', () => {
       createMapStream((record: any) => {
         expect(record).toHaveProperty('type', 'doc');
         expect(record.value.source).toEqual({});
-        expect(record.value.type).toBe('_doc');
         expect(record.value.index).toMatch(/^(foo|bar)$/);
         expect(record.value.id).toMatch(/^\d+$/);
         return `${record.value.index}:${record.value.id}`;
@@ -224,7 +222,7 @@ describe('esArchiver: createGenerateDocRecordsStream()', () => {
 
   describe('keepIndexNames', () => {
     it('changes .kibana* index names if keepIndexNames is not enabled', async () => {
-      const hits = [{ _index: '.kibana_7.16.0_001', _type: '_doc', _id: '0', _source: {} }];
+      const hits = [{ _index: '.kibana_7.16.0_001', _id: '0', _source: {} }];
       const responses = {
         ['.kibana_7.16.0_001']: [{ body: { hits: { hits, total: hits.length } } }],
       };
@@ -248,7 +246,7 @@ describe('esArchiver: createGenerateDocRecordsStream()', () => {
     });
 
     it('does not change non-.kibana* index names if keepIndexNames is not enabled', async () => {
-      const hits = [{ _index: '.foo', _type: '_doc', _id: '0', _source: {} }];
+      const hits = [{ _index: '.foo', _id: '0', _source: {} }];
       const responses = {
         ['.foo']: [{ body: { hits: { hits, total: hits.length } } }],
       };
@@ -272,7 +270,7 @@ describe('esArchiver: createGenerateDocRecordsStream()', () => {
     });
 
     it('does not change .kibana* index names if keepIndexNames is enabled', async () => {
-      const hits = [{ _index: '.kibana_7.16.0_001', _type: '_doc', _id: '0', _source: {} }];
+      const hits = [{ _index: '.kibana_7.16.0_001', _id: '0', _source: {} }];
       const responses = {
         ['.kibana_7.16.0_001']: [{ body: { hits: { hits, total: hits.length } } }],
       };

diff --git a/packages/kbn-es-archiver/src/lib/docs/generate_doc_records_stream.ts b/packages/kbn-es-archiver/src/lib/docs/generate_doc_records_stream.ts
@@ -67,7 +67,6 @@ export function createGenerateDocRecordsStream({
                 // when it is loaded it can skip migration, if possible
                 index:
                   hit._index.startsWith('.kibana') && !keepIndexNames ? '.kibana_1' : hit._index,
-                type: hit._type,
                 id: hit._id,
                 source: hit._source,
               },

diff --git a/packages/kbn-es-archiver/src/lib/docs/index_doc_records_stream.ts b/packages/kbn-es-archiver/src/lib/docs/index_doc_records_stream.ts
@@ -32,7 +32,6 @@ export function createIndexDocRecordsStream(
           ops.set(body, {
             [operation]: {
               _index: doc.index,
-              _type: doc.type,
               _id: doc.id,
             },
           });

diff --git a/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts b/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts
@@ -114,7 +114,6 @@ export async function cleanKibanaIndices({
             bool: {
               must_not: {
                 ids: {
-                  type: '_doc',
                   values: ['space:default'],
                 },
               },

diff --git a/test/functional/fixtures/es_archiver/saved_objects_management/show_relationships/data.json b/test/functional/fixtures/es_archiver/saved_objects_management/show_relationships/data.json
@@ -2,7 +2,7 @@
   "type": "doc",
   "value": {
     "index": ".kibana",
-    "type": "doc",
+    "type": "_doc",
     "id": "dashboard:dash-with-missing-refs",
     "source": {
       "dashboard": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,7 +114,6 @@ export async function cleanKibanaIndices({ @@
                 bool: {
                   must_not: {
                     ids: {
-                      type: '_doc',
                       values: ['space:default'],
                     },
                   },
@@ Expand Down @@