Changing the namespace agnostic type name

elastic · Sep 7, 2018 · 485d983 · 485d983
1 parent 71c2122
commit 485d983
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 15 deletions.
diff --git a/...t/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json b/...t/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
@@ -337,12 +337,12 @@
   "value": {
     "index": ".kibana",
     "type": "doc",
-    "id": "chapo:8121a00-8efd-21e7-1cb3-34ab966434445",
+    "id": "globaltype:8121a00-8efd-21e7-1cb3-34ab966434445",
     "source": {
-      "type": "chapo",
+      "type": "globaltype",
       "updated_at": "2017-09-21T18:59:16.270Z",
-      "chapo": {
-        "name": "El Chapo"
+      "globaltype": {
+        "name": "My favorite global 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
@@ -303,7 +303,7 @@
               }
             }
           },
-          "chapo": {
+          "globaltype": {
             "properties": {
               "name": {
                 "type": "text",

diff --git a/...test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/index.js b/...test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/index.js
@@ -12,7 +12,7 @@ export default function (kibana) {
     name: 'namespace_agnostic_type_plugin',
     uiExports: {
       savedObjectsSchema: {
-        chapo: {
+        globaltype: {
           isNamespaceAgnostic: true
         }
       },

diff --git a/...saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/mappings.json b/...saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/mappings.json
@@ -1,5 +1,5 @@
 {
-  "chapo": {
+  "globaltype": {
     "properties": {
       "name": {
         "type": "text",

diff --git a/x-pack/test/saved_object_api_integration/common/suites/saved_objects/create.js b/x-pack/test/saved_object_api_integration/common/suites/saved_objects/create.js
@@ -9,7 +9,7 @@ import { DEFAULT_SPACE_ID } from '../../../../../plugins/spaces/common/constants
 
 export function createTestSuiteFactory(es, esArchiver, supertest) {
   const spaceAwareType = 'visualization';
-  const notSpaceAwareType = 'chapo';
+  const notSpaceAwareType = 'globaltype';
 
   const makeCreateTest = (describeFn) => (description, {
     auth = {

diff --git a/x-pack/test/saved_object_api_integration/common/suites/saved_objects/delete.ts b/x-pack/test/saved_object_api_integration/common/suites/saved_objects/delete.ts
@@ -53,7 +53,9 @@ export function deleteTestSuiteFactory(esArchiver: any, supertest: SuperTest<any
       } when deleting a non-space-aware doc`, async () =>
         await supertest
           .delete(
-            `${getUrlPrefix(spaceId)}/api/saved_objects/chapo/8121a00-8efd-21e7-1cb3-34ab966434445`
+            `${getUrlPrefix(
+              spaceId
+            )}/api/saved_objects/globaltype/8121a00-8efd-21e7-1cb3-34ab966434445`
           )
           .auth(auth.username, auth.password)
           .expect(tests.notSpaceAware.statusCode)
@@ -114,7 +116,7 @@ export function deleteTestSuiteFactory(esArchiver: any, supertest: SuperTest<any
     deleteTest,
     expectEmpty,
     expectRbacSpaceAwareForbidden: createExpectRbacForbidden('dashboard'),
-    expectRbacNotSpaceAwareForbidden: createExpectRbacForbidden('chapo'),
+    expectRbacNotSpaceAwareForbidden: createExpectRbacForbidden('globaltype'),
     expectRbacInvalidIdForbidden: createExpectRbacForbidden('dashboard'),
   };
 }
diff --git a/x-pack/test/saved_object_api_integration/common/suites/saved_objects/find.js b/x-pack/test/saved_object_api_integration/common/suites/saved_objects/find.js
@@ -139,11 +139,11 @@ export function findTestSuiteFactory(esArchiver, supertest) {
         },
         {
           id: `8121a00-8efd-21e7-1cb3-34ab966434445`,
-          type: 'chapo',
+          type: 'globaltype',
           updated_at: '2017-09-21T18:59:16.270Z',
           version: 1,
           attributes: {
-            'name': 'El Chapo'
+            'name': 'My favorite global object'
           }
         }
       ]

diff --git a/x-pack/test/saved_object_api_integration/common/suites/saved_objects/update.ts b/x-pack/test/saved_object_api_integration/common/suites/saved_objects/update.ts
@@ -56,7 +56,9 @@ export function updateTestSuiteFactory(esArchiver: any, supertest: SuperTest<any
       it(`should return ${tests.notSpaceAware.statusCode} for a non space-aware doc`, async () => {
         await supertest
           .put(
-            `${getUrlPrefix(spaceId)}/api/saved_objects/chapo/8121a00-8efd-21e7-1cb3-34ab966434445`
+            `${getUrlPrefix(
+              spaceId
+            )}/api/saved_objects/globaltype/8121a00-8efd-21e7-1cb3-34ab966434445`
           )
           .auth(auth.username, auth.password)
           .send({
@@ -132,7 +134,7 @@ export function updateTestSuiteFactory(esArchiver: any, supertest: SuperTest<any
 
     expect(resp.body).to.eql({
       id: resp.body.id,
-      type: 'chapo',
+      type: 'globaltype',
       updated_at: resp.body.updated_at,
       version: 2,
       attributes: {
@@ -161,7 +163,7 @@ export function updateTestSuiteFactory(esArchiver: any, supertest: SuperTest<any
     createExpectLegacyForbidden,
     expectDoesntExistRbacForbidden: createExpectRbacForbidden('visualization'),
     expectNotSpaceAwareResults,
-    expectNotSpaceAwareRbacForbidden: createExpectRbacForbidden('chapo'),
+    expectNotSpaceAwareRbacForbidden: createExpectRbacForbidden('globaltype'),
     expectNotFound,
     expectSpaceAwareResults,
     expectSpaceAwareRbacForbidden: createExpectRbacForbidden('visualization'),