Mapping adjustments

jbudz · Jul 13, 2020 · 52d68dc · 52d68dc
1 parent b2cedcc
commit 52d68dc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/common.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/common.ts
@@ -7,13 +7,13 @@ import { Logger } from 'src/core/server';
 
 export const ArtifactConstants = {
   GLOBAL_ALLOWLIST_NAME: 'endpoint-exceptionlist',
-  SAVED_OBJECT_TYPE: 'endpoint:user-artifact:v2',
+  SAVED_OBJECT_TYPE: 'endpoint:user-artifact',
   SUPPORTED_OPERATING_SYSTEMS: ['linux', 'macos', 'windows'],
   SCHEMA_VERSION: 'v1',
 };
 
 export const ManifestConstants = {
-  SAVED_OBJECT_TYPE: 'endpoint:user-artifact-manifest:v2',
+  SAVED_OBJECT_TYPE: 'endpoint:user-artifact-manifest',
   SCHEMA_VERSION: 'v1',
   INITIAL_VERSION: 'WzAsMF0=',
 };

diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/saved_object_mappings.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/saved_object_mappings.ts
@@ -45,7 +45,6 @@ export const exceptionsArtifactSavedObjectMappings: SavedObjectsType['mappings']
     },
     body: {
       type: 'binary',
-      index: false,
     },
   },
 };
@@ -66,14 +65,14 @@ export const manifestSavedObjectMappings: SavedObjectsType['mappings'] = {
 
 export const exceptionsArtifactType: SavedObjectsType = {
   name: exceptionsArtifactSavedObjectType,
-  hidden: false, // TODO: should these be hidden?
+  hidden: false,
   namespaceType: 'agnostic',
   mappings: exceptionsArtifactSavedObjectMappings,
 };
 
 export const manifestType: SavedObjectsType = {
   name: manifestSavedObjectType,
-  hidden: false, // TODO: should these be hidden?
+  hidden: false,
   namespaceType: 'agnostic',
   mappings: manifestSavedObjectMappings,
 };
diff --git a/x-pack/test/functional/es_archives/endpoint/artifacts/api_feature/data.json b/x-pack/test/functional/es_archives/endpoint/artifacts/api_feature/data.json
@@ -1,12 +1,12 @@
 {
   "type": "doc",
   "value": {
-    "id": "endpoint:user-artifact:v2:endpoint-exceptionlist-linux-v1-d2a9c760005b08d43394e59a8701ae75c80881934ccf15a006944452b80f7f9f",
+    "id": "endpoint:user-artifact:endpoint-exceptionlist-linux-v1-d2a9c760005b08d43394e59a8701ae75c80881934ccf15a006944452b80f7f9f",
     "index": ".kibana",
     "source": {
       "references": [
       ],
-      "endpoint:user-artifact:v2": {
+      "endpoint:user-artifact": {
         "body": "eJylkM8KwjAMxl9Fci59gN29iicvMqR02QjUbiSpKGPvbiw6ETwpuX1/fh9kBszKhALNcQa9TQgNCJ2nhOA+vJ4wdWaGqJSHPY8RRXxPCb3QkJEtP07IQUe2GOWYSoedqU8qXq16ikGqeAmpPNRtCqIU3WbnDx4WN38d/WvhQqmCXzDlIlojP9CsjLC0bqWtHwhaGN/1jHVkae3u+6N6Sg==",
         "created": 1593016187465,
         "compressionAlgorithm": "zlib",
@@ -17,7 +17,7 @@
         "decodedSha256": "d2a9c760005b08d43394e59a8701ae75c80881934ccf15a006944452b80f7f9f",
         "decodedSize": 358
       },
-      "type": "endpoint:user-artifact:v2",
+      "type": "endpoint:user-artifact",
       "updated_at": "2020-06-24T16:29:47.584Z"
     }
   }
@@ -26,20 +26,20 @@
 {
   "type": "doc",
   "value": {
-    "id": "endpoint:user-artifact-manifest:v2:endpoint-manifest-v1",
+    "id": "endpoint:user-artifact-manifest:endpoint-manifest-v1",
     "index": ".kibana",
     "source": {
       "references": [
       ],
-      "endpoint:user-artifact-manifest:v2": {
+      "endpoint:user-artifact-manifest": {
         "created": 1593183699663,
         "ids": [
           "endpoint-exceptionlist-linux-v1-d2a9c760005b08d43394e59a8701ae75c80881934ccf15a006944452b80f7f9f",
           "endpoint-exceptionlist-macos-v1-d801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658",
           "endpoint-exceptionlist-windows-v1-d801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658"
         ]
       },
-      "type": "endpoint:user-artifact-manifest:v2",
+      "type": "endpoint:user-artifact-manifest",
       "updated_at": "2020-06-26T15:01:39.704Z"
     }
   }