Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .buildkite/ftr_platform_stateful_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -322,11 +322,11 @@ enabled:
- x-pack/test/security_functional/user_profiles.config.ts
- x-pack/test/security_functional/expired_session.config.ts
- x-pack/test/session_view/basic/config.ts
- x-pack/test/spaces_api_integration/security_and_spaces/config_basic.ts
- x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_basic.ts
- x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts
- x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts
- x-pack/test/spaces_api_integration/spaces_only/config.ts
- x-pack/platform/test/spaces_api_integration/security_and_spaces/config_basic.ts
- x-pack/platform/test/spaces_api_integration/security_and_spaces/copy_to_space_config_basic.ts
- x-pack/platform/test/spaces_api_integration/security_and_spaces/config_trial.ts
- x-pack/platform/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts
- x-pack/platform/test/spaces_api_integration/spaces_only/config.ts
- x-pack/platform/test/task_manager_claimer_update_by_query/config.ts
- x-pack/platform/test/ui_capabilities/security_and_spaces/config.ts
- x-pack/platform/test/ui_capabilities/spaces_only/config.ts
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -1976,7 +1976,7 @@ module.exports = {
'x-pack/test/security_functional/**/*.{js,mjs,ts,tsx}',

'x-pack/platform/plugins/shared/spaces/**/*.{js,mjs,ts,tsx}',
'x-pack/test/spaces_api_integration/**/*.{js,mjs,ts,tsx}',
'x-pack/platform/test/spaces_api_integration/**/*.{js,mjs,ts,tsx}',
],
rules: {
'@typescript-eslint/consistent-type-imports': 1,
Expand Down
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -968,7 +968,7 @@ src/platform/packages/private/kbn-some-dev-log @elastic/kibana-operations
packages/kbn-sort-package-json @elastic/kibana-operations
src/platform/packages/shared/kbn-sort-predicates @elastic/kibana-visualizations
x-pack/platform/plugins/shared/spaces @elastic/kibana-security
x-pack/test/spaces_api_integration/common/plugins/spaces_test_plugin @elastic/kibana-security
x-pack/platform/test/spaces_api_integration/common/plugins/spaces_test_plugin @elastic/kibana-security
src/platform/packages/shared/kbn-spaces-utils @elastic/kibana-security
packages/kbn-spec-to-console @elastic/kibana-management
src/platform/packages/shared/kbn-sse-utils @elastic/obs-knowledge-team
Expand Down Expand Up @@ -1988,7 +1988,7 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi
/x-pack/platform/test/functional/apps/spaces/ @elastic/kibana-security
/x-pack/test/security_api_integration/ @elastic/kibana-security
/x-pack/test/security_functional/ @elastic/kibana-security
/x-pack/test/spaces_api_integration/ @elastic/kibana-security
/x-pack/platform/test/spaces_api_integration/ @elastic/kibana-security
/x-pack/platform/test/saved_object_api_integration/ @elastic/kibana-security
/x-pack/test_serverless/**/test_suites/common/platform_security/ @elastic/kibana-security
/x-pack/test_serverless/**/test_suites/search/platform_security/ @elastic/kibana-security
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -953,7 +953,7 @@
"@kbn/snapshot-restore-plugin": "link:x-pack/platform/plugins/private/snapshot_restore",
"@kbn/sort-predicates": "link:src/platform/packages/shared/kbn-sort-predicates",
"@kbn/spaces-plugin": "link:x-pack/platform/plugins/shared/spaces",
"@kbn/spaces-test-plugin": "link:x-pack/test/spaces_api_integration/common/plugins/spaces_test_plugin",
"@kbn/spaces-test-plugin": "link:x-pack/platform/test/spaces_api_integration/common/plugins/spaces_test_plugin",
"@kbn/spaces-utils": "link:src/platform/packages/shared/kbn-spaces-utils",
"@kbn/sse-utils": "link:src/platform/packages/shared/kbn-sse-utils",
"@kbn/sse-utils-client": "link:src/platform/packages/shared/kbn-sse-utils-client",
Expand Down
2 changes: 1 addition & 1 deletion scripts/archive_migration_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ save_kbn() {
set -x
node scripts/kbn_archiver.js --config "$test_config" save "$new_archive" --type $standard_list --space "$space"
set +x
# node scripts/kbn_archiver.js --config x-pack/test/spaces_api_integration/security_and_spaces/config_basic.ts save x-pack/test/functional/fixtures/kbn_archiver/saved_objects/default_space --type search,index-pattern,visualization,dashboard,lens,map,graph-workspace,query,tag,url,canvas-workpad
# node scripts/kbn_archiver.js --config x-pack/platform/test/spaces_api_integration/security_and_spaces/config_basic.ts save x-pack/test/functional/fixtures/kbn_archiver/saved_objects/default_space --type search,index-pattern,visualization,dashboard,lens,map,graph-workspace,query,tag,url,canvas-workpad
}

load_kbn() {
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -1930,8 +1930,8 @@
"@kbn/sort-predicates/*": ["src/platform/packages/shared/kbn-sort-predicates/*"],
"@kbn/spaces-plugin": ["x-pack/platform/plugins/shared/spaces"],
"@kbn/spaces-plugin/*": ["x-pack/platform/plugins/shared/spaces/*"],
"@kbn/spaces-test-plugin": ["x-pack/test/spaces_api_integration/common/plugins/spaces_test_plugin"],
"@kbn/spaces-test-plugin/*": ["x-pack/test/spaces_api_integration/common/plugins/spaces_test_plugin/*"],
"@kbn/spaces-test-plugin": ["x-pack/platform/test/spaces_api_integration/common/plugins/spaces_test_plugin"],
"@kbn/spaces-test-plugin/*": ["x-pack/platform/test/spaces_api_integration/common/plugins/spaces_test_plugin/*"],
"@kbn/spaces-utils": ["src/platform/packages/shared/kbn-spaces-utils"],
"@kbn/spaces-utils/*": ["src/platform/packages/shared/kbn-spaces-utils/*"],
"@kbn/spec-to-console": ["packages/kbn-spec-to-console"],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../../../../../tsconfig.base.json",
"extends": "../../../../../../../tsconfig.base.json",
"compilerOptions": {
"outDir": "target/types",
"isolatedModules": true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
*/

import { services as apiIntegrationServices } from '../../api_integration/services';
import { services as commonServices } from '../../common/services';

export const services = {
...commonServices,
usageAPI: apiIntegrationServices.usageAPI,
...apiIntegrationServices,
};
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,18 @@ const UUID_PATTERN = new RegExp(
const SPACE_DATA_TO_LOAD: Array<{ spaceName: string | null; dataUrl: string }> = [
{
spaceName: null,
dataUrl: 'x-pack/test/spaces_api_integration/common/fixtures/kbn_archiver/default_space.json',
dataUrl:
'x-pack/platform/test/spaces_api_integration/common/fixtures/kbn_archiver/default_space.json',
},
{
spaceName: SPACE_1.id,
dataUrl: 'x-pack/test/spaces_api_integration/common/fixtures/kbn_archiver/space_1.json',
dataUrl:
'x-pack/platform/test/spaces_api_integration/common/fixtures/kbn_archiver/space_1.json',
},
{
spaceName: SPACE_2.id,
dataUrl: 'x-pack/test/spaces_api_integration/common/fixtures/kbn_archiver/space_2.json',
dataUrl:
'x-pack/platform/test/spaces_api_integration/common/fixtures/kbn_archiver/space_2.json',
},
];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@ export function createTestSuiteFactory(esArchiver: any, supertest: SuperTest<any
describeFn(description, () => {
beforeEach(() =>
esArchiver.load(
'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
'x-pack/platform/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
)
);
afterEach(() =>
esArchiver.unload(
'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
'x-pack/platform/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
)
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,12 @@ export function deleteTestSuiteFactory(es: Client, esArchiver: any, supertest: S
describeFn(description, () => {
beforeEach(async () => {
await esArchiver.load(
'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
'x-pack/platform/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
);
});
afterEach(() =>
esArchiver.unload(
'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
'x-pack/platform/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
)
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ import type { Agent as SuperTestAgent } from 'supertest';
import type { LegacyUrlAlias } from '@kbn/core-saved-objects-base-server-internal';
import { MAIN_SAVED_OBJECT_INDEX } from '@kbn/core-saved-objects-server';
import expect from '@kbn/expect';
import { getUrlPrefix } from '@kbn/test-suites-xpack-platform/saved_object_api_integration/common/lib/saved_object_test_utils';

import { getUrlPrefix } from '../../../saved_object_api_integration/common/lib/saved_object_test_utils';
import type {
ExpectResponseBody,
TestDefinition,
TestSuite,
} from '@kbn/test-suites-xpack-platform/saved_object_api_integration/common/lib/types';

} from '../../../saved_object_api_integration/common/lib/types';
import { SPACES } from '../lib/spaces';

export interface DisableLegacyUrlAliasesTestDefinition extends TestDefinition {
Expand Down Expand Up @@ -105,12 +105,12 @@ export function disableLegacyUrlAliasesTestSuiteFactory(
describeFn(description, () => {
before(() =>
esArchiver.load(
'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
'x-pack/platform/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
)
);
after(() =>
esArchiver.unload(
'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
'x-pack/platform/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
)
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,12 @@ export function getTestSuiteFactory(esArchiver: any, supertest: SuperAgent<any>)
describeFn(description, () => {
before(() =>
esArchiver.load(
'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
'x-pack/platform/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
)
);
after(() =>
esArchiver.unload(
'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
'x-pack/platform/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
)
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,12 @@ export function getAllTestSuiteFactory(esArchiver: any, supertest: SuperTest<any
describeFn(description, () => {
before(() =>
esArchiver.load(
'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
'x-pack/platform/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
)
);
after(() =>
esArchiver.unload(
'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
'x-pack/platform/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
)
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ import type {
} from '@kbn/core/server';
import expect from '@kbn/expect';
import { deepFreeze } from '@kbn/std';

import {
expectResponses,
getUrlPrefix,
} from '@kbn/test-suites-xpack-platform/saved_object_api_integration/common/lib/saved_object_test_utils';
} from '../../../saved_object_api_integration/common/lib/saved_object_test_utils';
import type {
ExpectResponseBody,
TestDefinition,
TestSuite,
} from '@kbn/test-suites-xpack-platform/saved_object_api_integration/common/lib/types';

} from '../../../saved_object_api_integration/common/lib/types';
import { MULTI_NAMESPACE_SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
import { SPACES } from '../lib/spaces';

Expand Down Expand Up @@ -262,12 +262,12 @@ export function getShareableReferencesTestSuiteFactory(esArchiver: any, supertes
describeFn(description, () => {
before(() =>
esArchiver.load(
'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
'x-pack/platform/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
)
);
after(() =>
esArchiver.unload(
'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
'x-pack/platform/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
)
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,18 @@ const NON_EXISTENT_SPACE_ID = 'non_existent_space';
const SPACE_DATA_TO_LOAD: Array<{ spaceName: string | null; dataUrl: string }> = [
{
spaceName: null,
dataUrl: 'x-pack/test/spaces_api_integration/common/fixtures/kbn_archiver/default_space.json',
dataUrl:
'x-pack/platform/test/spaces_api_integration/common/fixtures/kbn_archiver/default_space.json',
},
{
spaceName: SPACE_1.id,
dataUrl: 'x-pack/test/spaces_api_integration/common/fixtures/kbn_archiver/space_1.json',
dataUrl:
'x-pack/platform/test/spaces_api_integration/common/fixtures/kbn_archiver/space_1.json',
},
{
spaceName: SPACE_2.id,
dataUrl: 'x-pack/test/spaces_api_integration/common/fixtures/kbn_archiver/space_2.json',
dataUrl:
'x-pack/platform/test/spaces_api_integration/common/fixtures/kbn_archiver/space_2.json',
},
];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ export function updateTestSuiteFactory(esArchiver: any, supertest: SuperTest<any
describeFn(description, () => {
before(() =>
esArchiver.load(
'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
'x-pack/platform/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
)
);
after(() =>
esArchiver.unload(
'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
'x-pack/platform/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
)
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ import type { SavedObjectsUpdateObjectsSpacesResponse } from '@kbn/core/server';
import { SavedObjectsErrorHelpers } from '@kbn/core/server';
import { ALL_SAVED_OBJECT_INDICES } from '@kbn/core-saved-objects-server';
import expect from '@kbn/expect';

import {
expectResponses,
getUrlPrefix,
} from '@kbn/test-suites-xpack-platform/saved_object_api_integration/common/lib/saved_object_test_utils';
} from '../../../saved_object_api_integration/common/lib/saved_object_test_utils';
import type {
ExpectResponseBody,
TestDefinition,
TestSuite,
} from '@kbn/test-suites-xpack-platform/saved_object_api_integration/common/lib/types';

} from '../../../saved_object_api_integration/common/lib/types';
import { SPACES } from '../lib/spaces';

export interface UpdateObjectsSpacesTestDefinition extends TestDefinition {
Expand Down Expand Up @@ -148,12 +148,12 @@ export function updateObjectsSpacesTestSuiteFactory(
describeFn(description, () => {
before(() =>
esArchiver.load(
'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
'x-pack/platform/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
)
);
after(() =>
esArchiver.unload(
'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
'x-pack/platform/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
)
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { AUTHENTICATION } from '../../../common/lib/authentication';
import { SPACES } from '../../../common/lib/spaces';
import { copyToSpaceTestSuiteFactory } from '../../../common/suites/copy_to_space';

// eslint-disable-next-line import/no-default-export
export default function copyToSpaceSpacesAndSecuritySuite(context: FtrProviderContext) {
const {
copyToSpaceTest,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import type { FtrProviderContext } from '../../../common/ftr_provider_context';
import { createUsersAndRoles } from '../../../common/lib/create_users_and_roles';

// eslint-disable-next-line import/no-default-export
export default function ({ loadTestFile, getService }: FtrProviderContext) {
const es = getService('es');
const supertest = getService('supertest');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { AUTHENTICATION } from '../../common/lib/authentication';
import { SPACES } from '../../common/lib/spaces';
import { createTestSuiteFactory } from '../../common/suites/create';

// eslint-disable-next-line import/no-default-export
export default function createSpacesOnlySuite({ getService }: FtrProviderContext) {
const supertestWithoutAuth = getService('supertestWithoutAuth');
const esArchiver = getService('esArchiver');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { AUTHENTICATION } from '../../common/lib/authentication';
import { SPACES } from '../../common/lib/spaces';
import { deleteTestSuiteFactory } from '../../common/suites/delete';

// eslint-disable-next-line import/no-default-export
export default function deleteSpaceTestSuite({ getService }: FtrProviderContext) {
const supertestWithoutAuth = getService('supertestWithoutAuth');
const esArchiver = getService('esArchiver');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
* 2.0.
*/

import { getTestScenarios } from '@kbn/test-suites-xpack-platform/saved_object_api_integration/common/lib/saved_object_test_utils';
import type { TestUser } from '@kbn/test-suites-xpack-platform/saved_object_api_integration/common/lib/types';

import { getTestScenarios } from '../../../saved_object_api_integration/common/lib/saved_object_test_utils';
import type { TestUser } from '../../../saved_object_api_integration/common/lib/types';
import type { FtrProviderContext } from '../../common/ftr_provider_context';
import { SPACES } from '../../common/lib/spaces';
import type { DisableLegacyUrlAliasesTestDefinition } from '../../common/suites/disable_legacy_url_aliases';
Expand All @@ -32,7 +31,6 @@ const createTestCases = () => {
};
};

// eslint-disable-next-line import/no-default-export
export default function ({ getService }: FtrProviderContext) {
const supertest = getService('supertestWithoutAuth');
const esArchiver = getService('esArchiver');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { AUTHENTICATION } from '../../common/lib/authentication';
import { SPACES } from '../../common/lib/spaces';
import { getTestSuiteFactory } from '../../common/suites/get';

// eslint-disable-next-line import/no-default-export
export default function getSpaceTestSuite({ getService }: FtrProviderContext) {
const supertestWithoutAuth = getService('supertestWithoutAuth');
const esArchiver = getService('esArchiver');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { AUTHENTICATION } from '../../common/lib/authentication';
import { SPACES } from '../../common/lib/spaces';
import { getAllTestSuiteFactory } from '../../common/suites/get_all';

// eslint-disable-next-line import/no-default-export
export default function getAllSpacesTestSuite({ getService }: FtrProviderContext) {
const supertestWithoutAuth = getService('supertestWithoutAuth');
const esArchiver = getService('esArchiver');
Expand Down
Loading