Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move saml-provider-plugin to packages #198184

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
185a09f
move saml-provider-plugin to packages/
dmlemeshko Oct 29, 2024
5e0c3fc
Merge branch 'main' into kbn-saml-provider-plugin
dmlemeshko Oct 29, 2024
afcf3a7
Merge branch 'main' into kbn-saml-provider-plugin
dmlemeshko Oct 29, 2024
4455e2d
[CI] Auto-commit changed files from 'node scripts/lint_ts_projects --…
kibanamachine Oct 29, 2024
b7f48d2
delete jest config, rename helpers folder
dmlemeshko Oct 30, 2024
2db0506
Merge branch 'main' into kbn-saml-provider-plugin
dmlemeshko Oct 30, 2024
fdecc59
remove explicit code owner for package
dmlemeshko Oct 30, 2024
00a5569
Merge branch 'main' into kbn-saml-provider-plugin
dmlemeshko Oct 30, 2024
f00f110
[CI] Auto-commit changed files from 'node scripts/build_plugin_list_d…
kibanamachine Oct 30, 2024
529934b
Update packages/kbn-saml-provider-plugin/kibana.jsonc
dmlemeshko Oct 30, 2024
6994338
Merge remote-tracking branch 'upstream/main' into kbn-saml-provider-p…
dmlemeshko Oct 30, 2024
804d7af
update exports and its usage
dmlemeshko Oct 30, 2024
fd9ee21
Update CODEOWNERS
dmlemeshko Oct 30, 2024
03329e5
[CI] Auto-commit changed files from 'node scripts/build_plugin_list_d…
kibanamachine Oct 30, 2024
c438081
fix config, move default metadata.xml to plugin root
dmlemeshko Oct 30, 2024
1acb40a
Merge branch 'kbn-saml-provider-plugin' of github.com:dmlemeshko/kiba…
dmlemeshko Oct 30, 2024
79e207a
remove devOnly
dmlemeshko Oct 30, 2024
fa72552
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Oct 30, 2024
1d5e7e1
cleanup
dmlemeshko Oct 30, 2024
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: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ packages/kbn-rule-data-utils @elastic/security-detections-response @elastic/resp
x-pack/plugins/rule_registry @elastic/response-ops @elastic/obs-ux-management-team
x-pack/plugins/runtime_fields @elastic/kibana-management
packages/kbn-safer-lodash-set @elastic/kibana-security
x-pack/test/security_api_integration/plugins/saml_provider @elastic/kibana-security
packages/kbn-saml-provider-plugin @elastic/kibana-security
Copy link
Member

Choose a reason for hiding this comment

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

Why not leave this to the jsonc file instead? ..and let the owners file be generated from the jsonc file

Copy link
Member Author

Choose a reason for hiding this comment

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

good point, removing

Copy link
Member

Choose a reason for hiding this comment

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

I thought we were removing this line? No?

Copy link
Member Author

Choose a reason for hiding this comment

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

it is auto-added by kibanamachine :)

x-pack/test/plugin_api_integration/plugins/sample_task_plugin @elastic/response-ops
x-pack/test/task_manager_claimer_update_by_query/plugins/sample_task_plugin_mget @elastic/response-ops
test/plugin_functional/plugins/saved_object_export_transforms @elastic/kibana-core
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,6 @@
"@kbn/rule-registry-plugin": "link:x-pack/plugins/rule_registry",
"@kbn/runtime-fields-plugin": "link:x-pack/plugins/runtime_fields",
"@kbn/safer-lodash-set": "link:packages/kbn-safer-lodash-set",
"@kbn/saml-provider-plugin": "link:x-pack/test/security_api_integration/plugins/saml_provider",
"@kbn/sample-task-plugin": "link:x-pack/test/plugin_api_integration/plugins/sample_task_plugin",
"@kbn/sample-task-plugin-update-by-query": "link:x-pack/test/task_manager_claimer_update_by_query/plugins/sample_task_plugin_mget",
"@kbn/saved-object-export-transforms-plugin": "link:test/plugin_functional/plugins/saved_object_export_transforms",
Expand Down Expand Up @@ -1469,6 +1468,7 @@
"@kbn/repo-path": "link:packages/kbn-repo-path",
"@kbn/repo-source-classifier": "link:packages/kbn-repo-source-classifier",
"@kbn/repo-source-classifier-cli": "link:packages/kbn-repo-source-classifier-cli",
"@kbn/saml-provider-plugin": "link:packages/kbn-saml-provider-plugin",
"@kbn/security-api-integration-helpers": "link:x-pack/test/security_api_integration/packages/helpers",
"@kbn/serverless-storybook-config": "link:packages/serverless/storybook/config",
"@kbn/some-dev-log": "link:packages/kbn-some-dev-log",
Expand Down
3 changes: 3 additions & 0 deletions packages/kbn-saml-provider-plugin/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# @kbn/saml-provider-plugin
Copy link
Member

