Remove deprecated & unused SavedObjectsImportFailure.title (#127043)

elastic · Mar 9, 2022 · b9b4dc0 · b9b4dc0
1 parent f89d531
commit b9b4dc0
Show file tree

Hide file tree

Showing 24 changed files with 43 additions and 123 deletions.
diff --git a/.../development/core/public/kibana-plugin-core-public.savedobjectsimportfailure.md b/.../development/core/public/kibana-plugin-core-public.savedobjectsimportfailure.md
@@ -20,6 +20,5 @@ export interface SavedObjectsImportFailure
 |  [id](./kibana-plugin-core-public.savedobjectsimportfailure.id.md) | string |  |
 |  [meta](./kibana-plugin-core-public.savedobjectsimportfailure.meta.md) | { title?: string; icon?: string; } |  |
 |  [overwrite?](./kibana-plugin-core-public.savedobjectsimportfailure.overwrite.md) | boolean | <i>(Optional)</i> If <code>overwrite</code> is specified, an attempt was made to overwrite an existing object. |
-|  [title?](./kibana-plugin-core-public.savedobjectsimportfailure.title.md) | string | <i>(Optional)</i> |
 |  [type](./kibana-plugin-core-public.savedobjectsimportfailure.type.md) | string |  |
 
diff --git a/...opment/core/public/kibana-plugin-core-public.savedobjectsimportfailure.title.md b/...opment/core/public/kibana-plugin-core-public.savedobjectsimportfailure.title.md
diff --git a/.../development/core/server/kibana-plugin-core-server.savedobjectsimportfailure.md b/.../development/core/server/kibana-plugin-core-server.savedobjectsimportfailure.md
@@ -20,6 +20,5 @@ export interface SavedObjectsImportFailure
 |  [id](./kibana-plugin-core-server.savedobjectsimportfailure.id.md) | string |  |
 |  [meta](./kibana-plugin-core-server.savedobjectsimportfailure.meta.md) | { title?: string; icon?: string; } |  |
 |  [overwrite?](./kibana-plugin-core-server.savedobjectsimportfailure.overwrite.md) | boolean | <i>(Optional)</i> If <code>overwrite</code> is specified, an attempt was made to overwrite an existing object. |
-|  [title?](./kibana-plugin-core-server.savedobjectsimportfailure.title.md) | string | <i>(Optional)</i> |
 |  [type](./kibana-plugin-core-server.savedobjectsimportfailure.type.md) | string |  |
 
diff --git a/...opment/core/server/kibana-plugin-core-server.savedobjectsimportfailure.title.md b/...opment/core/server/kibana-plugin-core-server.savedobjectsimportfailure.title.md
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
@@ -1255,8 +1255,6 @@ export interface SavedObjectsImportFailure {
         icon?: string;
     };
     overwrite?: boolean;
-    // @deprecated (undocumented)
-    title?: string;
     // (undocumented)
     type: string;
 }

