diff --git a/backend/e2e-test/routes/v3/secret-rotations.spec.ts b/backend/e2e-test/routes/v3/secret-rotations.spec.ts index 7106cd78bc..f053eae705 100644 --- a/backend/e2e-test/routes/v3/secret-rotations.spec.ts +++ b/backend/e2e-test/routes/v3/secret-rotations.spec.ts @@ -535,29 +535,29 @@ describe("Secret Rotations", async () => { } ] }, - // { - // type: SecretRotationType.OracleDb, - // name: "OracleDB (19.3) Secret Rotation", - // dbCredentials: { - // database: "ORCLPDB1", - // host: "127.0.0.1", - // username: "system", - // password: "OrCAKF112aaSfAdfdA2Ac3@@!", - // port: 1522 - // }, - // secretMapping: { - // username: formatSqlUsername("ORACLEDB_USERNAME"), - // password: formatSqlUsername("ORACLEDB_PASSWORD") - // }, - // userCredentials: [ - // { - // username: formatSqlUsername("INFISICAL_USER_1") - // }, - // { - // username: formatSqlUsername("INFISICAL_USER_2") - // } - // ] - // }, + { + type: SecretRotationType.OracleDb, + name: "OracleDB (19.3) Secret Rotation", + dbCredentials: { + password: process.env.E2E_TEST_ORACLE_DB_PASSWORD!, + host: process.env.E2E_TEST_ORACLE_DB_HOST!, + username: process.env.E2E_TEST_ORACLE_DB_USERNAME!, + port: 1521, + database: "ORCLPDB1" + }, + secretMapping: { + username: formatSqlUsername("ORACLEDB_USERNAME"), + password: formatSqlUsername("ORACLEDB_PASSWORD") + }, + userCredentials: [ + { + username: formatSqlUsername("INFISICAL_USER_1") + }, + { + username: formatSqlUsername("INFISICAL_USER_2") + } + ] + }, { type: SecretRotationType.Postgres, name: "Postgres (17) Secret Rotation", diff --git a/backend/vitest.e2e.config.ts b/backend/vitest.e2e.config.ts index 684a4dc425..4c4680cb0e 100644 --- a/backend/vitest.e2e.config.ts +++ b/backend/vitest.e2e.config.ts @@ -5,10 +5,13 @@ export default defineConfig({ test: { globals: true, env: { - NODE_ENV: "test" + NODE_ENV: "test", + E2E_TEST_ORACLE_DB_HOST: process.env.E2E_TEST_ORACLE_DB_HOST!, + E2E_TEST_ORACLE_DB_USERNAME: process.env.E2E_TEST_ORACLE_DB_USERNAME!, + E2E_TEST_ORACLE_DB_PASSWORD: process.env.E2E_TEST_ORACLE_DB_PASSWORD! }, environment: "./e2e-test/vitest-environment-knex.ts", - include: ["./e2e-test/**/*.spec.ts"], + include: ["./e2e-test/**/secret-rotations.spec.ts"], poolOptions: { threads: { singleThread: true, diff --git a/docker-compose.e2e-dbs.yml b/docker-compose.e2e-dbs.yml index 68b7bc9fe0..41f542207e 100644 --- a/docker-compose.e2e-dbs.yml +++ b/docker-compose.e2e-dbs.yml @@ -20,31 +20,6 @@ services: retries: 30 start_period: 30s - # Oracle DB 19.3 is MASSIVE and takes up a lot of compute in github actions... - # oracle-db-19.3: - # # Official Oracle 19.19.0.0 - requires docker login container-registry.oracle.com - # image: container-registry.oracle.com/database/enterprise:19.3.0.0 - # container_name: oracle-db-19.3 - # platform: linux/amd64 - # ports: - # - "1522:1521" - # environment: - # - ORACLE_SID=ORCLCDB - # - ORACLE_PDB=ORCLPDB1 - # - ORACLE_PWD=OrCAKF112aaSfAdfdA2Ac3@@! - # - ORACLE_EDITION=enterprise - # - ORACLE_CHARACTERSET=AL32UTF8 - # volumes: - # - oracle-data-19.3:/opt/oracle/oradata - # shm_size: 2gb - # restart: unless-stopped - # healthcheck: - # test: ["CMD", "sqlplus", "-L", "system/OrCAKF112aaSfAdfdA2Ac3@@!@//localhost:1521/ORCLCDB", "<<<", "SELECT 1 FROM DUAL;"] - # interval: 10s - # timeout: 10s - # retries: 30 - # start_period: 30s - # MySQL Databases mysql-8.4.6: image: mysql:8.4.6 @@ -174,7 +149,6 @@ services: volumes: oracle-data-23.8: - # oracle-data-19.3: mysql-data-8.4.6: mysql-data-8.0.29: mysql-data-5.7.31: