Address comments

elastic · Oct 17, 2024 · 85449d3 · 85449d3
1 parent d8c7b52
commit 85449d3
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/slo/create_slo.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/slo/create_slo.ts
@@ -49,6 +49,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
       await dataViewApi.delete({ roleAuthc: adminRoleAuthc, id: DATA_VIEW_ID });
       await cleanup({ client: esClient, config: DATA_FORGE_CONFIG, logger });
       await sloApi.deleteAllSLOs(adminRoleAuthc);
+      await samlAuth.invalidateM2mApiKeyWithRoleScope(adminRoleAuthc);
     });
 
     it('creates a new slo and transforms', async () => {
@@ -127,7 +128,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
         expect(apiResponse).property('id');
         const { id } = apiResponse;
 
-        await retry.tryForTime(300 * 1000, async () => {
+        await retry.tryForTime(180 * 1000, async () => {
           const response = await esClient.search(getRollupDataEsQuery(id));
 
           // @ts-ignore
@@ -146,7 +147,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
         expect(apiResponse).property('id');
         const { id } = apiResponse;
 
-        await retry.tryForTime(300 * 1000, async () => {
+        await retry.tryForTime(180 * 1000, async () => {
           const response = await esClient.search(getRollupDataEsQuery(id));
 
           // @ts-ignore
@@ -180,7 +181,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
         expect(apiResponse).property('id');
         const { id } = apiResponse;
 
-        await retry.tryForTime(300 * 1000, async () => {
+        await retry.tryForTime(180 * 1000, async () => {
           const response = await esClient.search(getRollupDataEsQuery(id));
 
           // @ts-ignore
@@ -196,7 +197,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
         expect(apiResponse).property('id');
         const { id } = apiResponse;
 
-        await retry.tryForTime(300 * 1000, async () => {
+        await retry.tryForTime(180 * 1000, async () => {
           const response = await esClient.search(getRollupDataEsQuery(id));
 
           // @ts-ignore

diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/slo/delete_slo.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/slo/delete_slo.ts
@@ -54,6 +54,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
       await dataViewApi.delete({ roleAuthc: adminRoleAuthc, id: DATA_VIEW_ID });
       await cleanup({ client: esClient, config: DATA_FORGE_CONFIG, logger });
       await sloApi.deleteAllSLOs(adminRoleAuthc);
+      await samlAuth.invalidateM2mApiKeyWithRoleScope(adminRoleAuthc);
     });
 
     it('deletes SLO and related resources', async () => {

diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/slo/find_slo.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/slo/find_slo.ts
@@ -48,6 +48,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
       await dataViewApi.delete({ roleAuthc: adminRoleAuthc, id: DATA_VIEW_ID });
       await cleanup({ client: esClient, config: DATA_FORGE_CONFIG, logger });
       await sloApi.deleteAllSLOs(adminRoleAuthc);
+      await samlAuth.invalidateM2mApiKeyWithRoleScope(adminRoleAuthc);
     });
 
     it('searches SLOs', async () => {
@@ -61,7 +62,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
       const sloId2 = createResponse2.id;
 
       // search SLOs
-      await retry.tryForTime(360 * 1000, async () => {
+      await retry.tryForTime(180 * 1000, async () => {
         let response = await supertestWithoutAuth
           .get(`/api/observability/slos`)
           .set(adminRoleAuthc.apiKeyHeader)

diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/slo/get_slo.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/slo/get_slo.ts
@@ -44,6 +44,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
       await dataViewApi.delete({ roleAuthc: adminRoleAuthc, id: DATA_VIEW_ID });
       await cleanup({ client: esClient, config: DATA_FORGE_CONFIG, logger });
       await sloApi.deleteAllSLOs(adminRoleAuthc);
+      await samlAuth.invalidateM2mApiKeyWithRoleScope(adminRoleAuthc);
     });
 
     it('get SLO by id', async () => {

diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/slo/reset_slo.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/slo/reset_slo.ts
@@ -46,6 +46,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
       await dataViewApi.delete({ roleAuthc: adminRoleAuthc, id: DATA_VIEW_ID });
       await cleanup({ client: esClient, config: DATA_FORGE_CONFIG, logger });
       await sloApi.deleteAllSLOs(adminRoleAuthc);
+      await samlAuth.invalidateM2mApiKeyWithRoleScope(adminRoleAuthc);
     });
 
     it('resets the related resources', async () => {

diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/slo/update_slo.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/slo/update_slo.ts
@@ -48,6 +48,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
       await dataViewApi.delete({ roleAuthc: adminRoleAuthc, id: DATA_VIEW_ID });
       await cleanup({ client: esClient, config: DATA_FORGE_CONFIG, logger });
       await sloApi.deleteAllSLOs(adminRoleAuthc);
+      await samlAuth.invalidateM2mApiKeyWithRoleScope(adminRoleAuthc);
     });
 
     it('updates the definition without a revision bump', async () => {