From 4c6cca086411165eef723a8201e88dea0922660f Mon Sep 17 00:00:00 2001
From: x032205 <x032205@gmail.com>
Date: Mon, 9 Jun 2025 12:10:47 -0400
Subject: [PATCH] Greptile review fixes

---
 .../oracledb/oracledb-connection-schemas.ts          | 12 +++++-------
 .../secret-rotation-v2-union-schema.ts               |  5 ++---
 .../sql-credentials-rotation-types.ts                |  5 ++---
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/backend/src/ee/services/app-connections/oracledb/oracledb-connection-schemas.ts b/backend/src/ee/services/app-connections/oracledb/oracledb-connection-schemas.ts
index 50d261ffc..f93abae83 100644
--- a/backend/src/ee/services/app-connections/oracledb/oracledb-connection-schemas.ts
+++ b/backend/src/ee/services/app-connections/oracledb/oracledb-connection-schemas.ts
@@ -11,19 +11,19 @@ import { BaseSqlUsernameAndPasswordConnectionSchema } from "@app/services/app-co
 
 import { OracleDBConnectionMethod } from "./oracledb-connection-enums";
 
-export const OracleDBConnectionAccessTokenCredentialsSchema = BaseSqlUsernameAndPasswordConnectionSchema;
+export const OracleDBConnectionCredentialsSchema = BaseSqlUsernameAndPasswordConnectionSchema;
 
 const BaseOracleDBConnectionSchema = BaseAppConnectionSchema.extend({ app: z.literal(AppConnection.OracleDB) });
 
 export const OracleDBConnectionSchema = BaseOracleDBConnectionSchema.extend({
   method: z.literal(OracleDBConnectionMethod.UsernameAndPassword),
-  credentials: OracleDBConnectionAccessTokenCredentialsSchema
+  credentials: OracleDBConnectionCredentialsSchema
 });
 
 export const SanitizedOracleDBConnectionSchema = z.discriminatedUnion("method", [
   BaseOracleDBConnectionSchema.extend({
     method: z.literal(OracleDBConnectionMethod.UsernameAndPassword),
-    credentials: OracleDBConnectionAccessTokenCredentialsSchema.pick({
+    credentials: OracleDBConnectionCredentialsSchema.pick({
       host: true,
       database: true,
       port: true,
@@ -40,9 +40,7 @@ export const ValidateOracleDBConnectionCredentialsSchema = z.discriminatedUnion(
     method: z
       .literal(OracleDBConnectionMethod.UsernameAndPassword)
       .describe(AppConnections.CREATE(AppConnection.OracleDB).method),
-    credentials: OracleDBConnectionAccessTokenCredentialsSchema.describe(
-      AppConnections.CREATE(AppConnection.OracleDB).credentials
-    )
+    credentials: OracleDBConnectionCredentialsSchema.describe(AppConnections.CREATE(AppConnection.OracleDB).credentials)
   })
 ]);
 
@@ -52,7 +50,7 @@ export const CreateOracleDBConnectionSchema = ValidateOracleDBConnectionCredenti
 
 export const UpdateOracleDBConnectionSchema = z
   .object({
-    credentials: OracleDBConnectionAccessTokenCredentialsSchema.optional().describe(
+    credentials: OracleDBConnectionCredentialsSchema.optional().describe(
       AppConnections.UPDATE(AppConnection.OracleDB).credentials
     )
   })
diff --git a/backend/src/ee/services/secret-rotation-v2/secret-rotation-v2-union-schema.ts b/backend/src/ee/services/secret-rotation-v2/secret-rotation-v2-union-schema.ts
index 6420430f5..6dd04d47e 100644
--- a/backend/src/ee/services/secret-rotation-v2/secret-rotation-v2-union-schema.ts
+++ b/backend/src/ee/services/secret-rotation-v2/secret-rotation-v2-union-schema.ts
@@ -1,15 +1,14 @@
 import { z } from "zod";
 
 import { Auth0ClientSecretRotationSchema } from "@app/ee/services/secret-rotation-v2/auth0-client-secret";
+import { AwsIamUserSecretRotationSchema } from "@app/ee/services/secret-rotation-v2/aws-iam-user-secret";
 import { AzureClientSecretRotationSchema } from "@app/ee/services/secret-rotation-v2/azure-client-secret";
 import { LdapPasswordRotationSchema } from "@app/ee/services/secret-rotation-v2/ldap-password";
 import { MsSqlCredentialsRotationSchema } from "@app/ee/services/secret-rotation-v2/mssql-credentials";
 import { MySqlCredentialsRotationSchema } from "@app/ee/services/secret-rotation-v2/mysql-credentials";
+import { OracleDBCredentialsRotationSchema } from "@app/ee/services/secret-rotation-v2/oracledb-credentials";
 import { PostgresCredentialsRotationSchema } from "@app/ee/services/secret-rotation-v2/postgres-credentials";
 
-import { AwsIamUserSecretRotationSchema } from "./aws-iam-user-secret";
-import { OracleDBCredentialsRotationSchema } from "./oracledb-credentials";
-
 export const SecretRotationV2Schema = z.discriminatedUnion("type", [
   PostgresCredentialsRotationSchema,
   MsSqlCredentialsRotationSchema,
diff --git a/backend/src/ee/services/secret-rotation-v2/shared/sql-credentials/sql-credentials-rotation-types.ts b/backend/src/ee/services/secret-rotation-v2/shared/sql-credentials/sql-credentials-rotation-types.ts
index 53a9cae90..ae357bfea 100644
--- a/backend/src/ee/services/secret-rotation-v2/shared/sql-credentials/sql-credentials-rotation-types.ts
+++ b/backend/src/ee/services/secret-rotation-v2/shared/sql-credentials/sql-credentials-rotation-types.ts
@@ -2,10 +2,9 @@ import { z } from "zod";
 
 import { TMsSqlCredentialsRotationWithConnection } from "@app/ee/services/secret-rotation-v2/mssql-credentials";
 import { TMySqlCredentialsRotationWithConnection } from "@app/ee/services/secret-rotation-v2/mysql-credentials";
+import { TOracleDBCredentialsRotationWithConnection } from "@app/ee/services/secret-rotation-v2/oracledb-credentials";
 import { TPostgresCredentialsRotationWithConnection } from "@app/ee/services/secret-rotation-v2/postgres-credentials";
-
-import { TOracleDBCredentialsRotationWithConnection } from "../../oracledb-credentials";
-import { SqlCredentialsRotationGeneratedCredentialsSchema } from "./sql-credentials-rotation-schemas";
+import { SqlCredentialsRotationGeneratedCredentialsSchema } from "@app/ee/services/secret-rotation-v2/shared/sql-credentials/sql-credentials-rotation-schemas";
 
 export type TSqlCredentialsRotationWithConnection =
   | TPostgresCredentialsRotationWithConnection