[QA] Switch tests to use importExport - discover (#94006)

Switch es archiver for kbn archiver everywhere possible Partially closes #93797
2025-04-23 09:19:04 -04:00 · 2021-04-21 10:17:58 -06:00 · 2021-04-21 10:17:58 -06:00 · 1832259757
commit 1832259757
parent 47d863b0ff
19 changed files with 54 additions and 369 deletions
--- a/packages/kbn-test/src/kbn_client/kbn_client_import_export.ts
+++ b/packages/kbn-test/src/kbn_client/kbn_client_import_export.ts
@ -80,7 +80,14 @@ export class KbnClientImportExport {
    if (resp.data.success) {
      this.log.success('import success');
    } else {
-      throw createFailError(`failed to import all saved objects: ${inspect(resp.data)}`);
+      throw createFailError(
+        `failed to import all saved objects: ${inspect(resp.data, {
+          compact: false,
+          depth: 99,
+          breakLength: 80,
+          sorted: true,
+        })}`
+      );
    }
  }

--- a/test/functional/apps/discover/_data_grid.ts
+++ b/test/functional/apps/discover/_data_grid.ts
@ -23,7 +23,8 @@ export default function ({
    const testSubjects = getService('testSubjects');

    before(async function () {
-      await esArchiver.load('discover');
+      await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
+      await kibanaServer.importExport.load('discover');
      await esArchiver.loadIfNeeded('logstash_functional');
      await kibanaServer.uiSettings.replace(defaultSettings);
      await PageObjects.common.navigateToApp('discover');
--- a/test/functional/apps/discover/_data_grid_context.ts
+++ b/test/functional/apps/discover/_data_grid_context.ts
@ -36,7 +36,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {

  describe('discover data grid context tests', () => {
    before(async () => {
-      await esArchiver.load('discover');
+      await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
+      await kibanaServer.importExport.load('discover');
      await esArchiver.loadIfNeeded('logstash_functional');
      await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
      await kibanaServer.uiSettings.update(defaultSettings);
--- a/test/functional/apps/discover/_data_grid_doc_table.ts
+++ b/test/functional/apps/discover/_data_grid_doc_table.ts
@ -27,7 +27,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
  describe('discover data grid doc table', function describeIndexTests() {
    before(async function () {
      log.debug('load kibana index with default index pattern');
-      await esArchiver.load('discover');
+      await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
+      await kibanaServer.importExport.load('discover');
      await esArchiver.loadIfNeeded('logstash_functional');
      await kibanaServer.uiSettings.replace(defaultSettings);
      await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
--- a/test/functional/apps/discover/_data_grid_field_data.ts
+++ b/test/functional/apps/discover/_data_grid_field_data.ts
@ -22,7 +22,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
  describe('discover data grid field data tests', function describeIndexTests() {
    this.tags('includeFirefox');
    before(async function () {
-      await esArchiver.load('discover');
+      await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
+      await kibanaServer.importExport.load('discover');
      await esArchiver.loadIfNeeded('logstash_functional');
      await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
      await kibanaServer.uiSettings.update(defaultSettings);
--- a/test/functional/apps/discover/_discover.ts
+++ b/test/functional/apps/discover/_discover.ts
@ -11,7 +11,6 @@ import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';

 export default function ({ getService, getPageObjects }: FtrProviderContext) {
-  const savedObjectInfo = getService('savedObjectInfo');
  const browser = getService('browser');
  const log = getService('log');
  const retry = getService('retry');
@ -30,11 +29,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
    before(async function () {
      log.debug('load kibana index with default index pattern');

-      await kibanaServer.savedObjects.clean({ types: ['search'] });
      await kibanaServer.importExport.load('discover');
-      log.info(
-        `\n### SAVED OBJECT TYPES IN index: [.kibana]: \n\t${await savedObjectInfo.types()}`
-      );

      // and load a set of makelogs data
      await esArchiver.loadIfNeeded('logstash_functional');
--- a/test/functional/apps/discover/_discover_fields_api.ts
+++ b/test/functional/apps/discover/_discover_fields_api.ts
@ -22,7 +22,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
  describe('discover uses fields API test', function describeIndexTests() {
    before(async function () {
      log.debug('load kibana index with default index pattern');
-      await esArchiver.load('discover');
+      await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
+      await kibanaServer.importExport.load('discover');
      await esArchiver.loadIfNeeded('logstash_functional');
      await kibanaServer.uiSettings.replace(defaultSettings);
      log.debug('discover');
--- a/test/functional/apps/discover/_doc_table.ts
+++ b/test/functional/apps/discover/_doc_table.ts
@ -28,7 +28,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {

    before(async function () {
      log.debug('load kibana index with default index pattern');
-      await esArchiver.load('discover');
+      await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
+      await kibanaServer.importExport.load('discover');

      // and load a set of makelogs data
      await esArchiver.loadIfNeeded('logstash_functional');
--- a/test/functional/apps/discover/_errors.ts
+++ b/test/functional/apps/discover/_errors.ts
@ -23,7 +23,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
    });

    after(async function () {
-      await esArchiver.unload('invalid_scripted_field');
+      await esArchiver.load('empty_kibana');
    });

    describe('invalid scripted field error', () => {
--- a/test/functional/apps/discover/_field_data.ts
+++ b/test/functional/apps/discover/_field_data.ts
@ -23,8 +23,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
  describe('discover tab', function describeIndexTests() {
    this.tags('includeFirefox');
    before(async function () {
+      await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
+      await kibanaServer.importExport.load('discover');
      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.load('discover');
      await kibanaServer.uiSettings.replace({
        defaultIndex: 'logstash-*',
        'discover:searchFieldsFromSource': true,
--- a/test/functional/apps/discover/_field_data_with_fields_api.ts
+++ b/test/functional/apps/discover/_field_data_with_fields_api.ts
@ -23,8 +23,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
  describe('discover tab with new fields API', function describeIndexTests() {
    this.tags('includeFirefox');
    before(async function () {
+      await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
+      await kibanaServer.importExport.load('discover');
      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.load('discover');
      await kibanaServer.uiSettings.replace({
        defaultIndex: 'logstash-*',
        'discover:searchFieldsFromSource': false,
--- a/test/functional/apps/discover/_filter_editor.ts
+++ b/test/functional/apps/discover/_filter_editor.ts
@ -24,7 +24,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
  describe('discover filter editor', function describeIndexTests() {
    before(async function () {
      log.debug('load kibana index with default index pattern');
-      await esArchiver.loadIfNeeded('discover');
+      await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
+      await kibanaServer.importExport.load('discover');

      // and load a set of makelogs data
      await esArchiver.loadIfNeeded('logstash_functional');
--- a/test/functional/apps/discover/_inspector.ts
+++ b/test/functional/apps/discover/_inspector.ts
@ -32,8 +32,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {

  describe('inspect', () => {
    before(async () => {
+      await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
+
+      await kibanaServer.importExport.load('discover');
      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.load('discover');
      // delete .kibana index and update configDoc
      await kibanaServer.uiSettings.replace({
        defaultIndex: 'logstash-*',
--- a/test/functional/apps/discover/_large_string.ts
+++ b/test/functional/apps/discover/_large_string.ts
@ -22,7 +22,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
  describe('test large strings', function () {
    before(async function () {
      await security.testUser.setRoles(['kibana_admin', 'kibana_large_strings']);
-      await esArchiver.load('empty_kibana');
+
+      await kibanaServer.importExport.load('testlargestring');
      await esArchiver.loadIfNeeded('hamlet');
      await kibanaServer.uiSettings.replace({ defaultIndex: 'testlargestring' });
    });
@ -73,6 +74,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
    after(async () => {
      await security.testUser.restoreDefaults();
      await esArchiver.unload('hamlet');
+      await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
    });
  });
 }
--- a/test/functional/apps/discover/_saved_queries.ts
+++ b/test/functional/apps/discover/_saved_queries.ts
@ -29,7 +29,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
  describe('saved queries saved objects', function describeIndexTests() {
    before(async function () {
      log.debug('load kibana index with default index pattern');
-      await esArchiver.load('discover');
+      await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
+      await kibanaServer.importExport.load('discover');

      // and load a set of makelogs data
      await esArchiver.loadIfNeeded('logstash_functional');
--- a/test/functional/apps/discover/_shared_links.ts
+++ b/test/functional/apps/discover/_shared_links.ts
@ -38,7 +38,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
      });

      log.debug('load kibana index with default index pattern');
-      await esArchiver.load('discover');
+      await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
+      await kibanaServer.importExport.load('discover');
      await esArchiver.loadIfNeeded('logstash_functional');

      await kibanaServer.uiSettings.replace({
--- a/test/functional/fixtures/es_archiver/hamlet/data.json.gz
+++ b/test/functional/fixtures/es_archiver/hamlet/data.json.gz
--- a/test/functional/fixtures/es_archiver/hamlet/mappings.json
+++ b/test/functional/fixtures/es_archiver/hamlet/mappings.json
@ -1,352 +1,3 @@
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-      ".kibana": {
-      }
-    },
-    "index": ".kibana_1",
-    "mappings": {
-      "_meta": {
-        "migrationMappingPropertyHashes": {
-          "config": "87aca8fdb053154f11383fce3dbf3edf",
-          "dashboard": "eb3789e1af878e73f85304333240f65f",
-          "index-pattern": "66eccb05066c5a89924f48a9e9736499",
-          "kql-telemetry": "d12a98a6f19a2d273696597547e064ee",
-          "migrationVersion": "4a1746014a75ade3a714e1db5763276f",
-          "namespace": "2f4316de49999235636386fe51dc06c1",
-          "references": "7997cf5a56cc02bdc9c93361bde732b0",
-          "sample-data-telemetry": "7d3cfeb915303c9641c59681967ffeb4",
-          "search": "181661168bbadd1eff5902361e2a0d5c",
-          "server": "ec97f1c5da1a19609a60874e5af1100c",
-          "timelion-sheet": "9a2a2748877c7a7b582fef201ab1d4cf",
-          "type": "2f4316de49999235636386fe51dc06c1",
-          "ui-metric": "0d409297dc5ebe1e3a1da691c6ee32e3",
-          "updated_at": "00da57df13e94e9d98437d13ace4bfe0",
-          "url": "c7f66a0df8b1b52f17c28c4adb111105",
-          "visualization": "52d7a13ad68a150c4525b292d23e12cc"
-        }
-      },
-      "dynamic": "strict",
-      "properties": {
-        "config": {
-          "dynamic": "true",
-          "properties": {
-            "buildNum": {
-              "type": "keyword"
-            },
-            "dateFormat:tz": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "defaultIndex": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "dashboard": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "optionsJSON": {
-              "type": "text"
-            },
-            "panelsJSON": {
-              "type": "text"
-            },
-            "refreshInterval": {
-              "properties": {
-                "display": {
-                  "type": "keyword"
-                },
-                "pause": {
-                  "type": "boolean"
-                },
-                "section": {
-                  "type": "integer"
-                },
-                "value": {
-                  "type": "integer"
-                }
-              }
-            },
-            "timeFrom": {
-              "type": "keyword"
-            },
-            "timeRestore": {
-              "type": "boolean"
-            },
-            "timeTo": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "index-pattern": {
-          "properties": {
-            "fieldFormatMap": {
-              "type": "text"
-            },
-            "fields": {
-              "type": "text"
-            },
-            "intervalName": {
-              "type": "keyword"
-            },
-            "notExpandable": {
-              "type": "boolean"
-            },
-            "sourceFilters": {
-              "type": "text"
-            },
-            "timeFieldName": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "type": {
-              "type": "keyword"
-            },
-            "typeMeta": {
-              "type": "keyword"
-            }
-          }
-        },
-        "kql-telemetry": {
-          "properties": {
-            "optInCount": {
-              "type": "long"
-            },
-            "optOutCount": {
-              "type": "long"
-            }
-          }
-        },
-        "migrationVersion": {
-          "dynamic": "true",
-          "properties": {
-            "index-pattern": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "namespace": {
-          "type": "keyword"
-        },
-        "references": {
-          "properties": {
-            "id": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          },
-          "type": "nested"
-        },
-        "sample-data-telemetry": {
-          "properties": {
-            "installCount": {
-              "type": "long"
-            },
-            "unInstallCount": {
-              "type": "long"
-            }
-          }
-        },
-        "search": {
-          "properties": {
-            "columns": {
-              "type": "keyword"
-            },
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "sort": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "server": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            }
-          }
-        },
-        "timelion-sheet": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "timelion_chart_height": {
-              "type": "integer"
-            },
-            "timelion_columns": {
-              "type": "integer"
-            },
-            "timelion_interval": {
-              "type": "keyword"
-            },
-            "timelion_other_interval": {
-              "type": "keyword"
-            },
-            "timelion_rows": {
-              "type": "integer"
-            },
-            "timelion_sheet": {
-              "type": "text"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "ui-metric": {
-          "properties": {
-            "count": {
-              "type": "integer"
-            }
-          }
-        },
-        "updated_at": {
-          "type": "date"
-        },
-        "url": {
-          "properties": {
-            "accessCount": {
-              "type": "long"
-            },
-            "accessDate": {
-              "type": "date"
-            },
-            "createDate": {
-              "type": "date"
-            },
-            "url": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 2048,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "visualization": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "savedSearchRefName": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            },
-            "visState": {
-              "type": "text"
-            }
-          }
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "auto_expand_replicas": "0-1",
-        "number_of_replicas": "0",
-        "number_of_shards": "1"
-      }
-    }
-  }
-}
-
 {
  "type": "index",
  "value": {
--- a/test/functional/fixtures/kbn_archiver/testlargestring.json
+++ b/test/functional/fixtures/kbn_archiver/testlargestring.json
@ -0,0 +1,17 @@
+{
+  "attributes": {
+    "fieldAttrs": "{}",
+    "fields": "[]",
+    "runtimeFieldMap": "{}",
+    "title": "testlargestring"
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "testlargestring",
+  "migrationVersion": {
+    "index-pattern": "7.11.0"
+  },
+  "references": [],
+  "type": "index-pattern",
+  "updated_at": "2021-04-14T20:35:29.121Z",
+  "version": "WzExLDJd"
+}