Fix backport for ES _types

elastic · Mar 18, 2021 · 9d4ab9a · 9d4ab9a
1 parent ebbffbe
commit 9d4ab9a
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 24 deletions.
diff --git a/x-pack/test/functional/es_archives/saved_objects_management/spaces_integration/data.json b/x-pack/test/functional/es_archives/saved_objects_management/spaces_integration/data.json
@@ -11,8 +11,7 @@
       },
       "type": "space",
       "updated_at": "2017-09-21T18:49:16.270Z"
-    },
-    "type": "doc"
+    }
   }
 }
 
@@ -28,16 +27,14 @@
       },
       "type": "space",
       "updated_at": "2017-09-21T18:49:16.270Z"
-    },
-    "type": "doc"
+    }
   }
 }
 
 {
   "type": "doc",
   "value": {
     "index": ".kibana",
-    "type": "doc",
     "id": "index-pattern:logstash-*",
     "source": {
       "index-pattern": {
@@ -58,7 +55,6 @@
   "type": "doc",
   "value": {
     "index": ".kibana",
-    "type": "doc",
     "id": "space_1:visualization:75c3e060-1e7c-11e9-8488-65449e65d0ed",
     "source": {
       "visualization": {
@@ -82,7 +78,6 @@
   "type": "doc",
   "value": {
     "index": ".kibana",
-    "type": "doc",
     "id": "config:6.0.0",
     "source": {
       "config": {

diff --git a/x-pack/test/functional/es_archives/saved_objects_management/spaces_integration/mappings.json b/x-pack/test/functional/es_archives/saved_objects_management/spaces_integration/mappings.json
@@ -7,12 +7,14 @@
     },
     "index": ".kibana_7.13.0_001",
     "mappings": {
-      "dynamic": "false",
-      "properties": {
-        "type": { "type": "keyword" },
-        "migrationVersion": {
-          "dynamic": "true",
-          "type": "object"
+      "doc": {
+        "dynamic": "false",
+        "properties": {
+          "type": { "type": "keyword" },
+          "migrationVersion": {
+            "dynamic": "true",
+            "type": "object"
+          }
         }
       }
     },

diff --git a/...ved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/mappings.json b/...ved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/mappings.json
@@ -7,16 +7,18 @@
     },
     "index": ".kibana_7.13.0_001",
     "mappings": {
-      "dynamic": "false",
-      "properties": {
-        "space": {
-          "dynamic": false,
-          "type": "object"
-        },
-        "type": { "type": "keyword" },
-        "migrationVersion": {
-          "dynamic": "true",
-          "type": "object"
+      "doc": {
+        "dynamic": "false",
+        "properties": {
+          "space": {
+            "dynamic": false,
+            "type": "object"
+          },
+          "type": { "type": "keyword" },
+          "migrationVersion": {
+            "dynamic": "true",
+            "type": "object"
+          }
         }
       }
     },

diff --git a/...est/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/mappings.json b/...est/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/mappings.json
@@ -7,7 +7,20 @@
     },
     "index": ".kibana_7.13.0_001",
     "mappings": {
-      "dynamic": "false"
+      "doc": {
+        "dynamic": "false",
+        "properties": {
+          "space": {
+            "dynamic": false,
+            "type": "object"
+          },
+          "type": { "type": "keyword" },
+          "migrationVersion": {
+            "dynamic": "true",
+            "type": "object"
+          }
+        }
+      }
     },
     "settings": {
       "index": {