Choose a reason for hiding this comment

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

question: is there any reason we put this plugin under packages/ and not under x-pack/packages/? Do we plan to use in any package or test outside of x-pack?

Copy link
Member Author

Choose a reason for hiding this comment

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

The new test framework will leave under packages/, it was the main reason to put this plugin in the same location. I also can't exclude feature rework in kbn-test / kbn-es in relation to this plugin test tools.

Copy link
Member

Choose a reason for hiding this comment

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

Got it, thanks for clarifying, makes sense to me 👍

Copy link
Member Author

Choose a reason for hiding this comment

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

updated in 804d7af


Saml provider plugin for testing purpose
Copy link
Member

Choose a reason for hiding this comment

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

Tip

Maybe we can name it slightly differently to be more consistent with the existing kbn-mock-idp-plugin: kbn-mock-test-idp-plugin or kbn-mock-idp-test-plugin or kbn-test-idp-plugin?

Feel free to ignore if it requires too much work to update all the affected files though.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm ok with changing it, better now than later 😄

Just to clarify: you think it is better to use idp in title over saml?

kbn-test-idp-plugin sounds good.

Copy link
Member

Choose a reason for hiding this comment

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

Just to clarify: you think it is better to use idp in title over saml?

Yeah, we have two packages that start with kbn-mock-idp-{plugin|test} and don't mention SAML, so I think it's fine to omit SAML.

Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
*/

import crypto from 'crypto';
Expand Down
21 changes: 21 additions & 0 deletions packages/kbn-saml-provider-plugin/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
*/

import path from 'path';

const resourcesPath = path.resolve(__dirname, 'resources');
export const saml1IdPMetadataPath = path.resolve(resourcesPath, 'idp_metadata.xml');
Copy link
Member

Choose a reason for hiding this comment

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

Tip

How about grouping this paths together?

export const IDP_METADATA_PATHS = {
    default: path.resolve(resourcesPath, 'metadata.xml'),
    saml1: path.resolve(resourcesPath, 'idp_metadata.xml'),
    saml2: path.resolve(resourcesPath, 'idp_metadata_2.xml'),
    neverLogin: path.resolve(resourcesPath, 'idp_metadata_never_login.xml'),
    mockIdpPlugin: ath.resolve(resourcesPath, 'idp_metadata_mock_idp.xml'),
};

Copy link
Member Author

Choose a reason for hiding this comment

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

Great suggestion, updated in 804d7af

export const saml2IdPMetadataPath = path.resolve(resourcesPath, 'idp_metadata_2.xml');
export const idpNeverLoginPath = path.resolve(resourcesPath, 'idp_metadata_never_login.xml');
export const mockIdPMetadataPath = path.resolve(resourcesPath, 'idp_metadata_mock_idp.xml');
export const pluginMetadataPath = path.resolve(resourcesPath, 'metadata.xml');

export const pluginPath = path.resolve(__dirname);

export * from './helpers/saml_tools';
Copy link
Member

Choose a reason for hiding this comment

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

Does this make it harder to use the IDE to see what * resolves to?
I know using the asterisk makes it easier at development time, but does it make it harder in maintenance?

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't have strong opinion here. I would like to hear @azasypkin thoughts on it as code owner.

Copy link
Member

Choose a reason for hiding this comment

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

Hmm, I don’t have a strong opinion either, and I’m not particularly concerned about the IDE itself. However, I’m slightly leaning towards explicit exports since it’s easier to see what we export and allows us to export only what we believe needs to be exported, making it easier to maintain.

Copy link
Member

Choose a reason for hiding this comment

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

yeah the maintenance bit is what worries me.

Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
"type": "plugin",
"id": "@kbn/saml-provider-plugin",
"owner": "@elastic/kibana-security",
"devOnly": true,
"plugin": {
"id": "samlProviderPlugin",
"server": true,
"browser": false,
"optionalPlugins": [
"cloud"
]
}
},
dmlemeshko marked this conversation as resolved.
Show resolved Hide resolved
}
6 changes: 6 additions & 0 deletions packages/kbn-saml-provider-plugin/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "@kbn/saml-provider-plugin",
"private": true,
"version": "1.0.0",
"license": "Elastic License 2.0 OR AGPL-3.0-only OR SSPL-1.0"
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
*/

import type { CloudSetup } from '@kbn/cloud-plugin/server';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
*/

