Removing the "saved_objects" folder

kobelb · Sep 7, 2018 · 38d2e74 · 38d2e74
1 parent 70eada4
commit 38d2e74
Show file tree

Hide file tree

Showing 31 changed files with 115 additions and 163 deletions.
diff --git a/x-pack/scripts/functional_tests.js b/x-pack/scripts/functional_tests.js
@@ -13,7 +13,9 @@ require('@kbn/test').runTestsCli([
   require.resolve('../test/functional/config.js'),
   require.resolve('../test/api_integration/config.js'),
   require.resolve('../test/saml_api_integration/config.js'),
-  require.resolve('../test/rbac_api_integration/config.js'),
   require.resolve('../test/spaces_api_integration/spaces_only/config.js'),
   require.resolve('../test/spaces_api_integration/security_and_spaces/config.js'),
+  require.resolve('../test/saved_object_api_integration/security_and_spaces/config'),
+  require.resolve('../test/saved_object_api_integration/security_only/config'),
+  require.resolve('../test/saved_object_api_integration/spaces_only/config'),
 ]);
diff --git a/...n/common/suites/saved_objects/bulk_get.ts → ...api_integration/common/suites/bulk_get.ts b/...n/common/suites/saved_objects/bulk_get.ts → ...api_integration/common/suites/bulk_get.ts
@@ -5,9 +5,9 @@
  */
 
 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, TestDefinitionAuthentication } from '../../../common/lib/types';
