github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Security Solution] fix tests for unique policy names (#118248) (#118344)

Browse source 
Co-authored-by: Joey F. Poon <joey.poon@elastic.co>
This commit is contained in:
Kibana Machine 2021-11-11 10:48:52 -05:00 • committed by GitHub
parent a09d2a8c38
commit 67f7dddba2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_hosts.ts
View file

@ -8,6 +8,7 @@
import { Client } from '@elastic/elasticsearch';
import { cloneDeep, merge } from 'lodash';
import { AxiosResponse } from 'axios';
import uuid from 'uuid';
// eslint-disable-next-line import/no-extraneous-dependencies
import { KbnClient } from '@kbn/test';
import { DeleteByQueryResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
@ -139,12 +140,13 @@ export async function indexEndpointHostDocs({
if (enrollFleet) {
const { id: appliedPolicyId, name: appliedPolicyName } = hostMetadata.Endpoint.policy.applied;
const uniqueAppliedPolicyName = `${appliedPolicyName}-${uuid.v4()}`;
// If we don't yet have a "real" policy record, then create it now in ingest (package config)
if (!realPolicies[appliedPolicyId]) {
const createdPolicies = await indexFleetEndpointPolicy(
kbnClient,
appliedPolicyName,
uniqueAppliedPolicyName,
epmEndpointPackage.version
);

3
x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
View file

@ -402,6 +402,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
expect(agentFullPolicy.inputs).to.eql([
getExpectedAgentPolicyEndpointInput({
id: policyInfo.packagePolicy.id,
name: policyInfo.packagePolicy.name,
meta: {
package: {
version: policyInfo.packageInfo.version,
@ -448,6 +449,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
expect(agentFullPolicy.inputs).to.eql([
getExpectedAgentPolicyEndpointInput({
id: policyInfo.packagePolicy.id,
name: policyInfo.packagePolicy.name,
meta: {
package: {
version: policyInfo.packageInfo.version,
@ -486,6 +488,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
expect(agentFullPolicyUpdated.inputs).to.eql([
getExpectedAgentPolicyEndpointInput({
id: policyInfo.packagePolicy.id,
name: policyInfo.packagePolicy.name,
revision: 3,
meta: {
package: {

5
x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
View file

@ -5,6 +5,7 @@
* 2.0.
*/
import uuid from 'uuid';
import { FtrProviderContext } from '../ftr_provider_context';
import {
CreateAgentPolicyRequest,
@ -161,7 +162,7 @@ export function EndpointPolicyTestResourcesProvider({ getService }: FtrProviderC
let agentPolicy: CreateAgentPolicyResponse['item'];
try {
const newAgentPolicyData: CreateAgentPolicyRequest['body'] = {
name: 'East Coast',
name: `East Coast ${uuid.v4()}`,
description: 'East Coast call center',
namespace: 'default',
};
@ -182,7 +183,7 @@ export function EndpointPolicyTestResourcesProvider({ getService }: FtrProviderC
let packagePolicy: CreatePackagePolicyResponse['item'];
try {
const newPackagePolicyData: CreatePackagePolicyRequest['body'] = {
name: 'Protect East Coast',
name: `Protect East Coast ${uuid.v4()}`,
description: 'Protect the worlds data - but in the East Coast',
policy_id: agentPolicy!.id,
enabled: true,