import type { CoreSetup, PluginInitializerContext } from '@kbn/core/server';
import {
getSAMLRequestId,
getSAMLResponse,
} from '@kbn/security-api-integration-helpers/saml/saml_tools';
import { getSAMLRequestId, getSAMLResponse } from '../helpers/saml_tools';

import type { PluginSetupDependencies } from '.';

Expand Down
21 changes: 21 additions & 0 deletions packages/kbn-saml-provider-plugin/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "target/types",
"types": [
"jest",
"node"
]
},
"include": [
"**/*.ts",
],
"exclude": [
"target/**/*"
],
"kbn_references": [
"@kbn/dev-utils",
"@kbn/cloud-plugin",
"@kbn/core",
]
}
4 changes: 2 additions & 2 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -1480,8 +1480,8 @@
"@kbn/runtime-fields-plugin/*": ["x-pack/plugins/runtime_fields/*"],
"@kbn/safer-lodash-set": ["packages/kbn-safer-lodash-set"],
"@kbn/safer-lodash-set/*": ["packages/kbn-safer-lodash-set/*"],
"@kbn/saml-provider-plugin": ["x-pack/test/security_api_integration/plugins/saml_provider"],
"@kbn/saml-provider-plugin/*": ["x-pack/test/security_api_integration/plugins/saml_provider/*"],
"@kbn/saml-provider-plugin": ["packages/kbn-saml-provider-plugin"],
"@kbn/saml-provider-plugin/*": ["packages/kbn-saml-provider-plugin/*"],
"@kbn/sample-task-plugin": ["x-pack/test/plugin_api_integration/plugins/sample_task_plugin"],
"@kbn/sample-task-plugin/*": ["x-pack/test/plugin_api_integration/plugins/sample_task_plugin/*"],
"@kbn/sample-task-plugin-update-by-query": ["x-pack/test/task_manager_claimer_update_by_query/plugins/sample_task_plugin_mget"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ import {
import path from 'path';
import { REPO_ROOT } from '@kbn/repo-info';
import { STATEFUL_ROLES_ROOT_PATH } from '@kbn/es';
import {
mockIdPMetadataPath as idpPath,
pluginPath as samlIdPPlugin,
} from '@kbn/saml-provider-plugin';
import { dockerImage } from '../../../fleet_api_integration/config.base';
import { DeploymentAgnosticCommonServices, services } from '../services';

Expand Down Expand Up @@ -61,15 +65,6 @@ export function createStatefulTestConfig<T extends DeploymentAgnosticCommonServi

const xPackAPITestsConfig = await readConfigFile(require.resolve('../../config.ts'));

// TODO: move to kbn-es because currently metadata file has hardcoded entityID and Location
const idpPath = require.resolve(
'@kbn/security-api-integration-helpers/saml/idp_metadata_mock_idp.xml'
);
const samlIdPPlugin = path.resolve(
__dirname,
'../../../security_api_integration/plugins/saml_provider'
);

const servers = {
kibana: {
...kbnTestConfig.getUrlParts(systemIndicesSuperuser),
Expand Down
6 changes: 4 additions & 2 deletions x-pack/test/cloud_integration/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@

import { resolve } from 'path';
import { FtrConfigProviderContext } from '@kbn/test';
import {
pluginMetadataPath as idpPath,
pluginPath as samlIdPPlugin,
} from '@kbn/saml-provider-plugin';
import { services } from '../functional/services';
import { pageObjects } from '../functional/page_objects';

Expand All @@ -25,8 +29,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
);

const kibanaPort = kibanaFunctionalConfig.get('servers.kibana.port');
const idpPath = resolve(__dirname, './plugins/saml_provider/metadata.xml');
const samlIdPPlugin = resolve(__dirname, './plugins/saml_provider');

return {
testFiles: [...(RUN_FULLSTORY_TESTS ? [resolve(__dirname, './tests/fullstory')] : [])],
Expand Down
11 changes: 5 additions & 6 deletions x-pack/test/functional_cloud/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,17 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import { resolve } from 'path';

import { FtrConfigProviderContext } from '@kbn/test';
import {
pluginMetadataPath as idpPath,
pluginPath as samlIdPPlugin,
} from '@kbn/saml-provider-plugin';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(require.resolve('../functional/config.base.js'));

const kibanaPort = functionalConfig.get('servers.kibana.port');
const idpPath = resolve(
__dirname,
'../security_api_integration/plugins/saml_provider/metadata.xml'
);
const samlIdPPlugin = resolve(__dirname, '../security_api_integration/plugins/saml_provider');

return {
...functionalConfig.getAll(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { readFileSync } from 'fs';
import { resolve } from 'path';

import { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils';
import { saml1IdPMetadataPath, saml2IdPMetadataPath } from '@kbn/saml-provider-plugin';
import type { FtrConfigProviderContext } from '@kbn/test';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
Expand All @@ -32,13 +33,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
'@kbn/security-api-integration-helpers/pki/kibana_ca.crt'
);

const saml1IdPMetadataPath = require.resolve(
'@kbn/security-api-integration-helpers/saml/idp_metadata.xml'
);
const saml2IdPMetadataPath = require.resolve(
'@kbn/security-api-integration-helpers/saml/idp_metadata_2.xml'
);

const servers = {
...xPackAPITestsConfig.get('servers'),
elasticsearch: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,5 @@
"target/**/*"
],
"kbn_references": [
"@kbn/dev-utils",
]
}

This file was deleted.

2 changes: 1 addition & 1 deletion x-pack/test/security_api_integration/saml.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import { resolve } from 'path';

import { saml1IdPMetadataPath as idpPath } from '@kbn/saml-provider-plugin';
import type { FtrConfigProviderContext } from '@kbn/test';

import { services } from './services';
Expand All @@ -15,7 +16,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config.ts'));

const kibanaPort = xPackAPITestsConfig.get('servers.kibana.port');
const idpPath = require.resolve('@kbn/security-api-integration-helpers/saml/idp_metadata.xml');

const testEndpointsPlugin = resolve(__dirname, '../security_functional/plugins/test_endpoints');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/

import { CA_CERT_PATH } from '@kbn/dev-utils';
import { saml1IdPMetadataPath as idpPath } from '@kbn/saml-provider-plugin';
import type { FtrConfigProviderContext } from '@kbn/test';
import { configureHTTP2 } from '@kbn/test-suites-src/common/configure_http2';

Expand All @@ -14,7 +15,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(require.resolve('./saml.config'));

const kibanaPort = xPackAPITestsConfig.get('servers.kibana.port');
const idpPath = require.resolve('@kbn/security-api-integration-helpers/saml/idp_metadata.xml');

return configureHTTP2({
...functionalConfig.getAll(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* 2.0.
*/

import { saml1IdPMetadataPath as idpPath } from '@kbn/saml-provider-plugin';
import type { FtrConfigProviderContext } from '@kbn/test';

import { services } from './services';
Expand All @@ -13,7 +14,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config.ts'));

const kibanaPort = xPackAPITestsConfig.get('servers.kibana.port');
const idpPath = require.resolve('@kbn/security-api-integration-helpers/saml/idp_metadata.xml');

return {
testFiles: [require.resolve('./tests/saml_cloud')],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import { resolve } from 'path';

import { saml1IdPMetadataPath as idpPath } from '@kbn/saml-provider-plugin';
import type { FtrConfigProviderContext } from '@kbn/test';

import { services } from './services';
Expand All @@ -17,7 +18,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config.ts'));

const kibanaPort = xPackAPITestsConfig.get('servers.kibana.port');
const idpPath = require.resolve('@kbn/security-api-integration-helpers/saml/idp_metadata.xml');

const testEndpointsPlugin = resolve(__dirname, '../security_functional/plugins/test_endpoints');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import { resolve } from 'path';

import { saml1IdPMetadataPath as idpPath } from '@kbn/saml-provider-plugin';
import type { FtrConfigProviderContext } from '@kbn/test';

import { services } from './services';
Expand All @@ -17,7 +18,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config.ts'));

const kibanaPort = xPackAPITestsConfig.get('servers.kibana.port');
const idpPath = require.resolve('@kbn/security-api-integration-helpers/saml/idp_metadata.xml');

const testEndpointsPlugin = resolve(__dirname, '../security_functional/plugins/test_endpoints');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import { resolve } from 'path';

import { saml1IdPMetadataPath as idpPath } from '@kbn/saml-provider-plugin';
import type { FtrConfigProviderContext } from '@kbn/test';

import { services } from './services';
Expand All @@ -17,7 +18,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config.ts'));

const kibanaPort = xPackAPITestsConfig.get('servers.kibana.port');
const idpPath = require.resolve('@kbn/security-api-integration-helpers/saml/idp_metadata.xml');

return {
testFiles: [resolve(__dirname, './tests/session_invalidate')],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import { resolve } from 'path';

import { saml1IdPMetadataPath as idpPath } from '@kbn/saml-provider-plugin';
import type { FtrConfigProviderContext } from '@kbn/test';

import { services } from './services';
Expand All @@ -17,7 +18,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config.ts'));

const kibanaPort = xPackAPITestsConfig.get('servers.kibana.port');
const idpPath = require.resolve('@kbn/security-api-integration-helpers/saml/idp_metadata.xml');

return {
testFiles: [resolve(__dirname, './tests/session_lifespan')],
Expand Down
Loading