Typescriptifying Create

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

Hide file tree

Showing 5 changed files with 182 additions and 178 deletions.
diff --git a/x-pack/test/saved_object_api_integration/common/suites/saved_objects/bulk_get.ts b/x-pack/test/saved_object_api_integration/common/suites/saved_objects/bulk_get.ts
@@ -7,12 +7,7 @@
 import expect from 'expect.js';
 import { DEFAULT_SPACE_ID } from '../../../../../plugins/spaces/common/constants';
 import { getIdPrefix, getUrlPrefix } from '../../../common/lib/space_test_utils';
-import { DescribeFn } from '../../../common/lib/types';
-
-interface Authentication {
-  username: string;
-  password: string;
-}
+import { DescribeFn, TestDefinitionAuthentication } from '../../../common/lib/types';
 
 interface BulkGetTest {
   statusCode: number;
@@ -24,7 +19,7 @@ interface BulkGetTests {
 }
 
 interface BulkGetTestDefinition {
-  auth?: Authentication;
+  auth?: TestDefinitionAuthentication;
   spaceId?: string;
   otherSpaceId?: string;
   tests: BulkGetTests;
@@ -35,15 +30,7 @@ export function bulkGetTestSuiteFactory(esArchiver: any, supertest: SuperTest<an
     description: string,
     definition: BulkGetTestDefinition
   ) => {
-    const {
-      auth = {
-        username: undefined,
-        password: undefined,
-      },
-      spaceId,
-      otherSpaceId,
-      tests,
-    } = definition;
+    const { auth = {}, spaceId, otherSpaceId, tests } = definition;
 
     const BULK_REQUESTS = [
       {

diff --git a/...ion/common/suites/saved_objects/create.js → ...ion/common/suites/saved_objects/create.ts b/...ion/common/suites/saved_objects/create.js → ...ion/common/suites/saved_objects/create.ts
@@ -4,21 +4,35 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import expect from 'expect.js';
-import { getUrlPrefix } from '../../lib/space_test_utils';
 import { DEFAULT_SPACE_ID } from '../../../../../plugins/spaces/common/constants';
+import { DescribeFn, TestDefinitionAuthentication } from '../../../common/lib/types';
+import { getUrlPrefix } from '../../lib/space_test_utils';
 
-export function createTestSuiteFactory(es, esArchiver, supertest) {
+interface CreateTest {
+  statusCode: number;
+  response: (resp: any) => void;
+}
+
+interface CreateTests {
+  spaceAware: CreateTest;
+  notSpaceAware: CreateTest;
+}
+
+interface CreateTestDefinition {
+  auth?: TestDefinitionAuthentication;
+  spaceId?: string;
+  tests: CreateTests;
+}
+
+export function createTestSuiteFactory(es: any, esArchiver: any, supertest: SuperTest<any>) {
   const spaceAwareType = 'visualization';
   const notSpaceAwareType = 'globaltype';
 
-  const makeCreateTest = (describeFn) => (description, {
-    auth = {
-      username: undefined,
-      password: undefined
-    },
-    spaceId,
-    tests,
-  }) => {
+  const makeCreateTest = (describeFn: DescribeFn) => (
+    description: string,
+    definition: CreateTestDefinition
+  ) => {
+    const { auth = {}, spaceId = DEFAULT_SPACE_ID, tests } = definition;
     describeFn(description, () => {
       before(() => esArchiver.load('saved_objects/spaces'));
       after(() => esArchiver.unload('saved_objects/spaces'));
@@ -28,8 +42,8 @@ export function createTestSuiteFactory(es, esArchiver, supertest) {
           .auth(auth.username, auth.password)
           .send({
             attributes: {
-              title: 'My favorite vis'
-            }
+              title: 'My favorite vis',
+            },
           })
           .expect(tests.spaceAware.statusCode)
           .then(tests.spaceAware.response);
@@ -42,32 +56,52 @@ export function createTestSuiteFactory(es, esArchiver, supertest) {
           .send({
             attributes: {
               name: `Can't be contained to a space`,
-            }
+            },
           })
           .expect(tests.notSpaceAware.statusCode)
           .then(tests.notSpaceAware.response);
       });
-
     });
   };
 
   const createTest = makeCreateTest(describe);
   createTest.only = makeCreateTest(describe.only);
 
-  const createExpectSpaceAwareResults = (spaceId = DEFAULT_SPACE_ID) => async (resp) => {
-    expect(resp.body).to.have.property('id').match(/^[0-9a-f-]{36}$/);
+  const createExpectLegacyForbidden = (username: string) => (resp: any) => {
+    expect(resp.body).to.eql({
+      statusCode: 403,
+      error: 'Forbidden',
+      // eslint-disable-next-line max-len
+      message: `action [indices:data/write/index] is unauthorized for user [${username}]: [security_exception] action [indices:data/write/index] is unauthorized for user [${username}]`,
+    });
+  };
+
+  const createExpectRbacForbidden = (type: string) => (resp: any) => {
+    expect(resp.body).to.eql({
+      statusCode: 403,
+      error: 'Forbidden',
+      message: `Unable to create ${type}, missing action:saved_objects/${type}/create`,
+    });
+  };
+
+  const createExpectSpaceAwareResults = (spaceId = DEFAULT_SPACE_ID) => async (resp: any) => {
+    expect(resp.body)
+      .to.have.property('id')
+      .match(/^[0-9a-f-]{36}$/);
 
     // loose ISO8601 UTC time with milliseconds validation
-    expect(resp.body).to.have.property('updated_at').match(/^[\d-]{10}T[\d:\.]{12}Z$/);
+    expect(resp.body)
+      .to.have.property('updated_at')
+      .match(/^[\d-]{10}T[\d:\.]{12}Z$/);
 
     expect(resp.body).to.eql({
       id: resp.body.id,
       type: spaceAwareType,
       updated_at: resp.body.updated_at,
       version: 1,
       attributes: {
-        title: 'My favorite vis'
-      }
+        title: 'My favorite vis',
+      },
     });
 
     const expectedSpacePrefix = spaceId === DEFAULT_SPACE_ID ? '' : `${spaceId}:`;
@@ -76,12 +110,10 @@ export function createTestSuiteFactory(es, esArchiver, supertest) {
     const { _source } = await es.get({
       id: `${expectedSpacePrefix}${spaceAwareType}:${resp.body.id}`,
       type: 'doc',
-      index: '.kibana'
+      index: '.kibana',
     });
 
-    const {
-      namespace: actualNamespace
-    } = _source;
+    const { namespace: actualNamespace } = _source;
 
     if (spaceId === DEFAULT_SPACE_ID) {
       expect(actualNamespace).to.eql(undefined);
@@ -90,11 +122,15 @@ export function createTestSuiteFactory(es, esArchiver, supertest) {
     }
   };
 
-  const expectNotSpaceAwareResults = () => async (resp) => {
-    expect(resp.body).to.have.property('id').match(/^[0-9a-f-]{36}$/);
+  const expectNotSpaceAwareResults = async (resp: any) => {
+    expect(resp.body)
+      .to.have.property('id')
+      .match(/^[0-9a-f-]{36}$/);
 
     // loose ISO8601 UTC time with milliseconds validation
-    expect(resp.body).to.have.property('updated_at').match(/^[\d-]{10}T[\d:\.]{12}Z$/);
+    expect(resp.body)
+      .to.have.property('updated_at')
+      .match(/^[\d-]{10}T[\d:\.]{12}Z$/);
 
     expect(resp.body).to.eql({
       id: resp.body.id,
@@ -103,28 +139,27 @@ export function createTestSuiteFactory(es, esArchiver, supertest) {
       version: 1,
       attributes: {
         name: `Can't be contained to a space`,
-      }
+      },
     });
 
     // query ES directory to ensure namespace wasn't specified
     const { _source } = await es.get({
       id: `${notSpaceAwareType}:${resp.body.id}`,
       type: 'doc',
-      index: '.kibana'
+      index: '.kibana',
     });
 
-    const {
-      namespace: actualNamespace
-    } = _source;
+    const { namespace: actualNamespace } = _source;
 
     expect(actualNamespace).to.eql(undefined);
   };
 
   return {
     createTest,
+    createExpectLegacyForbidden,
     createExpectSpaceAwareResults,
     expectNotSpaceAwareResults,
-    notSpaceAwareType,
-    spaceAwareType,
+    expectNotSpaceAwareRbacForbidden: createExpectRbacForbidden(notSpaceAwareType),
+    expectSpaceAwareRbacForbidden: createExpectRbacForbidden(spaceAwareType),
   };
 }