diff --git a/.buildkite/scripts/pipelines/pull_request/pipeline.ts b/.buildkite/scripts/pipelines/pull_request/pipeline.ts index d87c72b94209e..d7dc166f3b8a1 100644 --- a/.buildkite/scripts/pipelines/pull_request/pipeline.ts +++ b/.buildkite/scripts/pipelines/pull_request/pipeline.ts @@ -245,8 +245,8 @@ const getPipeline = (filename: string, removeSteps = true) => { /^x-pack\/plugins\/lists/, /^x-pack\/plugins\/rule_registry\/common/, /^x-pack\/solutions\/security\/plugins\/security_solution/, - /^x-pack\/solutions\/security\/solutions\/security\/plugins\/security_solution_ess/, - /^x-pack\/solutions\/security\/solutions\/security\/plugins\/security_solution_serverless/, + /^x-pack\/solutions\/security\/plugins\/security_solution_ess/, + /^x-pack\/solutions\/security\/plugins\/security_solution_serverless/, /^x-pack\/plugins\/task_manager/, /^x-pack\/solutions\/security\/plugins\/timelines/, /^x-pack\/plugins\/triggers_actions_ui\/public\/application\/sections\/action_connector_form/, @@ -255,7 +255,7 @@ const getPipeline = (filename: string, removeSteps = true) => { /^x-pack\/plugins\/triggers_actions_ui\/server\/connector_types\/bedrock/, /^x-pack\/plugins\/usage_collection\/public/, /^x-pack\/solutions\/security\/plugins\/elastic_assistant/, - /^x-pack\/packages\/security-solution/, + /^x-pack\/solutions\/security\/packages/, /^x-pack\/platform\/packages\/shared\/kbn-elastic-assistant/, /^x-pack\/platform\/packages\/shared\/kbn-elastic-assistant-common/, /^x-pack\/test\/functional\/es_archives\/security_solution/, @@ -290,7 +290,6 @@ const getPipeline = (filename: string, removeSteps = true) => { /^packages\/kbn-es-query/, /^packages\/kbn-i18n/, /^packages\/kbn-i18n-react/, - /^x-pack\/solutions\/security\/packages\/expandable-flyout/, /^packages\/kbn-grouping/, /^packages\/kbn-resizable-layout/, /^packages\/kbn-rison/, @@ -323,7 +322,7 @@ const getPipeline = (filename: string, removeSteps = true) => { /^src\/plugins\/unified_search/, /^x-pack\/platform\/packages\/shared\/kbn-elastic-assistant/, /^x-pack\/platform\/packages\/shared\/kbn-elastic-assistant-common/, - /^x-pack\/packages\/security-solution/, + /^x-pack\/solutions\/security\/packages/, /^x-pack\/plugins\/alerting/, /^x-pack\/plugins\/cases/, /^x-pack\/plugins\/data_views\/common/, @@ -331,8 +330,8 @@ const getPipeline = (filename: string, removeSteps = true) => { /^x-pack\/plugins\/lists/, /^x-pack\/plugins\/rule_registry\/common/, /^x-pack\/solutions\/security\/plugins\/security_solution/, - /^x-pack\/solutions\/security\/solutions\/security\/plugins\/security_solution_ess/, - /^x-pack\/solutions\/security\/solutions\/security\/plugins\/security_solution_serverless/, + /^x-pack\/solutions\/security\/plugins\/security_solution_ess/, + /^x-pack\/solutions\/security\/plugins\/security_solution_serverless/, /^x-pack\/plugins\/task_manager/, /^x-pack\/solutions\/security\/plugins\/threat_intelligence/, /^x-pack\/solutions\/security\/plugins\/timelines/, diff --git a/packages/kbn-alerts-grouping/src/components/alerts_grouping.test.tsx b/packages/kbn-alerts-grouping/src/components/alerts_grouping.test.tsx index 0137953b2313c..14efad8dbddc2 100644 --- a/packages/kbn-alerts-grouping/src/components/alerts_grouping.test.tsx +++ b/packages/kbn-alerts-grouping/src/components/alerts_grouping.test.tsx @@ -8,7 +8,7 @@ */ /** - * Adapted from x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_grouping.test.tsx + * Adapted from x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/alerts_grouping.test.tsx */ import React from 'react'; import { render, within, screen } from '@testing-library/react'; diff --git a/packages/kbn-babel-preset/styled_components_files.js b/packages/kbn-babel-preset/styled_components_files.js index 2e277085e53ad..009c2b21e4239 100644 --- a/packages/kbn-babel-preset/styled_components_files.js +++ b/packages/kbn-babel-preset/styled_components_files.js @@ -21,6 +21,7 @@ module.exports = { /x-pack[\/\\]test[\/\\]plugin_functional[\/\\]plugins[\/\\]resolver_test[\/\\]/, /x-pack[\/\\]packages[\/\\]elastic_assistant[\/\\]/, /x-pack[\/\\]solutions[\/\\]security[\/\\]packages[\/\\]ecs_data_quality_dashboard[\/\\]/, + /x-pack[\/\\]solutions[\/\\]security[\/\\]plugins[\/\\]security_solution[\/\\]/, /x-pack[\/\\]platform[\/\\]packages[\/\\]shared[\/\\]kbn-elastic-assistant[\/\\]/, ], }; diff --git a/x-pack/plugins/fleet/package.json b/x-pack/plugins/fleet/package.json index dc0bc6a6bcacb..01d104008b782 100644 --- a/x-pack/plugins/fleet/package.json +++ b/x-pack/plugins/fleet/package.json @@ -5,14 +5,14 @@ "private": true, "license": "Elastic License 2.0", "scripts": { - "cypress_space_awareness": "NODE_OPTIONS=--openssl-legacy-provider node ../security_solution/scripts/start_cypress_parallel --config-file ../fleet/cypress.config.space_awareness.ts --ftr-config-file ../../../x-pack/test/fleet_cypress/cli_config.space_awareness", + "cypress_space_awareness": "NODE_OPTIONS=--openssl-legacy-provider node ../../solutions/security/plugins/security_solution/scripts/start_cypress_parallel --config-file ../../plugins/fleet/cypress.config.space_awareness.ts --ftr-config-file ../../../x-pack/test/fleet_cypress/cli_config.space_awareness", "cypress_space_awareness:open": "yarn cypress_space_awareness open", "cypress_space_awareness:run": "yarn cypress_space_awareness run", "cypress_space_awareness:run:reporter": "yarn cypress_space_awareness run --reporter ../../../node_modules/cypress-multi-reporters --reporter-options configFile=../fleet/cypress/reporter_config.json", - "cypress": "NODE_OPTIONS=--openssl-legacy-provider node ../security_solution/scripts/start_cypress_parallel --config-file ../fleet/cypress.config.ts --ftr-config-file ../../../x-pack/test/fleet_cypress/cli_config", + "cypress": "NODE_OPTIONS=--openssl-legacy-provider node ../../solutions/security/plugins/security_solution/scripts/start_cypress_parallel --config-file ../../plugins/fleet/cypress.config.ts --ftr-config-file ../../../x-pack/test/fleet_cypress/cli_config", "cypress:open": "yarn cypress open", "cypress:run": "yarn cypress run", - "cypress:run:reporter": "yarn cypress run --reporter ../../../node_modules/cypress-multi-reporters --reporter-options configFile=../fleet/cypress/reporter_config.json", + "cypress:run:reporter": "yarn cypress run --reporter ../../../node_modules/cypress-multi-reporters --reporter-options configFile=cypress/reporter_config.json", "junit:merge": "../../../node_modules/.bin/mochawesome-merge ../../../target/kibana-fleet/cypress/results/mochawesome*.json > ../../../target/kibana-fleet/cypress/results/output.json && ../../../node_modules/.bin/marge ../../../target/kibana-fleet/cypress/results/output.json --reportDir ../../../target/kibana-fleet/cypress/results && mkdir -p ../../../target/junit && cp ../../../target/kibana-fleet/cypress/results/*.xml ../../../target/junit/", "openapi:build": "npx @redocly/openapi-cli bundle --ext yaml --output ./common/openapi/bundled.yaml ./common/openapi/entrypoint.yaml && npx @redocly/openapi-cli bundle --ext json --output ./common/openapi/bundled.json ./common/openapi/entrypoint.yaml", "openapi:lint": "npx @redocly/cli lint ./common/openapi/bundled.yaml", diff --git a/x-pack/solutions/security/plugins/security_solution/package.json b/x-pack/solutions/security/plugins/security_solution/package.json index 7fc09f717cd24..bfc764649ab81 100644 --- a/x-pack/solutions/security/plugins/security_solution/package.json +++ b/x-pack/solutions/security/plugins/security_solution/package.json @@ -10,13 +10,13 @@ "cypress": "NODE_OPTIONS=--openssl-legacy-provider ../../../../../node_modules/.bin/cypress", "cypress:burn": "yarn cypress:dw run --env burn=2 --headed", "cypress:changed-specs-only": "yarn cypress:dw run --changed-specs-only --env burn=2", - "cypress:dw": "NODE_OPTIONS=--openssl-legacy-provider node ./scripts/start_cypress_parallel --config-file ./public/management/cypress/cypress.config.ts --ftr-config-file ../../../../test/defend_workflows_cypress/cli_config", + "cypress:dw": "NODE_OPTIONS=--openssl-legacy-provider node ./scripts/start_cypress_parallel --config-file plugins/security_solution/public/management/cypress/cypress.config.ts --ftr-config-file ../../../../test/defend_workflows_cypress/cli_config", "cypress:dw:open": "yarn cypress:dw open", "cypress:dw:run": "yarn cypress:dw run", - "cypress:dw:serverless": "NODE_OPTIONS=--openssl-legacy-provider node ./scripts/start_cypress_parallel --config-file ./public/management/cypress/cypress_serverless.config.ts --ftr-config-file ../../../../test/defend_workflows_cypress/serverless_config", + "cypress:dw:serverless": "NODE_OPTIONS=--openssl-legacy-provider node ./scripts/start_cypress_parallel --config-file plugins/security_solution/public/management/cypress/cypress_serverless.config.ts --ftr-config-file ../../../../test/defend_workflows_cypress/serverless_config", "cypress:dw:serverless:open": "yarn cypress:dw:serverless open", "cypress:dw:serverless:run": "yarn cypress:dw:serverless run", - "cypress:dw:qa:serverless": "NODE_OPTIONS=--openssl-legacy-provider node ./scripts/start_cypress_parallel_serverless --config-file ./public/management/cypress/cypress_serverless_qa.config.ts", + "cypress:dw:qa:serverless": "NODE_OPTIONS=--openssl-legacy-provider node ./scripts/start_cypress_parallel_serverless --config-file plugins/security_solution/public/management/cypress/cypress_serverless_qa.config.ts", "cypress:dw:qa:serverless:run": "yarn cypress:dw:qa:serverless run", "cypress:dw:serverless:changed-specs-only": "yarn cypress:dw:serverless run --changed-specs-only --env burn=2", "cypress:dw:endpoint": "echo '\n** WARNING **: Run script `cypress:dw:endpoint` no longer valid! Use `cypress:dw` instead\n'", @@ -36,4 +36,4 @@ "openapi:bundle:entity-analytics": "node scripts/openapi/bundle_entity_analytics", "openapi:bundle:endpoint-management": "node scripts/openapi/bundle_endpoint_management" } -} \ No newline at end of file +} diff --git a/x-pack/solutions/security/plugins/security_solution/public/common/components/toasters/index.tsx b/x-pack/solutions/security/plugins/security_solution/public/common/components/toasters/index.tsx index cc02c6a5eb745..28d506ac178c6 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/common/components/toasters/index.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/common/components/toasters/index.tsx @@ -19,7 +19,7 @@ export * from './utils'; export * from './errors'; /** - * @deprecated Use x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead + * @deprecated Use x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead */ export interface AppToast extends Toast { // FunFact: In a very rare case of errors this can be something other than array. We have a unit test case for it and am leaving it like this type for now. @@ -27,21 +27,21 @@ export interface AppToast extends Toast { } /** - * @deprecated Use x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead + * @deprecated Use x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead */ interface ToastState { toasts: AppToast[]; } /** - * @deprecated Use x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead + * @deprecated Use x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead */ const initialToasterState: ToastState = { toasts: [], }; /** - * @deprecated Use x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead + * @deprecated Use x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead */ export type ActionToaster = | { type: 'addToaster'; toast: AppToast } @@ -49,7 +49,7 @@ export type ActionToaster = | { type: 'toggleWaitToShowNextToast' }; /** - * @deprecated Use x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead + * @deprecated Use x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead */ export const StateToasterContext = createContext<[ToastState, Dispatch]>([ initialToasterState, @@ -57,19 +57,19 @@ export const StateToasterContext = createContext<[ToastState, Dispatch useContext(StateToasterContext); /** - * @deprecated Use x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead + * @deprecated Use x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead */ interface ManageGlobalToasterProps { children: React.ReactNode; } /** - * @deprecated Use x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead + * @deprecated Use x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead */ export const ManageGlobalToaster = ({ children }: ManageGlobalToasterProps) => { const reducerToaster = (state: ToastState, action: ActionToaster) => { @@ -91,7 +91,7 @@ export const ManageGlobalToaster = ({ children }: ManageGlobalToasterProps) => { }; /** - * @deprecated Use x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead + * @deprecated Use x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead */ const GlobalToasterListContainer = styled.div` position: absolute; @@ -100,14 +100,14 @@ const GlobalToasterListContainer = styled.div` `; /** - * @deprecated Use x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead + * @deprecated Use x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead */ interface GlobalToasterProps { toastLifeTimeMs?: number; } /** - * @deprecated Use x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead + * @deprecated Use x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead */ export const GlobalToaster = ({ toastLifeTimeMs = 5000 }: GlobalToasterProps) => { const [{ toasts }, dispatch] = useStateToaster(); @@ -145,7 +145,7 @@ export const GlobalToaster = ({ toastLifeTimeMs = 5000 }: GlobalToasterProps) => }; /** - * @deprecated Use x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead + * @deprecated Use x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead */ const formatToErrorToastIfNeeded = ( toast: AppToast, @@ -169,13 +169,13 @@ const formatToErrorToastIfNeeded = ( }; /** - * @deprecated Use x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead + * @deprecated Use x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead */ const ErrorToastContainer = styled.div` text-align: right; `; /** - * @deprecated Use x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead + * @deprecated Use x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead */ ErrorToastContainer.displayName = 'ErrorToastContainer'; diff --git a/x-pack/solutions/security/plugins/security_solution/public/common/components/toasters/modal_all_errors.tsx b/x-pack/solutions/security/plugins/security_solution/public/common/components/toasters/modal_all_errors.tsx index da19968971ec9..1199a361a98a7 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/common/components/toasters/modal_all_errors.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/common/components/toasters/modal_all_errors.tsx @@ -24,7 +24,7 @@ import type { AppToast } from '.'; import * as i18n from './translations'; /** - * @deprecated Use x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead + * @deprecated Use x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead */ interface FullErrorProps { isShowing: boolean; @@ -33,7 +33,7 @@ interface FullErrorProps { } /** - * @deprecated Use x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead + * @deprecated Use x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead */ const ModalAllErrorsComponent: React.FC = ({ isShowing, toast, toggle }) => { const handleClose = useCallback(() => toggle(toast), [toggle, toast]); @@ -73,18 +73,18 @@ const ModalAllErrorsComponent: React.FC = ({ isShowing, toast, t }; /** - * @deprecated Use x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead + * @deprecated Use x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead */ export const ModalAllErrors = React.memo(ModalAllErrorsComponent); /** - * @deprecated Use x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead + * @deprecated Use x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead */ const MyEuiCodeBlock = styled(EuiCodeBlock)` margin-top: 4px; `; /** - * @deprecated Use x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead + * @deprecated Use x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_app_toasts.ts instead */ MyEuiCodeBlock.displayName = 'MyEuiCodeBlock'; diff --git a/x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_resolve_conflict.tsx b/x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_resolve_conflict.tsx index c73b21c3b8418..fd148cf259786 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_resolve_conflict.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/common/hooks/use_resolve_conflict.tsx @@ -18,14 +18,8 @@ import { useKibana } from '../lib/kibana'; import { URL_PARAM_KEY } from './use_url_state'; /** - * Unfortunately the url change initiated when clicking the button to otherObjectPath doesn't seem to be - * respected by the useSetInitialStateFromUrl here: x-pack/plugins/security_solution/public/common/components/url_state/initialize_redux_by_url.tsx - * - * FYI: It looks like the routing causes replaceStateInLocation to be called instead: - * x-pack/plugins/security_solution/public/common/components/url_state/helpers.ts - * * Potentially why the markdown component needs a click handler as well for timeline? - * see: /x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/timeline/processor.tsx + * see: x-pack/solutions/security/plugins/security_solution/public/common/components/markdown_editor/plugins/timeline/processor.tsx */ export const useResolveConflict = () => { const { search, pathname } = useLocation(); diff --git a/x-pack/solutions/security/plugins/security_solution/public/detections/pages/alerts/alert_details_redirect.tsx b/x-pack/solutions/security/plugins/security_solution/public/detections/pages/alerts/alert_details_redirect.tsx index 01e52d3ab7505..537da69e74255 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detections/pages/alerts/alert_details_redirect.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/detections/pages/alerts/alert_details_redirect.tsx @@ -26,7 +26,7 @@ export const AlertDetailsRedirect = () => { const timestamp = searchParams.get('timestamp'); // Although we use the 'default' space here when an index isn't provided or accidentally deleted // It's a safe catch all as we reset the '.internal.alerts-*` indices with the correct space in the flyout - // Here: x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/helpers.tsx + // Here: x-pack/solutions/security/plugins/security_solution/public/timelines/components/side_panel/event_details/helpers.tsx const index = searchParams.get('index') ?? `.internal${DEFAULT_ALERTS_INDEX}-default`; const getInputSelector = useMemo(() => inputsSelectors.inputsSelector(), []); diff --git a/x-pack/solutions/security/plugins/security_solution/public/exceptions/hooks/use_exceptions_list.card/index.tsx b/x-pack/solutions/security/plugins/security_solution/public/exceptions/hooks/use_exceptions_list.card/index.tsx index 82440e478edcd..e56d31f24fbcb 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/exceptions/hooks/use_exceptions_list.card/index.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/exceptions/hooks/use_exceptions_list.card/index.tsx @@ -259,8 +259,8 @@ export const useExceptionsListCard = ({ ] ); - // routes to x-pack/plugins/security_solution/public/exceptions/routes.tsx - // details component is here: x-pack/plugins/security_solution/public/exceptions/pages/list_detail_view/index.tsx + // routes to x-pack/solutions/security/plugins/security_solution/public/exceptions/routes.tsx + // details component is here: x-pack/solutions/security/plugins/security_solution/public/exceptions/pages/list_detail_view/index.tsx const { onClick: goToExceptionDetail } = useGetSecuritySolutionLinkProps()({ deepLinkId: SecurityPageName.exceptions, path: `/details/${exceptionsList.list_id}`, diff --git a/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details/shared/utils.tsx b/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details/shared/utils.tsx index 9953fa0fbbfb1..e200519184b53 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details/shared/utils.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details/shared/utils.tsx @@ -9,7 +9,7 @@ import { startCase } from 'lodash'; import type { GetFieldsData } from './hooks/use_get_fields_data'; /** - * Helper function to retrieve a field's value (used in combination with the custom hook useGetFieldsData (https://github.com/elastic/kibana/blob/main/x-pack/plugins/security_solution/public/common/hooks/use_get_fields_data.ts) + * Helper function to retrieve a field's value (used in combination with the custom hook useGetFieldsData (x-pack/solutions/security/plugins/security_solution/public/flyout/document_details/shared/hooks/use_get_fields_data.ts) * @param field type unknown or unknown[] * @param emptyValue optional parameter to return if field is incorrect * @return the field's value, or null/emptyValue diff --git a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/query/index.test.tsx b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/query/index.test.tsx index cfd8f86af9dac..eb13527385739 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/query/index.test.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/query/index.test.tsx @@ -1250,7 +1250,7 @@ describe('query tab with unified timeline', () => { ); /* * Above event is alert and not an event but `getEventType` in - *x-pack/plugins/security_solution/public/timelines/components/timeline/body/helpers.tsx + * x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/body/helpers.tsx * returns it has event and not an alert even though, it has event.kind as signal. * Need to see if it is okay * @@ -1313,7 +1313,7 @@ describe('query tab with unified timeline', () => { ); /* * Above event is alert and not an event but `getEventType` in - * x-pack/plugins/security_solution/public/timelines/components/timeline/body/helpers.tsx + * x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/body/helpers.tsx * returns it has event and not an alert even though, it has event.kind as signal. * Need to see if it is okay * diff --git a/x-pack/solutions/security/plugins/security_solution/scripts/run_cypress/parallel.ts b/x-pack/solutions/security/plugins/security_solution/scripts/run_cypress/parallel.ts index d4b4c8addc099..65642758d19ad 100644 --- a/x-pack/solutions/security/plugins/security_solution/scripts/run_cypress/parallel.ts +++ b/x-pack/solutions/security/plugins/security_solution/scripts/run_cypress/parallel.ts @@ -65,7 +65,7 @@ ${JSON.stringify(argv, null, 2)} `); const isOpen = argv._.includes('open'); - const cypressConfigFilePath = require.resolve(`../../${argv.configFile}`) as string; + const cypressConfigFilePath = require.resolve(`../../../../${argv.configFile}`) as string; const cypressConfigFile = await import(cypressConfigFilePath); if (cypressConfigFile.env?.TOOLING_LOG_LEVEL) { diff --git a/x-pack/solutions/security/plugins/security_solution/scripts/run_cypress/parallel_serverless.ts b/x-pack/solutions/security/plugins/security_solution/scripts/run_cypress/parallel_serverless.ts index 1ebdd2b2afbd3..07954e011a6e1 100644 --- a/x-pack/solutions/security/plugins/security_solution/scripts/run_cypress/parallel_serverless.ts +++ b/x-pack/solutions/security/plugins/security_solution/scripts/run_cypress/parallel_serverless.ts @@ -346,7 +346,7 @@ ${JSON.stringify(argv, null, 2)} `); const isOpen = argv._.includes('open'); - const cypressConfigFilePath = require.resolve(`../../${argv.configFile}`) as string; + const cypressConfigFilePath = require.resolve(`../../../../${argv.configFile}`) as string; const cypressConfigFile = await import(cypressConfigFilePath); // if KIBANA_MKI_QUALITY_GATE exists and has a value, we are running the tests against the Kibana QA quality gate. diff --git a/x-pack/solutions/security/plugins/threat_intelligence/public/modules/block_list/containers/flyout.tsx b/x-pack/solutions/security/plugins/threat_intelligence/public/modules/block_list/containers/flyout.tsx index fd8c1a81fa02f..15ff4d577bc9b 100644 --- a/x-pack/solutions/security/plugins/threat_intelligence/public/modules/block_list/containers/flyout.tsx +++ b/x-pack/solutions/security/plugins/threat_intelligence/public/modules/block_list/containers/flyout.tsx @@ -25,8 +25,8 @@ export interface BlockListFlyoutProps { /** * Component calling the block list flyout (retrieved from the SecuritySolution plugin via context). * This reuses a lot of components passed down via context from the Security Solution plugin: - * - the flyout component: https://github.com/elastic/kibana/blob/main/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.tsx - * - the form component: https://github.com/elastic/kibana/blob/main/x-pack/plugins/security_solution/public/management/pages/blocklist/view/components/blocklist_form.tsx + * - the flyout component: https://github.com/elastic/kibana/blob/main/x-pack/solutions/security/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.tsx + * - the form component: https://github.com/elastic/kibana/blob/main/x-pack/solutions/security/plugins/security_solution/public/management/pages/blocklist/view/components/blocklist_form.tsx */ export const BlockListFlyout: VFC = ({ indicatorFileHash }) => { const { setBlockListIndicatorValue } = useBlockListContext(); diff --git a/x-pack/solutions/security/plugins/threat_intelligence/public/modules/timeline/components/investigate_in_timeline.tsx b/x-pack/solutions/security/plugins/threat_intelligence/public/modules/timeline/components/investigate_in_timeline.tsx index 2bd794c49adcd..e894fa99c9e6c 100644 --- a/x-pack/solutions/security/plugins/threat_intelligence/public/modules/timeline/components/investigate_in_timeline.tsx +++ b/x-pack/solutions/security/plugins/threat_intelligence/public/modules/timeline/components/investigate_in_timeline.tsx @@ -28,7 +28,7 @@ export interface InvestigateInTimelineProps { } /** - * Investigate in timeline button, uses the InvestigateInTimelineAction component (x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/investigate_in_timeline_action.tsx) + * Investigate in timeline button, uses the InvestigateInTimelineAction component (x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/investigate_in_timeline_action.tsx) * retrieved from the SecuritySolutionContext. * * This component renders an {@link EuiContextMenu}. @@ -65,7 +65,7 @@ export const InvestigateInTimelineContextMenu: VFC = }; /** - * Investigate in timeline button uses the InvestigateInTimelineAction component (x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/investigate_in_timeline_action.tsx) + * Investigate in timeline button uses the InvestigateInTimelineAction component (x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/investigate_in_timeline_action.tsx) * retrieved from the SecuritySolutionContext. * * This component renders an {@link EuiButtonIcon}. diff --git a/x-pack/solutions/security/plugins/threat_intelligence/public/plugin.tsx b/x-pack/solutions/security/plugins/threat_intelligence/public/plugin.tsx index 09a0925577284..9db7fc34f3be0 100755 --- a/x-pack/solutions/security/plugins/threat_intelligence/public/plugin.tsx +++ b/x-pack/solutions/security/plugins/threat_intelligence/public/plugin.tsx @@ -32,7 +32,7 @@ const LazyIndicatorsPageWrapper = React.lazy(() => import('./containers/indicato /** * This is used here: - * x-pack/plugins/security_solution/public/threat_intelligence/routes.tsx + * x-pack/solutions/security/plugins/security_solution/public/threat_intelligence/routes.tsx */ export const createApp = (services: Services) => diff --git a/x-pack/test/security_solution_cypress/package.json b/x-pack/test/security_solution_cypress/package.json index 99ceaffaeb826..79f07c2d07a60 100644 --- a/x-pack/test/security_solution_cypress/package.json +++ b/x-pack/test/security_solution_cypress/package.json @@ -10,18 +10,18 @@ "cypress:entity_analytics:run:ess": "yarn cypress:ess --spec './cypress/e2e/entity_analytics/**/*.cy.ts'", "cypress:run:cases:ess": "yarn cypress:ess --spec './cypress/e2e/explore/cases/*.cy.ts'", "cypress:ess": "TZ=UTC NODE_OPTIONS=--openssl-legacy-provider node ../../solutions/security/plugins/security_solution/scripts/start_cypress_parallel run --config-file ../../test/security_solution_cypress/cypress/cypress_ci.config.ts --ftr-config-file ../../test/security_solution_cypress/cli_config", - "cypress:rule_management:run:ess":"yarn cypress:ess --spec './cypress/e2e/detection_response/rule_management/!(prebuilt_rules)/**/*.cy.ts'", + "cypress:rule_management:run:ess": "yarn cypress:ess --spec './cypress/e2e/detection_response/rule_management/!(prebuilt_rules)/**/*.cy.ts'", "cypress:rule_management:prebuilt_rules:run:ess": "yarn cypress:ess --spec './cypress/e2e/detection_response/rule_management/prebuilt_rules/**/*.cy.ts'", - "cypress:detection_engine:run:ess":"yarn cypress:ess --spec './cypress/e2e/detection_response/detection_engine/!(exceptions)/**/*.cy.ts'", + "cypress:detection_engine:run:ess": "yarn cypress:ess --spec './cypress/e2e/detection_response/detection_engine/!(exceptions)/**/*.cy.ts'", "cypress:detection_engine:exceptions:run:ess": "yarn cypress:ess --spec './cypress/e2e/detection_response/detection_engine/exceptions/**/*.cy.ts'", - "cypress:ai_assistant:run:ess":"yarn cypress:ess --spec './cypress/e2e/ai_assistant/**/*.cy.ts'", + "cypress:ai_assistant:run:ess": "yarn cypress:ess --spec './cypress/e2e/ai_assistant/**/*.cy.ts'", "cypress:run:respops:ess": "yarn cypress:ess --spec './cypress/e2e/detection_response/**/*.cy.ts'", "cypress:investigations:run:ess": "yarn cypress:ess --spec './cypress/e2e/investigations/**/*.cy.ts'", "cypress:explore:run:ess": "yarn cypress:ess --spec './cypress/e2e/explore/**/*.cy.ts'", "cypress:changed-specs-only:ess": "yarn cypress:ess --changed-specs-only --env burn=5", "cypress:cloud_security_posture:run:ess": "yarn cypress:ess --spec './cypress/e2e/cloud_security_posture/**/*.cy.ts'", "cypress:burn:ess": "yarn cypress:ess --env burn=5", - "junit:merge": "../../../node_modules/.bin/mochawesome-merge ../../../target/kibana-security-solution/cypress/results/mochawesome*.json > ../../../target/kibana-security-solution/cypress/results/output.json && ../../../node_modules/.bin/marge ../../../target/kibana-security-solution/cypress/results/output.json --reportDir ../../../target/kibana-security-solution/cypress/results && yarn junit:transform && mkdir -p ../../../target/junit && cp ../../../target/kibana-security-solution/cypress/results/*.xml ../../../target/junit/", + "junit:merge": "../../../node_modules/.bin/mochawesome-merge ../../../../../target/kibana-security-solution/cypress/results/mochawesome*.json > ../../../../../target/kibana-security-solution/cypress/results/output.json && ../../../node_modules/.bin/marge ../../../../../target/kibana-security-solution/cypress/results/output.json --reportDir ../../../../../target/kibana-security-solution/cypress/results && yarn junit:transform && mkdir -p ../../../../../target/junit && cp ../../../../../target/kibana-security-solution/cypress/results/*.xml ../../../../../target/junit/", "junit:transform": "node ../../solutions/security/plugins/security_solution/scripts/junit_transformer --pathPattern '../../../target/kibana-security-solution/cypress/results/*.xml' --rootDirectory ../../../ --reportName 'Security Solution Cypress' --writeInPlace", "cypress:serverless": "TZ=UTC NODE_OPTIONS=--openssl-legacy-provider node ../../solutions/security/plugins/security_solution/scripts/start_cypress_parallel --config-file ../../test/security_solution_cypress/cypress/cypress_ci_serverless.config.ts --ftr-config-file ../../test/security_solution_cypress/serverless_config", "cypress:cloud:serverless": "TZ=UTC NODE_OPTIONS=--openssl-legacy-provider NODE_TLS_REJECT_UNAUTHORIZED=0 ../../../node_modules/.bin/cypress", @@ -51,4 +51,4 @@ "cypress:run:qa:serverless:ai_assistant": "yarn cypress:qa:serverless --spec './cypress/e2e/ai_assistant/**/*.cy.ts'", "cypress:run:qa:serverless:cloud_security_posture": "yarn cypress:qa:serverless --spec './cypress/e2e/cloud_security_posture/**/*.cy.ts" } -} \ No newline at end of file +}