fix(oracle-epm-data): preserve provider names and nested errors

Author: Bill Leoutsakos

apps/sim/lib/internal/oracle-epm-data/contracts.ts

@@ -177,7 +177,12 @@ export const oracleEpmDataConnectionsSchema = oracleEpmDataStatusResponseSchema.
     .array(z.object({ connectionName: text, refUrl: text }))
     .max(ORACLE_EPM_DATA_MAX_ITEMS),
 })
-export const oracleEpmDataConnectionSchema = oracleEpmDataStatusResponseSchema.extend({
+export const oracleEpmDataConnectionStatusResponseSchema = oracleEpmDataStatusResponseSchema.extend(
+  {
+    response: z.object({ status: oracleEpmDataStatusSchema }),
+  }
+)
+export const oracleEpmDataConnectionSchema = oracleEpmDataConnectionStatusResponseSchema.extend({
   response: z.object({
     status: oracleEpmDataStatusSchema,
     sourceSystemId: id,

apps/sim/lib/internal/oracle-epm-data/operations.test.ts

@@ -97,18 +97,25 @@ describe('Data Integration provider operations', () => {
     })
   })
 
-  it('does not turn a nested connection failure into success', async () => {
-    mocks.request.mockResolvedValue({
-      status: 200,
-      data: { ...status, response: { ...connection, status: 1 } },
-    })
-    expect(
-      await operations.executeOracleEpmDataGetConnectionOperation({
-        ...auth,
-        connectionName: 'Source',
+  it.each([{ ...connection, status: 1 }, { status: 1 }])(
+    'preserves nested connection errors without requiring success-only fields: %j',
+    async (response) => {
+      mocks.request.mockResolvedValue({
+        status: 200,
+        data: { ...status, response },
       })
-    ).toMatchObject({ success: false })
-  })
+      expect(
+        await operations.executeOracleEpmDataGetConnectionOperation({
+          ...auth,
+          connectionName: 'Source',
+        })
+      ).toMatchObject({
+        success: false,
+        output: { httpStatus: 200, connection: { status: 1 } },
+        error: 'Oracle EPM connection returned status 1',
+      })
+    }
+  )
 
   it('updates exactly the documented connection option array', async () => {
     mocks.request.mockResolvedValue({
@@ -130,6 +137,29 @@ describe('Data Integration provider operations', () => {
     })
   })
 
+  it('round-trips raw connection and POV names to the declared request unchanged', async () => {
+    mocks.request.mockResolvedValueOnce({ status: 200, data: { ...status, response: connection } })
+    await operations.executeOracleEpmDataGetConnectionOperation({
+      ...auth,
+      connectionName: ' Source ',
+    })
+    expect(mocks.request.mock.calls[0][1].pathParams).toEqual({ connectionName: ' Source ' })
+    mocks.request.mockResolvedValueOnce({ status: 200, data: { ...status, response: [] } })
+    await operations.executeOracleEpmDataGetPovStatusOperation({
+      ...auth,
+      application: ' Plan ',
+      locationName: ' Source ',
+      period: ' Jan-26 ',
+      category: ' Actual ',
+    })
+    expect(mocks.request.mock.calls[1][1].query).toEqual({
+      application: ' Plan ',
+      location: ' Source ',
+      period: ' Jan-26 ',
+      category: ' Actual ',
+    })
+  })
+
   it('gets a documented pipeline definition with nullable variables', async () => {
     const pipeline = {
       name: 'Load26',

apps/sim/lib/internal/oracle-epm-data/operations/get-connection.ts

@@ -1,6 +1,7 @@
 import {
   executeOracleEpmDataOperation,
   oracleEpmDataConnectionSchema,
+  oracleEpmDataConnectionStatusResponseSchema,
   oracleEpmDataEndpoints,
   oracleEpmDataStatusResponseSchema,
   projectOracleEpmDataResult,
@@ -19,7 +20,7 @@ export const executeOracleEpmDataGetConnectionOperation: InternalToolOperationIm
     })
     const envelope = oracleEpmDataStatusResponseSchema.parse(response.data)
     if (envelope.status === 0) {
-      const connection = oracleEpmDataConnectionSchema.parse(response.data).response
+      const connection = oracleEpmDataConnectionStatusResponseSchema.parse(response.data).response
       if (connection.status !== 0) {
         return {
           success: false,

apps/sim/lib/internal/oracle-epm-data/schema.test.ts

@@ -39,6 +39,35 @@ describe('Data Integration inputs', () => {
     expect(input).not.toHaveProperty('waitForCompletion')
   })
 
+  it('preserves nonblank provider names while keeping credentials, IDs and control values normalized', () => {
+    expect(
+      schemas.get_connection.parse({
+        ...auth,
+        oauthCredential: ' credential ',
+        connectionName: ' Source ',
+      })
+    ).toMatchObject({ oauthCredential: 'credential', connectionName: ' Source ' })
+    expect(schemas.get_job_status.parse({ ...auth, jobId: ' 42 ' }).jobId).toBe('42')
+    expect(
+      schemas.run_integration.parse({
+        ...auth,
+        jobName: ' Load ',
+        periodName: ' {Jan-26} ',
+        importMode: ' Direct ',
+        exportMode: ' Merge ',
+      })
+    ).toMatchObject({
+      jobName: ' Load ',
+      periodName: ' {Jan-26} ',
+      importMode: 'Direct',
+      exportMode: 'Merge',
+    })
+    expect(schemas.get_connection.safeParse({ ...auth, connectionName: '  ' }).success).toBe(false)
+    expect(
+      schemas.get_pov_status.safeParse({ ...auth, period: '  ', category: 'Actual' }).success
+    ).toBe(false)
+  })
+
   it.each(['x', 'pipeline-code', 'a'.repeat(31)])(
     'rejects invalid pipeline code %s',
     (pipelineCode) => {

apps/sim/lib/internal/oracle-epm-data/schema.ts

@@ -2,8 +2,18 @@ import { z } from 'zod'
 import { isUserFileWithMetadata } from '@/lib/core/utils/user-file'
 import type { UserFile } from '@/executor/types'
 
-const name = z.string().trim().min(1).max(255)
-const period = z.string().trim().min(1).max(1024)
+const identifier = z.string().trim().min(1).max(255)
+/** Configured provider names must round-trip unchanged from selectors to requests. */
+const name = z
+  .string()
+  .min(1)
+  .max(255)
+  .refine((value) => value.trim().length > 0, 'Name is required')
+const period = z
+  .string()
+  .min(1)
+  .max(1024)
+  .refine((value) => value.trim().length > 0, 'Period is required')
 /** Preserve provider filenames, including meaningful spaces and literal percent signs. */
 const fileName = z
   .string()
@@ -12,7 +22,7 @@ const fileName = z
   .refine((value) => value.trim().length > 0, 'File name is required')
 const optionalName = name.optional()
 const auth = {
-  oauthCredential: name,
+  oauthCredential: identifier,
   accessToken: z.string().min(1).max(4096),
   instanceUrl: z.string().min(1).max(4096),
 }
@@ -31,9 +41,9 @@ export const oracleEpmDataSchemas = {
   get_connection: z.object({ ...auth, connectionName: name }),
   update_connection: z.object({
     ...auth,
-    sourceSystemId: name,
+    sourceSystemId: identifier,
     sourceSystemName: name,
-    sourceSystemType: name,
+    sourceSystemType: identifier,
     sourceSystemOptions: z
       .array(z.object({ optionName: name, optionValue: z.string().max(65_536) }))
       .min(1)
@@ -45,8 +55,8 @@ export const oracleEpmDataSchemas = {
     ...auth,
     jobName: name,
     periodName: period,
-    importMode: name,
-    exportMode: name,
+    importMode: identifier,
+    exportMode: identifier,
     fileName: fileName.optional(),
     executionMode: z.enum(['SYNC', 'ASYNC']).optional(),
     sourceFilters: options.optional(),
@@ -74,7 +84,7 @@ export const oracleEpmDataSchemas = {
   get_job_status: z.object({
     ...auth,
     ...wait,
-    jobId: name.regex(/^[1-9]\d*$/, 'A positive Oracle job ID is required'),
+    jobId: identifier.regex(/^[1-9]\d*$/, 'A positive Oracle job ID is required'),
   }),
   execute_report: z.object({
     ...auth,

apps/sim/lib/selectors/server/providers/oracle-epm-data.test.ts

@@ -188,6 +188,16 @@ describe('Data Integration server selectors', () => {
     )
   })
 
+  it('preserves exact configured connection names in selector IDs', async () => {
+    mocks.connections.mockResolvedValue({
+      success: true,
+      output: { connections: [{ connectionName: ' Source ', refUrl: '/unused' }] },
+    })
+    expect(await attachments['oracle_epm_data.connections'].execute(args(), auth)).toMatchObject({
+      items: [{ id: ' Source ', label: ' Source ' }],
+    })
+  })
+
   it.each([
     [401, new SelectorConnectionUnavailableError(401)],
     [403, new SelectorConnectionUnavailableError(403)],