fix(oci): align block and tests with current CI contracts

Author: Bill Leoutsakos

apps/docs/openapi-v2-workflows.json

@@ -16912,6 +16912,8 @@
               "notion.pages",
               "netsuite.recordTypes",
               "netsuite.asyncTasks",
+              "oci_object_storage.buckets",
+              "oci_object_storage.objects",
               "pipedrive.pipelines",
               "sharepoint.lists",
               "trello.boards",
@@ -17094,6 +17096,8 @@
               "notion.pages",
               "netsuite.recordTypes",
               "netsuite.asyncTasks",
+              "oci_object_storage.buckets",
+              "oci_object_storage.objects",
               "pipedrive.pipelines",
               "sharepoint.lists",
               "trello.boards",

apps/sim/blocks/blocks/oci_object_storage.ts

@@ -3,7 +3,6 @@ import { getScopesForService } from '@/lib/oauth/utils'
 import type { BlockConfig, BlockMeta } from '@/blocks/types'
 import { AuthMode, IntegrationType } from '@/blocks/types'
 import { normalizeFileInput, parseOptionalNumberInput } from '@/blocks/utils'
-import type { OciObjectStorageResponse } from '@/tools/oci_object_storage/types'
 
 const OBJECT_OPERATIONS = [
   'oci_object_storage_upload_object',
@@ -22,7 +21,7 @@ const BUCKET_OPERATIONS = ['oci_object_storage_list_objects', ...OBJECT_OPERATIO
 
 const UPLOAD_SOURCE_FIELD = ['uploadFile', 'fileReference', 'content'] as const
 
-export const OciObjectStorageBlock: BlockConfig<OciObjectStorageResponse> = {
+export const OciObjectStorageBlock: BlockConfig = {
   type: 'oci_object_storage',
   name: 'OCI Object Storage',
   description: 'List, upload, download, inspect, and delete objects in Oracle Cloud',

apps/sim/lib/credentials/oci-object-storage-service-account.test.ts

@@ -3,12 +3,11 @@
  */
 import { ListBucketsCommand, S3Client } from '@aws-sdk/client-s3'
 import { credential } from '@sim/db/schema'
-import { queueTableRows, resetDbChainMock } from '@sim/testing'
+import { queueTableRows, resetDbChainMock } from '@sim/testing/mocks/database.mock'
+import { encryptionMock, encryptionMockFns } from '@sim/testing/mocks/encryption.mock'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-const mocks = vi.hoisted(() => ({ decryptSecret: vi.fn() }))
-
-vi.mock('@/lib/core/security/encryption', () => ({ decryptSecret: mocks.decryptSecret }))
+vi.mock('@/lib/core/security/encryption', () => encryptionMock)
 
 import {
   getOciObjectStorageServiceAccountSecret,
@@ -34,10 +33,8 @@ const storedBlob = JSON.stringify({
 
 describe('OCI Object Storage service-account credential', () => {
   beforeEach(() => {
-    vi.restoreAllMocks()
-    vi.clearAllMocks()
     resetDbChainMock()
-    mocks.decryptSecret.mockResolvedValue({ decrypted: storedBlob })
+    encryptionMockFns.mockDecryptSecret.mockReset().mockResolvedValue({ decrypted: storedBlob })
   })
 
   it('validates the connection with ListBuckets and derives the owner identity', async () => {
@@ -102,7 +99,7 @@ describe('OCI Object Storage service-account credential', () => {
       region: 'us-ashburn-1',
       ownerId: 'ocid1.user.oc1..owner',
     })
-    expect(mocks.decryptSecret).toHaveBeenCalledWith('ciphertext')
+    expect(encryptionMockFns.mockDecryptSecret).toHaveBeenCalledWith('ciphertext')
   })
 
   it('rejects a wrong provider before decrypting and rejects a wrong blob discriminator', async () => {
@@ -116,7 +113,7 @@ describe('OCI Object Storage service-account credential', () => {
     await expect(getOciObjectStorageServiceAccountSecret('credential-1')).rejects.toThrow(
       'OCI Object Storage credential not found'
     )
-    expect(mocks.decryptSecret).not.toHaveBeenCalled()
+    expect(encryptionMockFns.mockDecryptSecret).not.toHaveBeenCalled()
 
     resetDbChainMock()
     queueTableRows(credential, [
@@ -127,7 +124,7 @@ describe('OCI Object Storage service-account credential', () => {
         encryptedServiceAccountKey: 'ciphertext',
       },
     ])
-    mocks.decryptSecret.mockResolvedValue({
+    encryptionMockFns.mockDecryptSecret.mockResolvedValue({
       decrypted: storedBlob.replace(
         OCI_OBJECT_STORAGE_SERVICE_ACCOUNT_SECRET_TYPE,
         'atlassian_service_account'

apps/sim/lib/credentials/oci-object-storage-service-account.ts

@@ -63,7 +63,7 @@ export class OciObjectStorageCredentialError extends Error {
   }
 }
 
-export function normalizeOciObjectStorageCredentialFields(
+function normalizeOciObjectStorageCredentialFields(
   fields: OciObjectStorageCredentialFields
 ): OciObjectStorageCredentialFields {
   const accessKeyId = fields.accessKeyId.trim()

apps/sim/lib/internal/oci-object-storage/client.ts

@@ -9,7 +9,7 @@ import { OciObjectStorageOperationError } from '@/lib/internal/oci-object-storag
 export const OCI_LIST_BUCKETS_MAX_RESPONSE_BYTES = 8 * 1024 * 1024
 export const OCI_LIST_BUCKETS_MAX_RESULTS = 10_000
 
-export const OCI_OBJECT_STORAGE_COMMERCIAL_REGIONS = [
+const OCI_OBJECT_STORAGE_COMMERCIAL_REGIONS = [
   'af-casablanca-1',
   'af-johannesburg-1',
   'ap-batam-1',

apps/sim/lib/internal/oci-object-storage/execute-tool.test.ts

@@ -1,7 +1,8 @@
 /**
  * @vitest-environment node
  */
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { getMockLogger } from '@sim/testing/mocks/logger.mock'
+import { describe, expect, it, vi } from 'vitest'
 import { PayloadSizeLimitError } from '@/lib/core/utils/stream-limits'
 
 const mocks = vi.hoisted(() => ({
@@ -11,14 +12,8 @@ const mocks = vi.hoisted(() => ({
   downloadObject: vi.fn(),
   headObject: vi.fn(),
   deleteObject: vi.fn(),
-  logger: {
-    warn: vi.fn(),
-    error: vi.fn(),
-  },
 }))
 
-vi.mock('@sim/logger', () => ({ createLogger: () => mocks.logger }))
-
 vi.mock('@/lib/internal/oci-object-storage/operations', () => ({
   executeOciObjectStorageListBuckets: mocks.listBuckets,
   executeOciObjectStorageListObjects: mocks.listObjects,
@@ -37,6 +32,8 @@ import { ociObjectStorageListBucketsTool } from '@/tools/oci_object_storage/list
 import { ociObjectStorageListObjectsTool } from '@/tools/oci_object_storage/list_objects'
 import { ociObjectStorageUploadObjectTool } from '@/tools/oci_object_storage/upload_object'
 
+const logger = getMockLogger('OciObjectStorageToolExecution')
+
 function request(toolId: string, input: Record<string, unknown>) {
   return {
     toolId,
@@ -47,8 +44,6 @@ function request(toolId: string, input: Record<string, unknown>) {
 }
 
 describe('OCI Object Storage tool execution boundary', () => {
-  beforeEach(() => vi.clearAllMocks())
-
   it.each([
     [ociObjectStorageListBucketsTool, mocks.listBuckets],
     [ociObjectStorageListObjectsTool, mocks.listObjects],
@@ -58,6 +53,8 @@ describe('OCI Object Storage tool execution boundary', () => {
     [ociObjectStorageDeleteObjectTool, mocks.deleteObject],
   ] as const)('projects native workflow inputs for $0.id', async (tool, execute) => {
     execute.mockResolvedValue({ success: true, output: {} })
+    const mapParams = OciObjectStorageBlock.tools.config?.params
+    if (!mapParams) throw new Error('Expected OCI Object Storage block parameter mapping')
     for (const blank of [null, '', undefined]) {
       const raw = {
         operation: tool.id,
@@ -79,7 +76,7 @@ describe('OCI Object Storage tool execution boundary', () => {
         startAfter: blank,
         continuationToken: blank,
       }
-      const params = { ...raw, ...OciObjectStorageBlock.tools.config!.params!(raw) }
+      const params = { ...raw, ...mapParams(raw) }
       const response = await executeOciObjectStorageTool(
         request(tool.id, tool.operation.input(params))
       )
@@ -129,11 +126,11 @@ describe('OCI Object Storage tool execution boundary', () => {
       expect(body.error).toContain(text)
       expect(JSON.stringify(body)).not.toContain('secret-key-canary')
       if (status >= 500) {
-        expect(mocks.logger.error).toHaveBeenCalledOnce()
-        expect(mocks.logger.warn).not.toHaveBeenCalled()
+        expect(logger.error).toHaveBeenCalledOnce()
+        expect(logger.warn).not.toHaveBeenCalled()
       } else {
-        expect(mocks.logger.warn).toHaveBeenCalledOnce()
-        expect(mocks.logger.error).not.toHaveBeenCalled()
+        expect(logger.warn).toHaveBeenCalledOnce()
+        expect(logger.error).not.toHaveBeenCalled()
       }
     }
   )
@@ -156,8 +153,8 @@ describe('OCI Object Storage tool execution boundary', () => {
         success: false,
         error: 'Oracle Object Storage request failed',
       })
-      expect(mocks.logger.error).toHaveBeenCalledOnce()
-      expect(mocks.logger.warn).not.toHaveBeenCalled()
+      expect(logger.error).toHaveBeenCalledOnce()
+      expect(logger.warn).not.toHaveBeenCalled()
     }
   )
 

apps/sim/lib/internal/oci-object-storage/operations.test.ts

@@ -10,15 +10,21 @@ import {
   ListObjectsV2Command,
   PutObjectCommand,
 } from '@aws-sdk/client-s3'
+import {
+  fileUtilsServerMock,
+  fileUtilsServerMockFns,
+} from '@sim/testing/mocks/file-utils-server.mock'
+import { fileUtilsMock, fileUtilsMockFns } from '@sim/testing/mocks/file-utils.mock'
+import {
+  filesAuthorizationMock,
+  filesAuthorizationMockFns,
+} from '@sim/testing/mocks/files-authorization.mock'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { PayloadSizeLimitError } from '@/lib/core/utils/stream-limits'
 
 const mocks = vi.hoisted(() => ({
   send: vi.fn(),
   getSecret: vi.fn(),
-  assertToolFileAccess: vi.fn(),
-  processSingleFile: vi.fn(),
-  downloadServableFile: vi.fn(),
   attempts: vi.fn(),
 }))
 
@@ -38,15 +44,9 @@ vi.mock('@/lib/internal/oci-object-storage/client', () => ({
   sendOciListBuckets: (client: { send: typeof mocks.send }, signal?: AbortSignal) =>
     client.send(new ListBucketsCommand({}), { abortSignal: signal }),
 }))
-vi.mock('@/app/api/files/authorization', () => ({
-  assertToolFileAccess: mocks.assertToolFileAccess,
-}))
-vi.mock('@/lib/uploads/utils/file-utils', () => ({
-  processSingleFileToUserFile: mocks.processSingleFile,
-}))
-vi.mock('@/lib/uploads/utils/file-utils.server', () => ({
-  downloadServableFileFromStorage: mocks.downloadServableFile,
-}))
+vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock)
+vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock)
+vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock)
 
 import {
   executeOciObjectStorageDeleteObject,
@@ -57,20 +57,25 @@ import {
   executeOciObjectStorageUploadObject,
 } from '@/lib/internal/oci-object-storage/operations'
 
+const assertToolFileAccess = filesAuthorizationMockFns.mockAssertToolFileAccess
+const processSingleFile = fileUtilsMockFns.mockProcessSingleFileToUserFile
+const downloadServableFile = fileUtilsServerMockFns.mockDownloadServableFileFromStorage
+
 const credential = { credentialId: 'credential-1' }
 const object = { ...credential, bucketName: 'bucket-name', objectKey: 'folder/report.txt' }
 const context = { userId: 'user-1', requestId: 'request-1' }
 
 describe('OCI Object Storage operations', () => {
   beforeEach(() => {
-    vi.clearAllMocks()
+    assertToolFileAccess.mockReset()
+    processSingleFile.mockReset()
+    downloadServableFile.mockReset()
     mocks.getSecret.mockResolvedValue({
       accessKeyId: 'access',
       secretAccessKey: 'secret',
       namespace: 'namespace1',
       region: 'us-ashburn-1',
     })
-    mocks.assertToolFileAccess.mockResolvedValue(null)
   })
 
   it('maps empty and populated bucket listings with owner identity', async () => {
@@ -172,8 +177,8 @@ describe('OCI Object Storage operations', () => {
 
   it('authorizes a referenced file before reading and uploads exact-limit bytes', async () => {
     const file = { name: 'report.txt', key: 'workspace/file-1', size: 5, type: 'text/plain' }
-    mocks.processSingleFile.mockReturnValue(file)
-    mocks.downloadServableFile.mockResolvedValue({
+    processSingleFile.mockReturnValue(file)
+    downloadServableFile.mockResolvedValue({
       buffer: Buffer.from('12345'),
       contentType: 'text/plain',
     })
@@ -184,16 +189,16 @@ describe('OCI Object Storage operations', () => {
       context
     )
 
-    expect(mocks.assertToolFileAccess).toHaveBeenCalledWith(
+    expect(assertToolFileAccess).toHaveBeenCalledWith(
       'workspace/file-1',
       'user-1',
       'request-1',
       expect.anything()
     )
-    expect(mocks.assertToolFileAccess.mock.invocationCallOrder[0]).toBeLessThan(
-      mocks.downloadServableFile.mock.invocationCallOrder[0]
+    expect(assertToolFileAccess.mock.invocationCallOrder[0]).toBeLessThan(
+      downloadServableFile.mock.invocationCallOrder[0]
     )
-    expect(mocks.downloadServableFile).toHaveBeenCalledWith(file, 'request-1', expect.anything(), {
+    expect(downloadServableFile).toHaveBeenCalledWith(file, 'request-1', expect.anything(), {
       maxBytes: 5,
       signal: undefined,
     })
@@ -219,9 +224,9 @@ describe('OCI Object Storage operations', () => {
         { requestId: 'request-1' }
       )
     ).rejects.toMatchObject({ status: 401, message: 'Authentication required' })
-    expect(mocks.processSingleFile).not.toHaveBeenCalled()
-    expect(mocks.assertToolFileAccess).not.toHaveBeenCalled()
-    expect(mocks.downloadServableFile).not.toHaveBeenCalled()
+    expect(processSingleFile).not.toHaveBeenCalled()
+    expect(assertToolFileAccess).not.toHaveBeenCalled()
+    expect(downloadServableFile).not.toHaveBeenCalled()
     expect(mocks.send).not.toHaveBeenCalled()
   })
 
@@ -232,15 +237,15 @@ describe('OCI Object Storage operations', () => {
       size: 6,
       type: 'application/octet-stream',
     }
-    mocks.processSingleFile.mockReturnValue(file)
-    mocks.downloadServableFile.mockRejectedValue(
+    processSingleFile.mockReturnValue(file)
+    downloadServableFile.mockRejectedValue(
       new PayloadSizeLimitError({ label: 'OCI file upload', maxBytes: 5, observedBytes: 6 })
     )
 
     await expect(
       executeOciObjectStorageUploadObject({ ...object, file: file as never }, context)
     ).rejects.toBeInstanceOf(PayloadSizeLimitError)
-    expect(mocks.assertToolFileAccess).toHaveBeenCalledOnce()
+    expect(assertToolFileAccess).toHaveBeenCalledOnce()
     expect(mocks.send).not.toHaveBeenCalled()
   })
 

apps/sim/lib/internal/oci-object-storage/schema.ts

@@ -2,8 +2,8 @@ import { z } from 'zod'
 import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types'
 import { RawFileInputSchema } from '@/lib/uploads/utils/file-schemas'
 
-export const OCI_BUCKET_NAME_MAX_LENGTH = 256
-export const OCI_OBJECT_NAME_MAX_BYTES = 1_024
+const OCI_BUCKET_NAME_MAX_LENGTH = 256
+const OCI_OBJECT_NAME_MAX_BYTES = 1_024
 export const OCI_CONTINUATION_TOKEN_MAX_LENGTH = 1_024
 
 const OCI_BUCKET_NAME_PATTERN = /^[A-Za-z0-9._-]+$/

apps/sim/lib/selectors/server/providers/oci-object-storage.test.ts

@@ -71,7 +71,6 @@ async function prepare(input: ExecuteServerSelectorArgs) {
 
 describe('OCI Object Storage selectors', () => {
   beforeEach(() => {
-    vi.clearAllMocks()
     mocks.getSecret.mockResolvedValue({
       accessKeyId: 'access-key-canary',
       secretAccessKey: 'secret-key-canary',