Adds AWX polling function (#2083)

ansible · Apr 17, 2024 · 3435091 · 3435091
1 parent 422bc97
commit 3435091
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 10 deletions.
diff --git a/cypress/e2e/eda/Roles/eda-role-details.cy.ts b/cypress/e2e/eda/Roles/eda-role-details.cy.ts
@@ -11,7 +11,7 @@ describe('Eda Role Details', () => {
         cy.verifyPageTitle(role.name);
         cy.get('[data-cy=name]').should('have.text', role.name);
         cy.get('[data-cy=description]').should('have.text', role.description);
-        cy.getEdaRoleDetail(role.id).then((roleDetail) => {
+        cy.getEdaRoleDetail(role.id.toString()).then((roleDetail) => {
           cy.get('[data-cy=permissions-description-list]').within(() => {
             for (const detail of roleDetail.permissions) {
               cy.get(`[data-cy=${detail.resource_type}]`).should('be.visible');

diff --git a/cypress/e2e/eda/Users/users-crud.cy.ts b/cypress/e2e/eda/Users/users-crud.cy.ts
@@ -14,7 +14,7 @@ describe('EDA Users- Create, Edit, Delete', () => {
     cy.edaLogin();
     cy.getEdaRoles().then((rolesArray) => {
       roleNames = rolesArray.map((role) => role.name);
-      roleIDs = rolesArray.map((role) => role.id);
+      roleIDs = [rolesArray.map((role) => role.id).toString()];
       editorRoleID = roleIDs[2];
       auditorRoleName = roleNames[4];
       contributorRoleName = roleNames[0];

diff --git a/cypress/e2e/eda/main/eda-login-logout.cy.ts b/cypress/e2e/eda/main/eda-login-logout.cy.ts
@@ -27,16 +27,18 @@ describe('EDA Login / Logoff', () => {
   it('can log out and login as a different user', () => {
     cy.getEdaRoles().then((roles) => {
       const password = randomString(12);
-      cy.createEdaUser({ password, roles: roles.map((role) => role.id) }).then((user) => {
-        cy.edaLogout();
+      cy.createEdaUser({ password, roles: [roles.map((role) => role.id).toString()] }).then(
+        (user) => {
+          cy.edaLogout();
 
-        cy.edaLogin(user.username, password);
-        cy.get('.pf-v5-c-dropdown__toggle').eq(1).should('contain', user.username);
-        cy.edaLogout();
+          cy.edaLogin(user.username, password);
+          cy.get('.pf-v5-c-dropdown__toggle').eq(1).should('contain', user.username);
+          cy.edaLogout();
 
-        cy.edaLogin();
-        cy.deleteEdaUser(user);
-      });
+          cy.edaLogin();
+          cy.deleteEdaUser(user);
+        }
+      );
     });
   });
 });
diff --git a/frontend/awx/common/pollAwxItemsResponseItem.ts b/frontend/awx/common/pollAwxItemsResponseItem.ts
@@ -0,0 +1,18 @@
+import { requestGet } from '../../common/crud/Data';
+import { poll } from '../../common/poll';
+import { AwxItemsResponse } from './AwxItemsResponse';
+
+export async function pollAwxItemsResponseItem<T>(
+  url: string,
+  maxAttempts: number,
+  interval: number
+) {
+  const itemsResponse = await poll(
+    () => requestGet<AwxItemsResponse<T>>(url),
+    (response) => !!response && response.count === 1,
+    interval,
+    maxAttempts
+  );
+
+  return itemsResponse.results[0];
+}
diff --git a/frontend/common/poll.ts b/frontend/common/poll.ts
@@ -0,0 +1,15 @@
+export async function poll<ResponseT>(
+  fn: () => Promise<ResponseT | undefined>,
+  check: (response: ResponseT) => boolean,
+  interval?: number,
+  maxAttempts?: number
+) {
+  for (let attempt = 0; attempt < (maxAttempts ?? 10); attempt++) {
+    const response = await fn();
+    if (response !== undefined && check(response)) {
+      return response;
+    }
+    await new Promise((resolve) => setTimeout(resolve, interval ?? 1000));
+  }
+  throw new Error(`Failed to get expected response after ${maxAttempts} attempts`);
+}