From 2174d13e27b59b8070471fcd82d1237a0c8188c9 Mon Sep 17 00:00:00 2001 From: Jan Monschke Date: Mon, 25 Sep 2023 14:26:30 +0200 Subject: [PATCH 1/8] Fix TypeScript errors --- .../security-solution/upselling/service/index.ts | 1 + .../components/markdown_editor/plugins/index.ts | 14 +++++--------- .../public/flyout/left/components/test_ids.ts | 1 + .../public/management/cypress/tasks/login.ts | 1 - .../public/common/__mocks__/services.mock.ts | 2 ++ .../upselling/hooks/use_product_type_by_pli.ts | 4 ++-- .../pages/osquery_automated_response_actions.tsx | 9 ++++----- .../pages/threat_intelligence_paywall.tsx | 4 ++-- .../cypress/e2e/inspect/inspect_button.cy.ts | 8 +++++--- .../e2e/investigations/alerts/navigation.cy.ts | 2 +- .../investigations/timelines/row_renderers.cy.ts | 8 +++++--- .../cypress/tasks/login.ts | 5 +++++ 12 files changed, 33 insertions(+), 26 deletions(-) diff --git a/x-pack/packages/security-solution/upselling/service/index.ts b/x-pack/packages/security-solution/upselling/service/index.ts index 6a71fd9dde2ca..75ae1a0f109bf 100644 --- a/x-pack/packages/security-solution/upselling/service/index.ts +++ b/x-pack/packages/security-solution/upselling/service/index.ts @@ -6,6 +6,7 @@ */ export { UpsellingService } from './upselling_service'; export type { + MessageUpsellings, PageUpsellings, SectionUpsellings, UpsellingSectionId, diff --git a/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/index.ts b/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/index.ts index ed2c60ea2e961..48071025cd538 100644 --- a/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/index.ts +++ b/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/index.ts @@ -5,6 +5,7 @@ * 2.0. */ +import type { DefaultEuiMarkdownProcessingPlugins } from '@elastic/eui/src/components/markdown_editor/plugins/markdown_default_plugins/processing_plugins'; import { getDefaultEuiMarkdownParsingPlugins, getDefaultEuiMarkdownProcessingPlugins, @@ -14,15 +15,10 @@ import * as timelineMarkdownPlugin from './timeline'; import * as osqueryMarkdownPlugin from './osquery'; import * as insightMarkdownPlugin from './insight'; -export const { - uiPlugins: nonStatefulUiPlugins, - parsingPlugins, - processingPlugins, -} = { - uiPlugins: getDefaultEuiMarkdownUiPlugins(), - parsingPlugins: getDefaultEuiMarkdownParsingPlugins(), - processingPlugins: getDefaultEuiMarkdownProcessingPlugins(), -}; +export const nonStatefulUiPlugins = getDefaultEuiMarkdownUiPlugins(); +export const parsingPlugins = getDefaultEuiMarkdownParsingPlugins(); +export const processingPlugins: DefaultEuiMarkdownProcessingPlugins = + getDefaultEuiMarkdownProcessingPlugins(); export const platinumOnlyPluginTokens = [insightMarkdownPlugin.insightPrefix]; diff --git a/x-pack/plugins/security_solution/public/flyout/left/components/test_ids.ts b/x-pack/plugins/security_solution/public/flyout/left/components/test_ids.ts index fc152e34d5074..5832ddda60c6d 100644 --- a/x-pack/plugins/security_solution/public/flyout/left/components/test_ids.ts +++ b/x-pack/plugins/security_solution/public/flyout/left/components/test_ids.ts @@ -11,6 +11,7 @@ import { PREFIX } from '../../shared/test_ids'; export const ANALYZER_GRAPH_TEST_ID = `${PREFIX}AnalyzerGraph` as const; export const SESSION_VIEW_TEST_ID = `${PREFIX}SessionView` as const; +export const SESSION_VIEW_ERROR_TEST_ID = `${PREFIX}SessionViewError` as const; /* Insights tab */ diff --git a/x-pack/plugins/security_solution/public/management/cypress/tasks/login.ts b/x-pack/plugins/security_solution/public/management/cypress/tasks/login.ts index 8ac78b508d084..77987b5fd76ed 100644 --- a/x-pack/plugins/security_solution/public/management/cypress/tasks/login.ts +++ b/x-pack/plugins/security_solution/public/management/cypress/tasks/login.ts @@ -94,7 +94,6 @@ const sendApiLoginRequest = ( const basicProvider = loginState.body.selector.providers.find( (provider) => provider.type === 'basic' ); - return request({ url: loginUrl, method: 'POST', diff --git a/x-pack/plugins/security_solution_ess/public/common/__mocks__/services.mock.ts b/x-pack/plugins/security_solution_ess/public/common/__mocks__/services.mock.ts index 9e9909b45894b..d75069dfb2bc0 100644 --- a/x-pack/plugins/security_solution_ess/public/common/__mocks__/services.mock.ts +++ b/x-pack/plugins/security_solution_ess/public/common/__mocks__/services.mock.ts @@ -7,9 +7,11 @@ import { coreMock } from '@kbn/core/public/mocks'; import { securitySolutionMock } from '@kbn/security-solution-plugin/public/mocks'; +import { licensingMock } from '@kbn/licensing-plugin/public/mocks'; import type { Services } from '../services'; export const mockServices: Services = { ...coreMock.createStart(), securitySolution: securitySolutionMock.createStart(), + licensing: licensingMock.createStart(), }; diff --git a/x-pack/plugins/security_solution_serverless/public/upselling/hooks/use_product_type_by_pli.ts b/x-pack/plugins/security_solution_serverless/public/upselling/hooks/use_product_type_by_pli.ts index dc5d7debb2954..7704a7059cb24 100644 --- a/x-pack/plugins/security_solution_serverless/public/upselling/hooks/use_product_type_by_pli.ts +++ b/x-pack/plugins/security_solution_serverless/public/upselling/hooks/use_product_type_by_pli.ts @@ -5,10 +5,10 @@ * 2.0. */ -import type { AppFeatureKey } from '@kbn/security-solution-plugin/common'; +import type { AppFeatureKeyType } from '@kbn/security-solution-features'; import { PLI_APP_FEATURES } from '../../../common/pli/pli_config'; -export const getProductTypeByPLI = (requiredPLI: AppFeatureKey): string | null => { +export const getProductTypeByPLI = (requiredPLI: AppFeatureKeyType): string | null => { if (PLI_APP_FEATURES.security.essentials.includes(requiredPLI)) { return 'Security Essentials'; } diff --git a/x-pack/plugins/security_solution_serverless/public/upselling/pages/osquery_automated_response_actions.tsx b/x-pack/plugins/security_solution_serverless/public/upselling/pages/osquery_automated_response_actions.tsx index 2168390eb31a2..3097d41819058 100644 --- a/x-pack/plugins/security_solution_serverless/public/upselling/pages/osquery_automated_response_actions.tsx +++ b/x-pack/plugins/security_solution_serverless/public/upselling/pages/osquery_automated_response_actions.tsx @@ -8,11 +8,11 @@ import { EuiEmptyPrompt, EuiIcon } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n-react'; import React from 'react'; -import type { AppFeatureKey } from '@kbn/security-solution-plugin/common'; +import type { AppFeatureKeyType } from '@kbn/security-solution-features'; import { getProductTypeByPLI } from '../hooks/use_product_type_by_pli'; -const OsqueryResponseActionsUpsellingSection: React.FC<{ requiredPLI: AppFeatureKey }> = React.memo( - ({ requiredPLI }) => { +const OsqueryResponseActionsUpsellingSection: React.FC<{ requiredPLI: AppFeatureKeyType }> = + React.memo(({ requiredPLI }) => { const productTypeRequired = getProductTypeByPLI(requiredPLI); return ( @@ -38,8 +38,7 @@ const OsqueryResponseActionsUpsellingSection: React.FC<{ requiredPLI: AppFeature } /> ); - } -); + }); OsqueryResponseActionsUpsellingSection.displayName = 'OsqueryResponseActionsUpsellingSection'; diff --git a/x-pack/plugins/security_solution_serverless/public/upselling/pages/threat_intelligence_paywall.tsx b/x-pack/plugins/security_solution_serverless/public/upselling/pages/threat_intelligence_paywall.tsx index 984b4ac74ca79..b2b3c11198d1f 100644 --- a/x-pack/plugins/security_solution_serverless/public/upselling/pages/threat_intelligence_paywall.tsx +++ b/x-pack/plugins/security_solution_serverless/public/upselling/pages/threat_intelligence_paywall.tsx @@ -8,11 +8,11 @@ import React from 'react'; import { EuiEmptyPrompt, EuiIcon } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n-react'; -import type { AppFeatureKey } from '@kbn/security-solution-plugin/common'; +import type { AppFeatureKeyType } from '@kbn/security-solution-features'; import { KibanaPageTemplate } from '@kbn/shared-ux-page-kibana-template'; import { getProductTypeByPLI } from '../hooks/use_product_type_by_pli'; -const ThreatIntelligencePaywall: React.FC<{ requiredPLI: AppFeatureKey }> = React.memo( +const ThreatIntelligencePaywall: React.FC<{ requiredPLI: AppFeatureKeyType }> = React.memo( function PaywallComponent({ requiredPLI }) { const productTypeRequired = getProductTypeByPLI(requiredPLI); diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/inspect/inspect_button.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/inspect/inspect_button.cy.ts index dbd593f15e1ac..78ead35a49327 100644 --- a/x-pack/test/security_solution_cypress/cypress/e2e/inspect/inspect_button.cy.ts +++ b/x-pack/test/security_solution_cypress/cypress/e2e/inspect/inspect_button.cy.ts @@ -47,9 +47,11 @@ describe('Inspect Explore pages', { tags: ['@ess', '@serverless', '@brokenInServ login(); visit(url, { - onLoad: () => { - waitForWelcomePanelToBeLoaded(); - selectDataView(DATA_VIEW); + visitOptions: { + onLoad: () => { + waitForWelcomePanelToBeLoaded(); + selectDataView(DATA_VIEW); + }, }, }); diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/investigations/alerts/navigation.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/investigations/alerts/navigation.cy.ts index f8107e92cc64b..d61ba89fa90b2 100644 --- a/x-pack/test/security_solution_cypress/cypress/e2e/investigations/alerts/navigation.cy.ts +++ b/x-pack/test/security_solution_cypress/cypress/e2e/investigations/alerts/navigation.cy.ts @@ -9,7 +9,7 @@ import { expandFirstAlert, waitForAlerts } from '../../../tasks/alerts'; import { createRule } from '../../../tasks/api_calls/rules'; import { cleanKibana } from '../../../tasks/common'; import { login } from '../../../tasks/login'; -import { visit } from '../../../tasks/navigation'; +import { visit, visitWithTimeRange } from '../../../tasks/navigation'; import { getNewRule } from '../../../objects/rule'; diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/investigations/timelines/row_renderers.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/investigations/timelines/row_renderers.cy.ts index 8abcac5843cfa..60af66a577b23 100644 --- a/x-pack/test/security_solution_cypress/cypress/e2e/investigations/timelines/row_renderers.cy.ts +++ b/x-pack/test/security_solution_cypress/cypress/e2e/investigations/timelines/row_renderers.cy.ts @@ -34,9 +34,11 @@ describe('Row renderers', { tags: ['@ess', '@serverless'] }, () => { deleteTimelines(); login(); visitWithTimeRange(hostsUrl('allHosts'), { - onLoad: () => { - waitForWelcomePanelToBeLoaded(); - waitForAllHostsToBeLoaded(); + visitOptions: { + onLoad: () => { + waitForWelcomePanelToBeLoaded(); + waitForAllHostsToBeLoaded(); + }, }, }); openTimelineUsingToggle(); diff --git a/x-pack/test/security_solution_cypress/cypress/tasks/login.ts b/x-pack/test/security_solution_cypress/cypress/tasks/login.ts index 34312b3bd5876..0b7bb615364b8 100644 --- a/x-pack/test/security_solution_cypress/cypress/tasks/login.ts +++ b/x-pack/test/security_solution_cypress/cypress/tasks/login.ts @@ -142,6 +142,11 @@ const loginWithUsernameAndPassword = (username: string, password: string) => { const basicProvider = loginState.body.selector.providers.find( (provider) => provider.type === 'basic' ); + + if (!basicProvider) { + throw Error(`Could not find a basic provider to log in!`); + } + return cy.request({ url: `${baseUrl}/internal/security/login`, method: 'POST', From 12e7aadf4825d2cf4845e97f0c69243064137268 Mon Sep 17 00:00:00 2001 From: Jan Monschke Date: Mon, 25 Sep 2023 14:30:19 +0200 Subject: [PATCH 2/8] add comments --- .../public/common/components/markdown_editor/plugins/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/index.ts b/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/index.ts index 48071025cd538..3979876499cf6 100644 --- a/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/index.ts +++ b/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/index.ts @@ -5,6 +5,7 @@ * 2.0. */ +// TODO: This import can be removed, once https://github.com/elastic/eui/pull/7221 made its way into Kibana main import type { DefaultEuiMarkdownProcessingPlugins } from '@elastic/eui/src/components/markdown_editor/plugins/markdown_default_plugins/processing_plugins'; import { getDefaultEuiMarkdownParsingPlugins, @@ -17,6 +18,7 @@ import * as insightMarkdownPlugin from './insight'; export const nonStatefulUiPlugins = getDefaultEuiMarkdownUiPlugins(); export const parsingPlugins = getDefaultEuiMarkdownParsingPlugins(); +// TODO: This ecplicit type can be removed, once https://github.com/elastic/eui/pull/7221 made its way into Kibana main export const processingPlugins: DefaultEuiMarkdownProcessingPlugins = getDefaultEuiMarkdownProcessingPlugins(); From 914a6d2af0baed5fd6577c812bb9a9cdb03cdc0b Mon Sep 17 00:00:00 2001 From: Jan Monschke Date: Mon, 25 Sep 2023 15:26:14 +0200 Subject: [PATCH 3/8] typo --- .../public/common/components/markdown_editor/plugins/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/index.ts b/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/index.ts index 3979876499cf6..9de05fcd47b8e 100644 --- a/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/index.ts +++ b/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/index.ts @@ -18,7 +18,7 @@ import * as insightMarkdownPlugin from './insight'; export const nonStatefulUiPlugins = getDefaultEuiMarkdownUiPlugins(); export const parsingPlugins = getDefaultEuiMarkdownParsingPlugins(); -// TODO: This ecplicit type can be removed, once https://github.com/elastic/eui/pull/7221 made its way into Kibana main +// TODO: This explicit type can be removed, once https://github.com/elastic/eui/pull/7221 made its way into Kibana main export const processingPlugins: DefaultEuiMarkdownProcessingPlugins = getDefaultEuiMarkdownProcessingPlugins(); From 65f221a6af25bb265b6d9b216a3210c9b8f96752 Mon Sep 17 00:00:00 2001 From: Jan Monschke Date: Mon, 25 Sep 2023 15:40:59 +0200 Subject: [PATCH 4/8] don't throw in case we cannot find a basic provider --- .../test/security_solution_cypress/cypress/tasks/login.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/x-pack/test/security_solution_cypress/cypress/tasks/login.ts b/x-pack/test/security_solution_cypress/cypress/tasks/login.ts index 0b7bb615364b8..e01b80e7c1f06 100644 --- a/x-pack/test/security_solution_cypress/cypress/tasks/login.ts +++ b/x-pack/test/security_solution_cypress/cypress/tasks/login.ts @@ -143,17 +143,13 @@ const loginWithUsernameAndPassword = (username: string, password: string) => { (provider) => provider.type === 'basic' ); - if (!basicProvider) { - throw Error(`Could not find a basic provider to log in!`); - } - return cy.request({ url: `${baseUrl}/internal/security/login`, method: 'POST', headers, body: { - providerType: basicProvider.type, - providerName: basicProvider.name, + providerType: basicProvider?.type, + providerName: basicProvider?.name, currentURL: '/', params: { username, password }, }, From b7871bd112f5e45a0c7bd8793c8c634eca86b53d Mon Sep 17 00:00:00 2001 From: Jan Monschke Date: Tue, 26 Sep 2023 08:54:19 +0200 Subject: [PATCH 5/8] use ROLE enum --- .../roles/complete_with_endpoint_roles.cy.ts | 4 ++-- .../roles/essentials_with_endpoint.roles.cy.ts | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/x-pack/plugins/security_solution/public/management/cypress/e2e/serverless/roles/complete_with_endpoint_roles.cy.ts b/x-pack/plugins/security_solution/public/management/cypress/e2e/serverless/roles/complete_with_endpoint_roles.cy.ts index 534b681c2aeb4..7d872de49062d 100644 --- a/x-pack/plugins/security_solution/public/management/cypress/e2e/serverless/roles/complete_with_endpoint_roles.cy.ts +++ b/x-pack/plugins/security_solution/public/management/cypress/e2e/serverless/roles/complete_with_endpoint_roles.cy.ts @@ -63,7 +63,7 @@ describe( }); // roles `t1_analyst` and `t2_analyst` are very similar with exception of one page - (['t1_analyst', `t2_analyst`] as ROLE[]).forEach((roleName) => { + [ROLE.t1_analyst, ROLE.t2_analyst].forEach((roleName) => { describe(`for role: ${roleName}`, () => { const deniedPages = allPages.filter((page) => page.id !== 'endpointList'); @@ -350,7 +350,7 @@ describe( }); }); - (['platform_engineer', 'endpoint_policy_manager'] as ROLE[]).forEach((roleName) => { + [ROLE.platform_engineer, ROLE.endpoint_policy_manager].forEach((roleName) => { describe(`for role: ${roleName}`, () => { const artifactPagesFullAccess = [ pageById.trustedApps, diff --git a/x-pack/plugins/security_solution/public/management/cypress/e2e/serverless/roles/essentials_with_endpoint.roles.cy.ts b/x-pack/plugins/security_solution/public/management/cypress/e2e/serverless/roles/essentials_with_endpoint.roles.cy.ts index 6cf3ab727980a..dec6018bddc3c 100644 --- a/x-pack/plugins/security_solution/public/management/cypress/e2e/serverless/roles/essentials_with_endpoint.roles.cy.ts +++ b/x-pack/plugins/security_solution/public/management/cypress/e2e/serverless/roles/essentials_with_endpoint.roles.cy.ts @@ -55,7 +55,7 @@ describe( }); // roles `t1_analyst` and `t2_analyst` are the same as far as endpoint access - (['t1_analyst', `t2_analyst`] as ROLE[]).forEach((roleName) => { + [ROLE.t1_analyst, ROLE.t2_analyst].forEach((roleName) => { describe(`for role: ${roleName}`, () => { const deniedPages = allPages.filter((page) => page.id !== 'endpointList'); @@ -237,9 +237,11 @@ describe( }); // Endpoint Operations Manager, Endpoint Policy Manager and Platform Engineer currently have the same level of access - ( - ['platform_engineer', `endpoint_operations_analyst`, 'endpoint_policy_manager'] as ROLE[] - ).forEach((roleName) => { + [ + ROLE.platform_engineer, + ROLE.endpoint_operations_analyst, + ROLE.endpoint_policy_manager, + ].forEach((roleName) => { describe(`for role: ${roleName}`, () => { const artifactPagesFullAccess = [ pageById.trustedApps, From 5e0b8dea5376a81655d1fbaa49ee3d5fff250ef2 Mon Sep 17 00:00:00 2001 From: Jan Monschke Date: Tue, 26 Sep 2023 08:58:00 +0200 Subject: [PATCH 6/8] fix more errors --- .../functional/test_suites/security/cypress/tasks/login.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/x-pack/test_serverless/functional/test_suites/security/cypress/tasks/login.ts b/x-pack/test_serverless/functional/test_suites/security/cypress/tasks/login.ts index de79a7a94f275..3aad95070c4e1 100644 --- a/x-pack/test_serverless/functional/test_suites/security/cypress/tasks/login.ts +++ b/x-pack/test_serverless/functional/test_suites/security/cypress/tasks/login.ts @@ -8,6 +8,7 @@ import { request } from '@kbn/security-solution-plugin/public/management/cypress/tasks/common'; import { LoginState } from '@kbn/security-plugin/common/login_state'; import type { ServerlessRoleName } from '../../../../../shared/lib'; +import { ServerlessRoleName as RoleName } from '../../../../../shared/lib'; import { STANDARD_HTTP_HEADERS } from '../../../../../shared/lib/security/default_http_headers'; /** @@ -36,8 +37,8 @@ const sendApiLoginRequest = ( method: 'POST', headers, body: { - providerType: basicProvider.type, - providerName: basicProvider.name, + providerType: basicProvider?.type, + providerName: basicProvider?.name, currentURL: '/', params: { username, password }, }, @@ -64,7 +65,7 @@ interface CyLoginTask { * @param user Defaults to `soc_manager` */ export const login: CyLoginTask = ( - user: ServerlessRoleName | 'elastic' = 'soc_manager' + user: ServerlessRoleName | 'elastic' = RoleName.SOC_MANAGER ): ReturnType => { let username = Cypress.env('KIBANA_USERNAME'); let password = Cypress.env('KIBANA_PASSWORD'); From 95b5c9961b3d6968a8915e6a4927bcbadca02d97 Mon Sep 17 00:00:00 2001 From: Tomasz Ciecierski Date: Tue, 26 Sep 2023 12:28:44 +0200 Subject: [PATCH 7/8] make a direct import to fix fs problem --- .../functional/test_suites/security/cypress/tasks/login.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/x-pack/test_serverless/functional/test_suites/security/cypress/tasks/login.ts b/x-pack/test_serverless/functional/test_suites/security/cypress/tasks/login.ts index 3aad95070c4e1..5ca52edda86fe 100644 --- a/x-pack/test_serverless/functional/test_suites/security/cypress/tasks/login.ts +++ b/x-pack/test_serverless/functional/test_suites/security/cypress/tasks/login.ts @@ -1,14 +1,15 @@ /* * 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. + * 2.0 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 or the Server + * Side Public License, v 1. */ import { request } from '@kbn/security-solution-plugin/public/management/cypress/tasks/common'; import { LoginState } from '@kbn/security-plugin/common/login_state'; import type { ServerlessRoleName } from '../../../../../shared/lib'; -import { ServerlessRoleName as RoleName } from '../../../../../shared/lib'; +import { ServerlessRoleName as RoleName } from '../../../../../shared/lib/security/types'; import { STANDARD_HTTP_HEADERS } from '../../../../../shared/lib/security/default_http_headers'; /** From 9e90e93272436d3c774f96b645b6acc9873ce6a3 Mon Sep 17 00:00:00 2001 From: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Date: Tue, 26 Sep 2023 10:35:39 +0000 Subject: [PATCH 8/8] [CI] Auto-commit changed files from 'node scripts/precommit_hook.js --ref HEAD~1..HEAD --fix' --- .../functional/test_suites/security/cypress/tasks/login.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/x-pack/test_serverless/functional/test_suites/security/cypress/tasks/login.ts b/x-pack/test_serverless/functional/test_suites/security/cypress/tasks/login.ts index 5ca52edda86fe..89ca14ec0c28f 100644 --- a/x-pack/test_serverless/functional/test_suites/security/cypress/tasks/login.ts +++ b/x-pack/test_serverless/functional/test_suites/security/cypress/tasks/login.ts @@ -1,9 +1,8 @@ /* * 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 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 or the Server - * Side Public License, v 1. + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import { request } from '@kbn/security-solution-plugin/public/management/cypress/tasks/common';