diff --git a/src/core/server/saved_objects/import/import_saved_objects.test.ts b/src/core/server/saved_objects/import/import_saved_objects.test.ts
@@ -112,7 +112,6 @@ describe('#importSavedObjectsFromStream', () => {
     return {
       type: 'foo-type',
       id: uuidv4(),
-      title: 'some-title',
       meta: { title },
       error: { type: 'conflict' },
     };

diff --git a/src/core/server/saved_objects/import/lib/check_conflicts.test.ts b/src/core/server/saved_objects/import/lib/check_conflicts.test.ts
@@ -108,13 +108,11 @@ describe('#checkConflicts', () => {
       errors: [
         {
           ...obj2Error,
-          title: obj2.attributes.title,
           meta: { title: obj2.attributes.title },
           error: { type: 'conflict' },
         },
         {
           ...obj4Error,
-          title: obj4.attributes.title,
           meta: { title: obj4.attributes.title },
           error: { ...obj4Error.error, type: 'unknown' },
         },
@@ -136,7 +134,6 @@ describe('#checkConflicts', () => {
         errors: [
           {
             ...obj4Error,
-            title: obj4.attributes.title,
             meta: { title: obj4.attributes.title },
             error: { ...obj4Error.error, type: 'unknown' },
           },
@@ -174,13 +171,11 @@ describe('#checkConflicts', () => {
       errors: [
         {
           ...obj2Error,
-          title: obj2.attributes.title,
           meta: { title: obj2.attributes.title },
           error: { type: 'conflict', destinationId: 'some-object-id' },
         },
         {
           ...obj4Error,
-          title: obj4.attributes.title,
           meta: { title: obj4.attributes.title },
           error: { ...obj4Error.error, type: 'unknown' },
         },

diff --git a/src/core/server/saved_objects/import/lib/check_conflicts.ts b/src/core/server/saved_objects/import/lib/check_conflicts.ts
@@ -80,10 +80,10 @@ export async function checkConflicts({
       importStateMap.set(`${type}:${id}`, { destinationId: uuidv4(), omitOriginId });
       filteredObjects.push(object);
     } else if (errorObj && errorObj.statusCode !== 409) {
-      errors.push({ type, id, title, meta: { title }, error: { ...errorObj, type: 'unknown' } });
+      errors.push({ type, id, meta: { title }, error: { ...errorObj, type: 'unknown' } });
     } else if (errorObj?.statusCode === 409 && !ignoreRegularConflicts && !overwrite) {
       const error = { type: 'conflict' as 'conflict', ...(destinationId && { destinationId }) };
-      errors.push({ type, id, title, meta: { title }, error });
+      errors.push({ type, id, meta: { title }, error });
     } else {
       filteredObjects.push(object);
       if (errorObj?.statusCode === 409) {

diff --git a/src/core/server/saved_objects/import/lib/check_origin_conflicts.test.ts b/src/core/server/saved_objects/import/lib/check_origin_conflicts.test.ts
@@ -176,7 +176,6 @@ describe('#checkOriginConflicts', () => {
     ): SavedObjectsImportFailure => ({
       type: object.type,
       id: object.id,
-      title: object.attributes.title,
       meta: { title: object.attributes.title },
       error: {
         type: 'ambiguous_conflict',
@@ -189,7 +188,6 @@ describe('#checkOriginConflicts', () => {
     ): SavedObjectsImportFailure => ({
       type: object.type,
       id: object.id,
-      title: object.attributes?.title,
       meta: { title: object.attributes.title },
       error: {
         type: 'conflict',

diff --git a/src/core/server/saved_objects/import/lib/check_origin_conflicts.ts b/src/core/server/saved_objects/import/lib/check_origin_conflicts.ts
@@ -229,7 +229,6 @@ export async function checkOriginConflicts({
         errors.push({
           type,
           id,
-          title,
           meta: { title },
           error: {
             type: 'conflict',
@@ -253,7 +252,6 @@ export async function checkOriginConflicts({
     errors.push({
       type,
       id,
-      title,
       meta: { title },
       error: {
         type: 'ambiguous_conflict',

diff --git a/src/core/server/saved_objects/import/lib/collect_saved_objects.test.ts b/src/core/server/saved_objects/import/lib/collect_saved_objects.test.ts
@@ -157,7 +157,7 @@ describe('collectSavedObjects()', () => {
 
       const error = { type: 'unsupported_type' };
       const { title } = obj1.attributes;
-      const errors = [{ error, type: obj1.type, id: obj1.id, title, meta: { title } }];
+      const errors = [{ error, type: obj1.type, id: obj1.id, meta: { title } }];
       expect(result).toEqual({ collectedObjects: [], errors, importStateMap: new Map() });
     });
 
@@ -174,7 +174,7 @@ describe('collectSavedObjects()', () => {
       ]);
       const error = { type: 'unsupported_type' };
       const { title } = obj2.attributes;
-      const errors = [{ error, type: obj2.type, id: obj2.id, title, meta: { title } }];
+      const errors = [{ error, type: obj2.type, id: obj2.id, meta: { title } }];
       expect(result).toEqual({ collectedObjects, errors, importStateMap });
     });
 
@@ -192,7 +192,7 @@ describe('collectSavedObjects()', () => {
 
         const error = { type: 'unsupported_type' };
         const { title } = obj1.attributes;
-        const errors = [{ error, type: obj1.type, id: obj1.id, title, meta: { title } }];
+        const errors = [{ error, type: obj1.type, id: obj1.id, meta: { title } }];
         expect(result).toEqual({ collectedObjects: [], errors, importStateMap: new Map() });
       });
 
@@ -215,7 +215,7 @@ describe('collectSavedObjects()', () => {
         ]);
         const error = { type: 'unsupported_type' };
         const { title } = obj1.attributes;
-        const errors = [{ error, type: obj1.type, id: obj1.id, title, meta: { title } }];
+        const errors = [{ error, type: obj1.type, id: obj1.id, meta: { title } }];
         expect(result).toEqual({ collectedObjects, errors, importStateMap });
       });
     });

diff --git a/src/core/server/saved_objects/import/lib/collect_saved_objects.ts b/src/core/server/saved_objects/import/lib/collect_saved_objects.ts
@@ -49,7 +49,6 @@ export async function collectSavedObjects({
       errors.push({
         id: obj.id,
         type: obj.type,
-        title,
         meta: { title },
         error: {
           type: 'unsupported_type',

diff --git a/src/core/server/saved_objects/import/lib/extract_errors.test.ts b/src/core/server/saved_objects/import/lib/extract_errors.test.ts
@@ -51,45 +51,42 @@ describe('extractErrors()', () => {
     ];
     const result = extractErrors(savedObjects, savedObjects);
     expect(result).toMatchInlineSnapshot(`
-Array [
-  Object {
-    "error": Object {
-      "type": "conflict",
-    },
-    "id": "2",
-    "meta": Object {
-      "title": "My Dashboard 2",
-    },
-    "title": "My Dashboard 2",
-    "type": "dashboard",
-  },
-  Object {
-    "error": Object {
-      "error": "Bad Request",
-      "message": "Bad Request",
-      "statusCode": 400,
-      "type": "unknown",
-    },
-    "id": "3",
-    "meta": Object {
-      "title": "My Dashboard 3",
-    },
-    "title": "My Dashboard 3",
-    "type": "dashboard",
-  },
-  Object {
-    "error": Object {
-      "destinationId": "foo",
-      "type": "conflict",
-    },
-    "id": "4",
-    "meta": Object {
-      "title": "My Dashboard 4",
-    },
-    "title": "My Dashboard 4",
-    "type": "dashboard",
-  },
-]
-`);
+      Array [
+        Object {
+          "error": Object {
+            "type": "conflict",
+          },
+          "id": "2",
+          "meta": Object {
+            "title": "My Dashboard 2",
+          },
+          "type": "dashboard",
+        },
+        Object {
+          "error": Object {
+            "error": "Bad Request",
+            "message": "Bad Request",
+            "statusCode": 400,
+            "type": "unknown",
+          },
+          "id": "3",
+          "meta": Object {
+            "title": "My Dashboard 3",
+          },
+          "type": "dashboard",
+        },
+        Object {
+          "error": Object {
+            "destinationId": "foo",
+            "type": "conflict",
+          },
+          "id": "4",
+          "meta": Object {
+            "title": "My Dashboard 4",
+          },
+          "type": "dashboard",
+        },
+      ]
+    `);
   });
 });
diff --git a/src/core/server/saved_objects/import/lib/extract_errors.ts b/src/core/server/saved_objects/import/lib/extract_errors.ts
@@ -30,7 +30,6 @@ export function extractErrors(
         errors.push({
           id: savedObject.id,
           type: savedObject.type,
-          title,
           meta: { title },
           error: {
             type: 'conflict',
@@ -42,7 +41,6 @@ export function extractErrors(
       errors.push({
         id: savedObject.id,
         type: savedObject.type,
-        title,
         meta: { title },
         error: {
           ...savedObject.error,

diff --git a/src/core/server/saved_objects/import/lib/validate_references.ts b/src/core/server/saved_objects/import/lib/validate_references.ts
@@ -116,7 +116,6 @@ export async function validateReferences(params: ValidateReferencesParams) {
     errorMap[`${type}:${id}`] = {
       id,
       type,
-      title,
       meta: { title },
       error: { type: 'missing_references', references: missingReferences },
     };

diff --git a/src/core/server/saved_objects/import/resolve_import_errors.test.ts b/src/core/server/saved_objects/import/resolve_import_errors.test.ts
@@ -138,7 +138,6 @@ describe('#importSavedObjectsFromStream', () => {
     return {
       type: 'foo-type',
       id: uuidv4(),
-      title: 'some-title',
       meta: { title },
       error: { type: 'conflict' },
     };

diff --git a/src/core/server/saved_objects/import/types.ts b/src/core/server/saved_objects/import/types.ts
@@ -89,10 +89,6 @@ export interface SavedObjectsImportMissingReferencesError {
 export interface SavedObjectsImportFailure {
   id: string;
   type: string;
-  /**
-   * @deprecated Use `meta.title` instead
-   */
-  title?: string;
   meta: { title?: string; icon?: string };
   /**
    * If `overwrite` is specified, an attempt was made to overwrite an existing object.

diff --git a/src/core/server/saved_objects/routes/integration_tests/import.test.ts b/src/core/server/saved_objects/routes/integration_tests/import.test.ts
@@ -229,7 +229,6 @@ describe(`POST ${URL}`, () => {
         {
           id: mockIndexPattern.id,
           type: mockIndexPattern.type,
-          title: mockIndexPattern.attributes.title,
           meta: { title: mockIndexPattern.attributes.title, icon: 'index-pattern-icon' },
           error: { type: 'conflict' },
         },
@@ -322,7 +321,6 @@ describe(`POST ${URL}`, () => {
         {
           id: 'my-vis',
           type: 'visualization',
-          title: 'my-vis',
           meta: { title: 'my-vis', icon: 'visualization-icon' },
           error: {
             type: 'missing_references',
@@ -386,7 +384,6 @@ describe(`POST ${URL}`, () => {
         {
           id: 'my-vis',
           type: 'visualization',
-          title: 'my-vis',
           meta: { title: 'my-vis', icon: 'visualization-icon' },
           error: {
             type: 'missing_references',
@@ -396,7 +393,6 @@ describe(`POST ${URL}`, () => {
         {
           id: 'my-vis',
           type: 'visualization',
-          title: 'my-vis',
           meta: { title: 'my-vis', icon: 'visualization-icon' },
           error: { type: 'conflict' },
         },
@@ -457,7 +453,6 @@ describe(`POST ${URL}`, () => {
         {
           id: 'my-vis',
           type: 'visualization',
-          title: 'my-vis',
           meta: { title: 'my-vis', icon: 'visualization-icon' },
           overwrite: true,
           error: {

diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
@@ -2501,8 +2501,6 @@ export interface SavedObjectsImportFailure {
         icon?: string;
     };
     overwrite?: boolean;
-    // @deprecated (undocumented)
-    title?: string;
     // (undocumented)
     type: string;
 }

diff --git a/test/api_integration/apis/saved_objects/import.ts b/test/api_integration/apis/saved_objects/import.ts
@@ -16,7 +16,6 @@ const createConflictError = (
   object: Omit<SavedObjectsImportFailure, 'error'>
 ): SavedObjectsImportFailure => ({
   ...object,
-  title: object.meta.title,
   error: { type: 'conflict' },
 });
 
@@ -123,7 +122,6 @@ export default function ({ getService }: FtrProviderContext) {
                 {
                   id: '1',
                   type: 'wigwags',
-                  title: 'my title',
                   meta: { title: 'my title' },
                   error: { type: 'unsupported_type' },
                 },
@@ -221,7 +219,6 @@ export default function ({ getService }: FtrProviderContext) {
                 {
                   type: 'visualization',
                   id: '1',
-                  title: 'My visualization',
                   meta: { title: 'My visualization', icon: 'visualizeApp' },
                   error: {
                     type: 'missing_references',

diff --git a/test/plugin_functional/test_suites/saved_objects_hidden_type/import.ts b/test/plugin_functional/test_suites/saved_objects_hidden_type/import.ts
@@ -72,7 +72,6 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
               {
                 id: 'some-id-1',
                 type: 'test-hidden-non-importable-exportable',
-                title: 'my title',
                 meta: {
                   title: 'my title',
                 },
-Original file line number
+Diff line change
@@ Expand Up @@
         errorMap[`${type}:${id}`] = {
           id,
           type,
-          title,
           meta: { title },
           error: { type: 'missing_references', references: missingReferences },
         };
@@ Expand Down @@