Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
e8088b8
Moved tests to agnostic setup
elena-shostak Nov 13, 2024
41dfba2
wip
elena-shostak Nov 18, 2024
e463d1f
Fixes
elena-shostak Nov 18, 2024
f9d1d70
Fixes
elena-shostak Nov 18, 2024
b2b4847
fixes
elena-shostak Nov 18, 2024
a20cb07
Fixes
elena-shostak Nov 18, 2024
9d8b9a9
fixes
elena-shostak Nov 19, 2024
daec53f
cleaned up apm_user
elena-shostak Nov 19, 2024
111b4b3
basic license - discuss with the team
elena-shostak Nov 19, 2024
9190e14
SO types change
elena-shostak Nov 21, 2024
28ba05a
wip
elena-shostak Nov 22, 2024
e6b4563
Tests
elena-shostak Dec 2, 2024
0db0033
wip
elena-shostak Dec 23, 2024
c771a11
wip
elena-shostak Dec 27, 2024
0e19cd1
Test fixes
elena-shostak Dec 27, 2024
cac3073
Fixes
elena-shostak Dec 27, 2024
5df6357
Fixes
elena-shostak Dec 30, 2024
e9c6a36
get_shareable_references test fix
elena-shostak Dec 30, 2024
b892778
wip
elena-shostak Dec 30, 2024
d0bd5d6
update_objects_spaces and disable_legacy_url_aliases tests
elena-shostak Dec 31, 2024
99c18fb
Fixes
elena-shostak Jan 3, 2025
24c1548
Added waitFor for delete test
elena-shostak Jan 3, 2025
dda347d
Fixes
elena-shostak Jan 3, 2025
f089b02
Fixes
elena-shostak Jan 3, 2025
008ed23
Lint fix
elena-shostak Jan 3, 2025
0e6c69c
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Jan 3, 2025
6e362b3
Fixup
elena-shostak Jan 3, 2025
c7c91eb
Serverless config
elena-shostak Jan 3, 2025
9cd8a5d
Fixes
elena-shostak Jan 6, 2025
8206419
Fixes
elena-shostak Jan 6, 2025
f289e05
Fixes
elena-shostak Jan 6, 2025
670e1d1
Service fix
elena-shostak Jan 6, 2025
703f1e5
Fixes
elena-shostak Jan 7, 2025
094aaee
Fixes
elena-shostak Jan 17, 2025
23bc295
Added skipInMKI tag and dropped unnecessary builtin roles from check
elena-shostak Jan 21, 2025
12a11e9
copy_to_space serverless config
elena-shostak Jan 21, 2025
2064f15
Fix
elena-shostak Jan 21, 2025
2bd07ce
Fixes
elena-shostak Jan 21, 2025
dc6a47c
Merge branch 'main' into space-deployment-agnostic
elasticmachine Jan 23, 2025
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
2 changes: 0 additions & 2 deletions .buildkite/ftr_platform_stateful_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -343,9 +343,7 @@ enabled:
- 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/test/task_manager_claimer_update_by_query/config.ts
- x-pack/test/ui_capabilities/security_and_spaces/config.ts
Expand Down
2 changes: 2 additions & 0 deletions .buildkite/ftr_security_serverless_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,3 +126,5 @@ enabled:
- x-pack/test/security_solution_endpoint/configs/serverless.integrations.config.ts
# serverless config files that run deployment-agnostic tests
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/security.serverless.config.ts
- x-pack/test/spaces_api_integration/deployment_agnostic/security_and_spaces/serverless.config.ts
- x-pack/test/spaces_api_integration/deployment_agnostic/security_and_spaces/serverless.copy_to_space.config.ts
5 changes: 5 additions & 0 deletions .buildkite/ftr_security_stateful_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,8 @@ enabled:
- x-pack/test/automatic_import_api_integration/apis/config_basic.ts
- x-pack/test/automatic_import_api_integration/apis/config_graphs.ts
- x-pack/test/security_solution_api_integration/test_suites/asset_inventory/entity_store/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/spaces_api_integration/deployment_agnostic/spaces_only/config.ts
- x-pack/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.config_basic.ts
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we discussed it with @azasypkin and @jeramysoucy , that while basic license is stateful-only, these tests cannot be considered deployment-agnostic. wdyt?

Copy link
Copy Markdown
Contributor Author

@elena-shostak elena-shostak Jan 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can move them out of the deployment_agnostic folder to eliminate confusion, but all those tests still use the same test suite the serverless/trial config does

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC, we determined in our meeting last week that it did not make sense to try to split these tests out due to how these test suites are structured. Please correct me if I am wrong.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct, I think the comment is only regarding the config location. IMHO makes sense to leave as is since it references the same suite

- x-pack/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.config_trial.ts
- x-pack/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.copy_to_space.config_trial.ts
- x-pack/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.copy_to_space.config_basic.ts
1 change: 1 addition & 0 deletions packages/kbn-es/src/stateful_resources/roles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,4 @@ system_indices_superuser:
privileges: ['*']
resources: ['*']
run_as: ['*']

6 changes: 6 additions & 0 deletions src/dev/eslint/types.eslint.config.template.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,11 @@ module.exports = {
'@typescript-eslint/no-floating-promises': 'error',
},
},
{
files: ['*spaces_api_integration/common/services/basic_auth_supertest.ts'],
Copy link
Copy Markdown
Contributor Author

@elena-shostak elena-shostak Jan 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agent.auth(this.user.username!, this.user.password!);

Needed to suppress the eslint error for this line in our custom test service, the promise is awaited in the tests itself and adding a catch block breaks some of the test cases

eslint-disable line gets removed because this rule runs dynamically

rules: {
'@typescript-eslint/no-floating-promises': 'off',
},
},
],
};
4 changes: 4 additions & 0 deletions x-pack/test/spaces_api_integration/common/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import path from 'path';
import { REPO_ROOT } from '@kbn/repo-info';
import type { FtrConfigProviderContext } from '@kbn/test';

import { services } from './services';

interface CreateTestConfigOptions {
license: string;
disabledPlugins?: string[];
Expand Down Expand Up @@ -45,6 +47,8 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
kibanaServer: config.kibana.functional.get('services.kibanaServer'),
spaces: config.xpack.api.get('services.spaces'),
usageAPI: config.xpack.api.get('services.usageAPI'),
roleScopedSupertest: services.roleScopedSupertest,
samlAuth: () => {},
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this here?

Suggested change
samlAuth: () => {},

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we use samlAuth in our service. Otherwise we would need to suppress type errors in our service. Instead of that just passed a noop function

},
junit: {
reportName: 'X-Pack Spaces API Integration Tests -- ' + name,
Expand Down
Loading