diff --git a/backend/src/ee/services/app-connections/oracledb/oracledb-connection-fns.ts b/backend/src/ee/services/app-connections/oracledb/oracledb-connection-fns.ts index c1012ed6e..97ce64b11 100644 --- a/backend/src/ee/services/app-connections/oracledb/oracledb-connection-fns.ts +++ b/backend/src/ee/services/app-connections/oracledb/oracledb-connection-fns.ts @@ -7,6 +7,6 @@ export const getOracleDBConnectionListItem = () => { name: "OracleDB" as const, app: AppConnection.OracleDB as const, methods: Object.values(OracleDBConnectionMethod) as [OracleDBConnectionMethod.UsernameAndPassword], - supportsPlatformManagement: true as const // TODO(andrey): Explore if possible + supportsPlatformManagement: true as const }; }; diff --git a/backend/src/services/app-connection/app-connection-fns.ts b/backend/src/services/app-connection/app-connection-fns.ts index be62303b6..f095bda02 100644 --- a/backend/src/services/app-connection/app-connection-fns.ts +++ b/backend/src/services/app-connection/app-connection-fns.ts @@ -288,7 +288,7 @@ export const TRANSITION_CONNECTION_CREDENTIALS_TO_PLATFORM: Record< [AppConnection.LDAP]: platformManagedCredentialsNotSupported, // we could support this in the future [AppConnection.TeamCity]: platformManagedCredentialsNotSupported, [AppConnection.OCI]: platformManagedCredentialsNotSupported, - [AppConnection.OracleDB]: platformManagedCredentialsNotSupported, // TODO(andrey): If managed credentials change this + [AppConnection.OracleDB]: transferSqlConnectionCredentialsToPlatform as TAppConnectionTransitionCredentialsToPlatform, [AppConnection.OnePass]: platformManagedCredentialsNotSupported }; diff --git a/backend/src/services/app-connection/shared/sql/sql-connection-fns.ts b/backend/src/services/app-connection/shared/sql/sql-connection-fns.ts index 9a7f1d199..91f2b4d79 100644 --- a/backend/src/services/app-connection/shared/sql/sql-connection-fns.ts +++ b/backend/src/services/app-connection/shared/sql/sql-connection-fns.ts @@ -60,7 +60,14 @@ const getConnectionConfig = ({ } // TODO(andrey): Might be interesting for later case AppConnection.OracleDB: { - return {}; + return { + ssl: sslEnabled + ? { + sslCA: sslCertificate, + sslServerDNMatch: sslRejectUnauthorized + } + : false + }; } default: throw new Error(`Unhandled SQL Connection Config: ${app as AppConnection}`); diff --git a/frontend/src/helpers/appConnections.ts b/frontend/src/helpers/appConnections.ts index 376a1e814..e32e47a29 100644 --- a/frontend/src/helpers/appConnections.ts +++ b/frontend/src/helpers/appConnections.ts @@ -68,7 +68,7 @@ export const APP_CONNECTION_MAP: Record< [AppConnection.Postgres]: { name: "PostgreSQL", image: "Postgres.png" }, [AppConnection.MsSql]: { name: "Microsoft SQL Server", image: "MsSql.png" }, [AppConnection.MySql]: { name: "MySQL", image: "MySql.png" }, - [AppConnection.OracleDB]: { name: "OracleDB", image: "Oracle.png" }, + [AppConnection.OracleDB]: { name: "OracleDB", image: "Oracle.png", enterprise: true }, [AppConnection.Camunda]: { name: "Camunda", image: "Camunda.png" }, [AppConnection.Windmill]: { name: "Windmill", image: "Windmill.png" }, [AppConnection.Auth0]: { name: "Auth0", image: "Auth0.png", size: 40 }, diff --git a/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/OracleDBConnectionForm.tsx b/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/OracleDBConnectionForm.tsx index a6cca6a23..25dded675 100644 --- a/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/OracleDBConnectionForm.tsx +++ b/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/OracleDBConnectionForm.tsx @@ -51,7 +51,7 @@ export const OracleDBConnectionForm = ({ appConnection, onSubmit }: Props) => { credentials: { host: "", port: 1521, - database: "FREEPDB1", + database: "ORCL", // Typically FREEPDB1 or ORCL username: "", // Typically pdbadmin or ADMIN password: "", sslEnabled: true,