+import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
+import { getIdPrefix, getUrlPrefix } from '../lib/space_test_utils';
+import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
 
 interface BulkGetTest {
   statusCode: number;

diff --git a/...ion/common/suites/saved_objects/create.ts → ...t_api_integration/common/suites/create.ts b/...ion/common/suites/saved_objects/create.ts → ...t_api_integration/common/suites/create.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import expect from 'expect.js';
-import { DEFAULT_SPACE_ID } from '../../../../../plugins/spaces/common/constants';
-import { DescribeFn, TestDefinitionAuthentication } from '../../../common/lib/types';
-import { getUrlPrefix } from '../../lib/space_test_utils';
+import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
+import { getUrlPrefix } from '../lib/space_test_utils';
+import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
 
 interface CreateTest {
   statusCode: number;

diff --git a/...ion/common/suites/saved_objects/delete.ts → ...t_api_integration/common/suites/delete.ts b/...ion/common/suites/saved_objects/delete.ts → ...t_api_integration/common/suites/delete.ts
@@ -5,9 +5,9 @@
  */
 
 import expect from 'expect.js';
-import { DEFAULT_SPACE_ID } from '../../../../../plugins/spaces/common/constants';
-import { DescribeFn, TestDefinitionAuthentication } from '../../../common/lib/types';
-import { getIdPrefix, getUrlPrefix } from '../../lib/space_test_utils';
+import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
+import { getIdPrefix, getUrlPrefix } from '../lib/space_test_utils';
+import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
 
 interface DeleteTest {
   statusCode: number;

diff --git a/...ation/common/suites/saved_objects/find.ts → ...ect_api_integration/common/suites/find.ts b/...ation/common/suites/saved_objects/find.ts → ...ect_api_integration/common/suites/find.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 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, TestDefinitionAuthentication } from '../../../common/lib/types';
+import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
+import { getIdPrefix, getUrlPrefix } from '../lib/space_test_utils';
+import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
 
 interface FindTest {
   statusCode: number;

diff --git a/...ration/common/suites/saved_objects/get.ts → ...ject_api_integration/common/suites/get.ts b/...ration/common/suites/saved_objects/get.ts → ...ject_api_integration/common/suites/get.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import expect from 'expect.js';
-import { DEFAULT_SPACE_ID } from '../../../../../plugins/spaces/common/constants';
-import { DescribeFn, TestDefinitionAuthentication } from '../../../common/lib/types';
-import { getIdPrefix, getUrlPrefix } from '../../lib/space_test_utils';
+import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
+import { getIdPrefix, getUrlPrefix } from '../lib/space_test_utils';
+import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
 
 interface GetTest {
   statusCode: number;

diff --git a/...ion/common/suites/saved_objects/update.ts → ...t_api_integration/common/suites/update.ts b/...ion/common/suites/saved_objects/update.ts → ...t_api_integration/common/suites/update.ts
@@ -5,9 +5,9 @@
  */
 
 import expect from 'expect.js';
-import { DEFAULT_SPACE_ID } from '../../../../../plugins/spaces/common/constants';
-import { getIdPrefix, getUrlPrefix } from '../../lib/space_test_utils';
-import { DescribeFn, TestDefinitionAuthentication } from '../../lib/types';
+import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
+import { getIdPrefix, getUrlPrefix } from '../lib/space_test_utils';
+import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
 
 interface UpdateTest {
   statusCode: number;

diff --git a/...and_spaces/apis/saved_objects/bulk_get.ts → ...tion/security_and_spaces/apis/bulk_get.ts b/...and_spaces/apis/saved_objects/bulk_get.ts → ...tion/security_and_spaces/apis/bulk_get.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../../common/lib/authentication';
-import { SPACES } from '../../../common/lib/spaces';
-import { TestInvoker } from '../../../common/lib/types';
-import { bulkGetTestSuiteFactory } from '../../../common/suites/saved_objects/bulk_get';
+import { AUTHENTICATION } from '../../common/lib/authentication';
+import { SPACES } from '../../common/lib/spaces';
+import { TestInvoker } from '../../common/lib/types';
+import { bulkGetTestSuiteFactory } from '../../common/suites/bulk_get';
 
 // tslint:disable:no-default-export
 export default function({ getService }: TestInvoker) {

diff --git a/...y_and_spaces/apis/saved_objects/create.ts → ...ration/security_and_spaces/apis/create.ts b/...y_and_spaces/apis/saved_objects/create.ts → ...ration/security_and_spaces/apis/create.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../../common/lib/authentication';
-import { SPACES } from '../../../common/lib/spaces';
-import { TestInvoker } from '../../../common/lib/types';
-import { createTestSuiteFactory } from '../../../common/suites/saved_objects/create';
+import { AUTHENTICATION } from '../../common/lib/authentication';
+import { SPACES } from '../../common/lib/spaces';
+import { TestInvoker } from '../../common/lib/types';
+import { createTestSuiteFactory } from '../../common/suites/create';
 
 // tslint:disable:no-default-export
 export default function({ getService }: TestInvoker) {

diff --git a/...y_and_spaces/apis/saved_objects/delete.ts → ...ration/security_and_spaces/apis/delete.ts b/...y_and_spaces/apis/saved_objects/delete.ts → ...ration/security_and_spaces/apis/delete.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../../common/lib/authentication';
-import { SPACES } from '../../../common/lib/spaces';
-import { TestInvoker } from '../../../common/lib/types';
-import { deleteTestSuiteFactory } from '../../../common/suites/saved_objects/delete';
+import { AUTHENTICATION } from '../../common/lib/authentication';
+import { SPACES } from '../../common/lib/spaces';
+import { TestInvoker } from '../../common/lib/types';
+import { deleteTestSuiteFactory } from '../../common/suites/delete';
 
 // tslint:disable:no-default-export
 export default function({ getService }: TestInvoker) {

diff --git a/...ity_and_spaces/apis/saved_objects/find.ts → ...egration/security_and_spaces/apis/find.ts b/...ity_and_spaces/apis/saved_objects/find.ts → ...egration/security_and_spaces/apis/find.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../../common/lib/authentication';
-import { SPACES } from '../../../common/lib/spaces';
-import { TestInvoker } from '../../../common/lib/types';
-import { findTestSuiteFactory } from '../../../common/suites/saved_objects/find';
+import { AUTHENTICATION } from '../../common/lib/authentication';
+import { SPACES } from '../../common/lib/spaces';
+import { TestInvoker } from '../../common/lib/types';
+import { findTestSuiteFactory } from '../../common/suites/find';
 
 // tslint:disable:no-default-export
 export default function({ getService }: TestInvoker) {

diff --git a/...rity_and_spaces/apis/saved_objects/get.ts → ...tegration/security_and_spaces/apis/get.ts b/...rity_and_spaces/apis/saved_objects/get.ts → ...tegration/security_and_spaces/apis/get.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../../common/lib/authentication';
-import { SPACES } from '../../../common/lib/spaces';
-import { TestInvoker } from '../../../common/lib/types';
-import { getTestSuiteFactory } from '../../../common/suites/saved_objects/get';
+import { AUTHENTICATION } from '../../common/lib/authentication';
+import { SPACES } from '../../common/lib/spaces';
+import { TestInvoker } from '../../common/lib/types';
+import { getTestSuiteFactory } from '../../common/suites/get';
 
 // tslint:disable:no-default-export
 export default function({ getService }: TestInvoker) {

diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/index.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/index.ts
@@ -3,19 +3,25 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+
 import { createUsersAndRoles } from '../../common/lib/create_users_and_roles';
 import { TestInvoker } from '../../common/lib/types';
 
 // tslint:disable:no-default-export
-export default function({ loadTestFile, getService }: TestInvoker) {
+export default function({ getService, loadTestFile }: TestInvoker) {
   const es = getService('es');
   const supertest = getService('supertest');
 
-  describe('security and spaces enabled', () => {
+  describe('saved objects security and spaces enabled', () => {
     before(async () => {
       await createUsersAndRoles(es, supertest);
     });
 
-    loadTestFile(require.resolve('./saved_objects'));
+    loadTestFile(require.resolve('./bulk_get'));
+    loadTestFile(require.resolve('./create'));
+    loadTestFile(require.resolve('./delete'));
+    loadTestFile(require.resolve('./find'));
+    loadTestFile(require.resolve('./get'));
+    loadTestFile(require.resolve('./update'));
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/saved_objects/index.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/saved_objects/index.ts
diff --git a/...y_and_spaces/apis/saved_objects/update.ts → ...ration/security_and_spaces/apis/update.ts b/...y_and_spaces/apis/saved_objects/update.ts → ...ration/security_and_spaces/apis/update.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../../common/lib/authentication';
-import { SPACES } from '../../../common/lib/spaces';
-import { TestInvoker } from '../../../common/lib/types';
-import { updateTestSuiteFactory } from '../../../common/suites/saved_objects/update';
+import { AUTHENTICATION } from '../../common/lib/authentication';
+import { SPACES } from '../../common/lib/spaces';
+import { TestInvoker } from '../../common/lib/types';
+import { updateTestSuiteFactory } from '../../common/suites/update';
 
 // tslint:disable:no-default-export
 export default function({ getService }: TestInvoker) {

diff --git a/...urity_only/apis/saved_objects/bulk_get.ts → ...ntegration/security_only/apis/bulk_get.ts b/...urity_only/apis/saved_objects/bulk_get.ts → ...ntegration/security_only/apis/bulk_get.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../../common/lib/authentication';
-import { TestInvoker } from '../../../common/lib/types';
-import { bulkGetTestSuiteFactory } from '../../../common/suites/saved_objects/bulk_get';
+import { AUTHENTICATION } from '../../common/lib/authentication';
+import { TestInvoker } from '../../common/lib/types';
+import { bulkGetTestSuiteFactory } from '../../common/suites/bulk_get';
 
 // tslint:disable:no-default-export
 export default function({ getService }: TestInvoker) {

diff --git a/...ecurity_only/apis/saved_objects/create.ts → ..._integration/security_only/apis/create.ts b/...ecurity_only/apis/saved_objects/create.ts → ..._integration/security_only/apis/create.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../../common/lib/authentication';
-import { TestInvoker } from '../../../common/lib/types';
-import { createTestSuiteFactory } from '../../../common/suites/saved_objects/create';
+import { AUTHENTICATION } from '../../common/lib/authentication';
+import { TestInvoker } from '../../common/lib/types';
+import { createTestSuiteFactory } from '../../common/suites/create';
 
 // tslint:disable:no-default-export
 export default function({ getService }: TestInvoker) {

diff --git a/...ecurity_only/apis/saved_objects/delete.ts → ..._integration/security_only/apis/delete.ts b/...ecurity_only/apis/saved_objects/delete.ts → ..._integration/security_only/apis/delete.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../../common/lib/authentication';
-import { TestInvoker } from '../../../common/lib/types';
-import { deleteTestSuiteFactory } from '../../../common/suites/saved_objects/delete';
+import { AUTHENTICATION } from '../../common/lib/authentication';
+import { TestInvoker } from '../../common/lib/types';
+import { deleteTestSuiteFactory } from '../../common/suites/delete';
 
 // tslint:disable:no-default-export
 export default function({ getService }: TestInvoker) {

diff --git a/.../security_only/apis/saved_objects/find.ts → ...pi_integration/security_only/apis/find.ts b/.../security_only/apis/saved_objects/find.ts → ...pi_integration/security_only/apis/find.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../../common/lib/authentication';
-import { TestInvoker } from '../../../common/lib/types';
-import { findTestSuiteFactory } from '../../../common/suites/saved_objects/find';
+import { AUTHENTICATION } from '../../common/lib/authentication';
+import { TestInvoker } from '../../common/lib/types';
+import { findTestSuiteFactory } from '../../common/suites/find';
 
 // tslint:disable:no-default-export
 export default function({ getService }: TestInvoker) {

diff --git a/...n/security_only/apis/saved_objects/get.ts → ...api_integration/security_only/apis/get.ts b/...n/security_only/apis/saved_objects/get.ts → ...api_integration/security_only/apis/get.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../../common/lib/authentication';
-import { TestInvoker } from '../../../common/lib/types';
-import { getTestSuiteFactory } from '../../../common/suites/saved_objects/get';
+import { AUTHENTICATION } from '../../common/lib/authentication';
+import { TestInvoker } from '../../common/lib/types';
+import { getTestSuiteFactory } from '../../common/suites/get';
 
 // tslint:disable:no-default-export
 export default function({ getService }: TestInvoker) {

diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/index.ts b/x-pack/test/saved_object_api_integration/security_only/apis/index.ts
@@ -3,19 +3,25 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+
 import { createUsersAndRoles } from '../../common/lib/create_users_and_roles';
 import { TestInvoker } from '../../common/lib/types';
 
 // tslint:disable:no-default-export
-export default function({ loadTestFile, getService }: TestInvoker) {
+export default function({ getService, loadTestFile }: TestInvoker) {
   const es = getService('es');
   const supertest = getService('supertest');
 
-  describe('security only enabled', () => {
+  describe('saved objects security only enabled', () => {
     before(async () => {
       await createUsersAndRoles(es, supertest);
     });
 
-    loadTestFile(require.resolve('./saved_objects'));
+    loadTestFile(require.resolve('./bulk_get'));
+    loadTestFile(require.resolve('./create'));
+    loadTestFile(require.resolve('./delete'));
+    loadTestFile(require.resolve('./find'));
+    loadTestFile(require.resolve('./get'));
+    loadTestFile(require.resolve('./update'));
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/saved_objects/index.ts b/x-pack/test/saved_object_api_integration/security_only/apis/saved_objects/index.ts
diff --git a/...ecurity_only/apis/saved_objects/update.ts → ..._integration/security_only/apis/update.ts b/...ecurity_only/apis/saved_objects/update.ts → ..._integration/security_only/apis/update.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../../common/lib/authentication';
-import { TestInvoker } from '../../../common/lib/types';
-import { updateTestSuiteFactory } from '../../../common/suites/saved_objects/update';
+import { AUTHENTICATION } from '../../common/lib/authentication';
+import { TestInvoker } from '../../common/lib/types';
+import { updateTestSuiteFactory } from '../../common/suites/update';
 
 // tslint:disable:no-default-export
 export default function({ getService }: TestInvoker) {

diff --git a/...paces_only/apis/saved_objects/bulk_get.ts → ..._integration/spaces_only/apis/bulk_get.ts b/...paces_only/apis/saved_objects/bulk_get.ts → ..._integration/spaces_only/apis/bulk_get.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SPACES } from '../../../common/lib/spaces';
-import { TestInvoker } from '../../../common/lib/types';
-import { bulkGetTestSuiteFactory } from '../../../common/suites/saved_objects/bulk_get';
+import { SPACES } from '../../common/lib/spaces';
+import { TestInvoker } from '../../common/lib/types';
+import { bulkGetTestSuiteFactory } from '../../common/suites/bulk_get';
 
 // tslint:disable:no-default-export
 export default function({ getService }: TestInvoker) {

diff --git a/.../spaces_only/apis/saved_objects/create.ts → ...pi_integration/spaces_only/apis/create.ts b/.../spaces_only/apis/saved_objects/create.ts → ...pi_integration/spaces_only/apis/create.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SPACES } from '../../../common/lib/spaces';
-import { TestInvoker } from '../../../common/lib/types';
-import { createTestSuiteFactory } from '../../../common/suites/saved_objects/create';
+import { SPACES } from '../../common/lib/spaces';
+import { TestInvoker } from '../../common/lib/types';
+import { createTestSuiteFactory } from '../../common/suites/create';
 
 // tslint:disable:no-default-export
 export default function({ getService }: TestInvoker) {

diff --git a/.../spaces_only/apis/saved_objects/delete.ts → ...pi_integration/spaces_only/apis/delete.ts b/.../spaces_only/apis/saved_objects/delete.ts → ...pi_integration/spaces_only/apis/delete.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SPACES } from '../../../common/lib/spaces';
-import { TestInvoker } from '../../../common/lib/types';
-import { deleteTestSuiteFactory } from '../../../common/suites/saved_objects/delete';
+import { SPACES } from '../../common/lib/spaces';
+import { TestInvoker } from '../../common/lib/types';
+import { deleteTestSuiteFactory } from '../../common/suites/delete';
 
 // tslint:disable:no-default-export
 export default function({ getService }: TestInvoker) {