[9.0] [Cloud Security] add cleanup to rules v2 integrations and fix data views, compliance d… (#213669) (#213931)

# Backport This will backport the following commits from `main` to `9.0`: - [[Cloud Security] add cleanup to rules v2 integrations and fix data views, compliance d… (#213669)](https://github.com/elastic/kibana/pull/213669)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport)  Co-authored-by: Alex Prozorov <alex.prozorov@elastic.co>
2025-04-24 01:38:56 -04:00 · 2025-03-12 03:17:53 +11:00 · 2025-03-12 03:17:53 +11:00 · 495d0b93a0
commit 495d0b93a0
parent c68d82ee86
4 changed files with 31 additions and 13 deletions
--- a/x-pack/test/api_integration/apis/cloud_security_posture/rules/v2.ts
+++ b/x-pack/test/api_integration/apis/cloud_security_posture/rules/v2.ts
@ -20,10 +20,20 @@ export default function ({ getService }: FtrProviderContext) {

  describe('GET internal/cloud_security_posture/rules/_find', () => {
    let agentPolicyId: string;
+    const savedObjects = [
+      'ingest-agent-policies',
+      'fleet-agent-policies',
+      'ingest-package-policies',
+      'fleet-package-policies',
+      'cloud-security-posture-settings',
+    ];
+
+    before(async () => {
+      await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
+    });

    beforeEach(async () => {
-      await kibanaServer.savedObjects.cleanStandardList();
-      await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
+      await kibanaServer.savedObjects.clean({ types: savedObjects });

      const { body: agentPolicyResponse } = await supertest
        .post(`/api/fleet/agent_policies`)
@ -98,7 +108,10 @@ export default function ({ getService }: FtrProviderContext) {
    });

    afterEach(async () => {
-      await kibanaServer.savedObjects.cleanStandardList();
+      await kibanaServer.savedObjects.clean({ types: savedObjects });
+    });
+
+    after(async () => {
      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
    });

--- a/x-pack/test/cloud_security_posture_functional/data_views/data_views.ts
+++ b/x-pack/test/cloud_security_posture_functional/data_views/data_views.ts
@ -40,7 +40,7 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
  const kibanaServer = getService('kibanaServer');
  const spacesService = getService('spaces');
  const retry = getService('retry');
-  const fetchingOfDataViewsTimeout = 1000 * 20; // 20 seconds
+  const fetchingOfDataViewsTimeout = 1000 * 30; // 30 seconds

  const pageObjects = getPageObjects([
    'common',
--- a/x-pack/test_serverless/functional/test_suites/security/ftr/cloud_security_posture/agentless/cis_integration_aws.ts
+++ b/x-pack/test_serverless/functional/test_suites/security/ftr/cloud_security_posture/agentless/cis_integration_aws.ts
@ -19,6 +19,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
    'header',
  ]);
  const supertest = getService('supertest');
+  const retry = getService('retry');

  describe('Serverless - Agentless CIS Integration Page', function () {
    // TODO: we need to check if the tests are running on MKI. There is a suspicion that installing csp package via Kibana server args is not working on MKI.
@ -110,16 +111,18 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
        expect(await cisIntegrationAws.showLaunchCloudFormationAgentlessButton()).to.be(true);
      });
    });
-    // FLAKY: https://github.com/elastic/kibana/issues/191017
-    describe.skip('Serverless - Agentless CIS_AWS Create flow', () => {
+
+    // turned back on after the fix for fleet form bug https://github.com/elastic/kibana/pull/211563 - need to monitor
+    describe('Serverless - Agentless CIS_AWS Create flow', () => {
      it(`user should save agentless integration policy when there are no api or validation errors and button is not disabled`, async () => {
        await cisIntegration.createAgentlessIntegration({
          cloudProvider: 'aws',
        });
-
-        expect(await cisIntegration.showSuccessfulToast('packagePolicyCreateSuccessToast')).to.be(
-          true
-        );
+        await retry.try(async () => {
+          expect(await cisIntegration.showSuccessfulToast('packagePolicyCreateSuccessToast')).to.be(
+            true
+          );
+        });
      });
    });
  });
--- a/x-pack/test_serverless/functional/test_suites/security/ftr/cloud_security_posture/compliance_dashboard.ts
+++ b/x-pack/test_serverless/functional/test_suites/security/ftr/cloud_security_posture/compliance_dashboard.ts
@ -50,6 +50,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
      cspDashboard = pageObjects.cloudPostureDashboard;
      dashboard = pageObjects.cloudPostureDashboard.dashboard;
      await cspDashboard.waitForPluginInitialized();
+      await cspDashboard.index.remove();

      await cspDashboard.index.add(data);
      await cspDashboard.navigateToComplianceDashboardPage();
@ -66,9 +67,10 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
    describe('Kubernetes Dashboard', () => {
      it('displays accurate summary compliance score', async () => {
        await pageObjects.header.waitUntilLoadingHasFinished();
-        const scoreElement = await dashboard.getKubernetesComplianceScore();
-
-        expect((await scoreElement.getVisibleText()) === '0%').to.be(true);
+        await retry.try(async () => {
+          const scoreElement = await dashboard.getKubernetesComplianceScore();
+          expect((await scoreElement.getVisibleText()) === '0%').to.be(true);
+        });
      });
    });
  });