Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
3a184aa
add `esServerlessOptions` to the FTR config
paul-tavares Sep 27, 2023
d605d93
Add `esServerlessOptions` to the endpoint FTR configurations for serv…
paul-tavares Sep 27, 2023
9cc175d
Un-skip servereless tests for roles/pli's
paul-tavares Sep 27, 2023
b9f3cd5
Merge remote-tracking branch 'upstream/main' into task/olm-7614-enabl…
paul-tavares Sep 27, 2023
4b1a27e
Change default login username to `endpoint_operations_analyst`
paul-tavares Sep 27, 2023
fe94d41
add missing `system_indices_superuser` role
paul-tavares Sep 27, 2023
7338703
new `start_fleet_server` script
paul-tavares Sep 28, 2023
26460f6
Improve logging in start fleet server cli tool
paul-tavares Sep 29, 2023
dd2f28e
Update `endpoint_operations_analyst` role to match the serverless def…
paul-tavares Sep 29, 2023
42f68fe
Merge remote-tracking branch 'upstream/main' into task/olm-7614-enabl…
paul-tavares Sep 29, 2023
7f63092
actually check if fleet server is running by calling its status api
paul-tavares Sep 29, 2023
f9c52f6
add support for serverless (fleet server standalone)
paul-tavares Sep 29, 2023
0f393e9
adjust username on rbac ESS test
paul-tavares Sep 29, 2023
5d3c4a3
Merge remote-tracking branch 'upstream/main' into task/olm-7614-enabl…
paul-tavares Sep 29, 2023
c71fcc8
Minor updates
paul-tavares Sep 29, 2023
198ee95
Merge remote-tracking branch 'upstream/main' into task/olm-7614-enabl…
paul-tavares Oct 2, 2023
fe8b3b5
add comment to refactor test file
paul-tavares Oct 2, 2023
b764816
Update `fetchKibanaStatus()` and `waitForKibana()` to use kbnClient
paul-tavares Oct 2, 2023
e4b83d8
Merge remote-tracking branch 'upstream/main' into task/olm-7614-enabl…
paul-tavares Oct 2, 2023
e348eb5
increase timeout for respons actions api checks
paul-tavares Oct 2, 2023
ba82263
skip test failures
paul-tavares Oct 3, 2023
f961432
Merge remote-tracking branch 'upstream/main' into task/olm-7614-enabl…
paul-tavares Oct 3, 2023
d4da51a
add issue number to skip tests
paul-tavares Oct 3, 2023
a10e34b
Merge remote-tracking branch 'upstream/main' into task/olm-7614-enabl…
paul-tavares Oct 3, 2023
b5bfd11
add check/validation to `policyId` and `serviceToken`
paul-tavares Oct 3, 2023
2c8a0dd
Merge remote-tracking branch 'upstream/main' into task/olm-7614-enabl…
paul-tavares Oct 3, 2023
2ba060b
adjust code from code review
paul-tavares Oct 3, 2023
09c5dab
Merge branch 'main' into task/olm-7614-enable-serverless-tests
paul-tavares Oct 3, 2023
0010825
Merge branch 'main' into task/olm-7614-enable-serverless-tests
paul-tavares Oct 3, 2023
4b21538
Merge branch 'main' into task/olm-7614-enable-serverless-tests
paul-tavares Oct 3, 2023
f61e534
Merge remote-tracking branch 'upstream/main' into task/olm-7614-enabl…
paul-tavares Oct 4, 2023
ecacb30
rename common method back to `getLocalhostRealIp()` and adjust import…
paul-tavares Oct 4, 2023
ea37cb3
fix serverless config for Cy
paul-tavares Oct 4, 2023
5693c7c
fix config again
paul-tavares Oct 4, 2023
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
3 changes: 2 additions & 1 deletion packages/kbn-test/src/es/test_es_cluster.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export interface CreateTestEsClusterOptions {
*/
esArgs?: string[];
esFrom?: string;
esServerlessOptions?: Pick<ServerlessOptions, 'image' | 'tag' | 'host'>;
esServerlessOptions?: Pick<ServerlessOptions, 'image' | 'tag' | 'resources' | 'host'>;
esJavaOpts?: string;
/**
* License to run your cluster under. Keep in mind that a `trial` license
Expand Down Expand Up @@ -245,6 +245,7 @@ export function createTestEsCluster<
image: esServerlessOptions?.image,
tag: esServerlessOptions?.tag,
host: esServerlessOptions?.host,
resources: esServerlessOptions?.resources,
port,
clean: true,
background: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ export const schema = Joi.object()
esServerlessOptions: Joi.object()
.keys({
host: Joi.string().ip(),
resources: Joi.array().items(Joi.string()).default([]),
})
.default(),

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,24 +166,30 @@ function getESServerlessOptions(esServerlessImageFromArg: string | undefined, co
esTestConfig.getESServerlessImage() ||
(config.has('esTestCluster.esServerlessImage') &&
config.get('esTestCluster.esServerlessImage'));
const serverlessResources: string[] =
(config.has('esServerlessOptions.resources') && config.get('esServerlessOptions.resources')) ||
[];
const serverlessHost: string | undefined =
config.has('esServerlessOptions.host') && config.get('esServerlessOptions.host');

if (esServerlessImageUrlOrTag) {
if (esServerlessImageUrlOrTag.includes(':')) {
return {
resources: serverlessResources,
image: esServerlessImageUrlOrTag,
host: serverlessHost,
};
} else {
return {
resources: serverlessResources,
tag: esServerlessImageUrlOrTag,
host: serverlessHost,
};
}
}

return {
resources: serverlessResources,
host: serverlessHost,
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ const visitArtifactTab = (tabId: string) => {

describe(
'Artifact tabs in Policy Details page',
{ tags: ['@ess', '@serverless', '@brokenInServerless'] }, // broken due to disabled Native Role Management
// FIXME: Test needs to be refactored for serverless so that it uses a standard set of users that are also available in serverless
{ tags: ['@ess', '@serverless', '@brokenInServerless'] },
() => {
before(() => {
login();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ describe('No License', { tags: '@ess', env: { ftrConfig: { license: 'basic' } }
});
});

describe('User cannot see results', () => {
// FIXME: Flaky. Needs fixing (security team issue #7763)
describe.skip('User cannot see results', () => {
let endpointData: ReturnTypeFromChainable<typeof indexEndpointHosts> | undefined;
let alertData: ReturnTypeFromChainable<typeof indexEndpointRuleAlerts> | undefined;
const [endpointAgentId, endpointHostname] = generateRandomStringName(2);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ import { login } from '../tasks/login';
import { EXECUTE_ROUTE } from '../../../../common/endpoint/constants';
import { waitForActionToComplete } from '../tasks/response_actions';

describe(
// FIXME: Flaky. Needs fixing (security team issue #7763)
describe.skip(
'Endpoint generated alerts',
{ tags: ['@ess', '@serverless', '@brokenInServerless'] },
() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import { closeAllToasts } from '../tasks/toasts';
import { login } from '../tasks/login';
import { login, ROLE } from '../tasks/login';
import { loadPage } from '../tasks/common';

describe('When defining a kibana role for Endpoint security access', { tags: '@ess' }, () => {
Expand All @@ -18,7 +18,7 @@ describe('When defining a kibana role for Endpoint security access', { tags: '@e
};

beforeEach(() => {
login();
login(ROLE.system_indices_superuser);
loadPage('/app/management/security/roles/edit');
closeAllToasts();
cy.getByTestSubj('addSpacePrivilegeButton').click();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
describe(
'When on the Endpoint List in Security Essentials PLI',
{
tags: ['@serverless', '@brokenInServerless'],
tags: ['@serverless'],
env: {
ftrConfig: {
productTypes: [{ product_line: 'security', product_tier: 'essentials' }],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { getEndpointManagementPageList } from '../../../screens';
describe(
'App Features for Security Complete PLI',
{
tags: ['@serverless', '@brokenInServerless'],
tags: ['@serverless'],
env: {
ftrConfig: { productTypes: [{ product_line: 'security', product_tier: 'complete' }] },
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
describe(
'App Features for Security Complete PLI with Endpoint Complete Addon',
{
tags: ['@serverless', '@brokenInServerless'],
tags: ['@serverless'],
env: {
ftrConfig: {
productTypes: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { getEndpointManagementPageList } from '../../../screens';
describe(
'App Features for Security Essential PLI',
{
tags: ['@serverless', '@brokenInServerless'],
tags: ['@serverless'],
env: {
ftrConfig: {
productTypes: [{ product_line: 'security', product_tier: 'essentials' }],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
describe(
'App Features for Security Essentials PLI with Endpoint Essentials Addon',
{
tags: ['@serverless', '@brokenInServerless'],
tags: ['@serverless'],
env: {
ftrConfig: {
productTypes: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import type { IndexedFleetEndpointPolicyResponse } from '../../../../../common/e
describe(
'When displaying the Policy Details in Security Essentials PLI',
{
tags: ['@serverless', '@brokenInServerless'],
tags: ['@serverless'],
env: {
ftrConfig: {
productTypes: [{ product_line: 'security', product_tier: 'essentials' }],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import {
describe(
'User Roles for Security Complete PLI with Endpoint Complete addon',
{
tags: ['@serverless', '@brokenInServerless'],
tags: ['@serverless'],
env: {
ftrConfig: {
productTypes: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
describe(
'Roles for Security Essential PLI with Endpoint Essentials addon',
{
tags: ['@serverless', '@brokenInServerless'],
tags: ['@serverless'],
env: {
ftrConfig: {
productTypes: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ interface CyLoginTask {
* @param user
*/
export const login: CyLoginTask = (
// FIXME:PT default user to `soc_manager`
user?: SecurityTestUser
user: SecurityTestUser = ROLE.endpoint_operations_analyst
): ReturnType<typeof sendApiLoginRequest> => {
let username = Cypress.env('KIBANA_USERNAME');
let password = Cypress.env('KIBANA_PASSWORD');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ export const ensureResponseActionAuthzAccess = (
{
const file = new File(['foo'], 'foo.txt');
const formData = new FormData();

formData.append('file', file, file.name);

for (const [key, value] of Object.entries(apiPayload as object)) {
Expand All @@ -199,6 +198,8 @@ export const ensureResponseActionAuthzAccess = (
},
failOnStatusCode: false,
body: apiPayload as Cypress.RequestBody,
// Increased timeout due to `upload` action. It seems to take much longer to complete due to file upload
timeout: 120000,
};

if (accessLevel === 'none') {
Expand Down
Loading