requested changes

backend/e2e-test/routes/v3/secret-rotations.spec.ts

@@ -434,6 +434,13 @@ describe("Secret Rotations", async () => {
         attempts += 1;
         await new Promise((resolve) => setTimeout(resolve, 2_500));
       }
+
+      if (attempts >= 60) {
+        throw new Error("Secret rotation failed to rotate after 60 attempts");
+      }
+
+      const finalSecretValue = await getSecretValue(secretMapping.password);
+      expect(finalSecretValue).not.toBe(startSecretValue);
     },
     {
       timeout: 300_000

backend/e2e-test/vitest-environment-knex.ts

@@ -121,7 +121,7 @@ export default {
         // @ts-expect-error type
         delete globalThis.testSuperAdminDAL;
         // @ts-expect-error type
-        delete globalThis.jwtToken;
+        delete globalThis.jwtAuthToken;
         // @ts-expect-error type
         delete globalThis.testQueue;
         // called after all tests with this env have been run

backend/src/ee/services/secret-rotation-v2/secret-rotation-v2-fns.ts

@@ -2,6 +2,7 @@ import { AxiosError } from "axios";
 
 import { getConfig } from "@app/lib/config/env";
 import { BadRequestError } from "@app/lib/errors";
+import { logger } from "@app/lib/logger";
 import { KmsDataKey } from "@app/services/kms/kms-types";
 
 import { AUTH0_CLIENT_SECRET_ROTATION_LIST_OPTION } from "./auth0-client-secret";
@@ -13,6 +14,7 @@ import { MYSQL_CREDENTIALS_ROTATION_LIST_OPTION } from "./mysql-credentials";
 import { OKTA_CLIENT_SECRET_ROTATION_LIST_OPTION } from "./okta-client-secret";
 import { ORACLEDB_CREDENTIALS_ROTATION_LIST_OPTION } from "./oracledb-credentials";
 import { POSTGRES_CREDENTIALS_ROTATION_LIST_OPTION } from "./postgres-credentials";
+import { TSecretRotationV2DALFactory } from "./secret-rotation-v2-dal";
 import { SecretRotation, SecretRotationStatus } from "./secret-rotation-v2-enums";
 import { TSecretRotationV2ServiceFactory, TSecretRotationV2ServiceFactoryDep } from "./secret-rotation-v2-service";
 import {
@@ -23,8 +25,6 @@ import {
   TSecretRotationV2Raw,
   TUpdateSecretRotationV2DTO
 } from "./secret-rotation-v2-types";
-import { logger } from "@app/lib/logger";
-import { TSecretRotationV2DALFactory } from "./secret-rotation-v2-dal";
 
 const SECRET_ROTATION_LIST_OPTIONS: Record<SecretRotation, TSecretRotationV2ListItem> = {
   [SecretRotation.PostgresCredentials]: POSTGRES_CREDENTIALS_ROTATION_LIST_OPTION,