fix(eloqua): align integration with staging CI contracts

Author: Bill Leoutsakos

apps/docs/openapi-v2-workflows.json

@@ -16894,6 +16894,11 @@
               "confluence.spaces",
               "confluence.spacesById",
               "confluence.pages",
+              "eloqua.campaigns",
+              "eloqua.contactLists",
+              "eloqua.emails",
+              "eloqua.forms",
+              "eloqua.segments",
               "google.tasks.lists",
               "gmail.labels",
               "google.calendar",
@@ -17076,6 +17081,11 @@
               "confluence.spaces",
               "confluence.spacesById",
               "confluence.pages",
+              "eloqua.campaigns",
+              "eloqua.contactLists",
+              "eloqua.emails",
+              "eloqua.forms",
+              "eloqua.segments",
               "google.tasks.lists",
               "gmail.labels",
               "google.calendar",

apps/sim/blocks/blocks/eloqua.ts

@@ -7,7 +7,6 @@ import {
   parseOptionalJsonInput,
   parseOptionalNumberInput,
 } from '@/blocks/utils'
-import type { EloquaResponse } from '@/tools/eloqua/types'
 
 const APPLICATION_LIST_OPERATIONS = [
   'list_contacts',
@@ -169,7 +168,7 @@ function bulkPageParams(
   }
 }
 
-export const EloquaBlock: BlockConfig<EloquaResponse> = {
+export const EloquaBlock: BlockConfig = {
   type: 'eloqua',
   name: 'Oracle Eloqua',
   description: 'Manage Eloqua contacts, accounts, marketing assets, and Bulk API syncs',

apps/sim/lib/oauth/eloqua.test.ts

@@ -1,7 +1,7 @@
 /**
  * @vitest-environment node
  */
-import { afterEach, describe, expect, it, vi } from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
 import {
   ELOQUA_IDENTITY_URL,
   ELOQUA_OAUTH_TOKEN_URL,
@@ -13,8 +13,6 @@ import {
 } from '@/lib/oauth/eloqua'
 
 describe('Eloqua OAuth and instance discovery', () => {
-  afterEach(() => vi.unstubAllGlobals())
-
   it('exchanges a code with a Basic-authenticated JSON request', async () => {
     const fetchMock = vi.fn().mockResolvedValue(
       Response.json({

apps/sim/lib/selectors/server/providers/eloqua.test.ts

@@ -1,27 +1,28 @@
 /**
  * @vitest-environment node
  */
-import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'
+import { authOAuthUtilsMock, authOAuthUtilsMockFns } from '@sim/testing/mocks/auth-oauth-utils.mock'
+import {
+  selectorCredentialBundleMock,
+  selectorCredentialBundleMockFns,
+} from '@sim/testing/mocks/selector-credential-bundle.mock'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-const { mockFetch, mockGetCredential, mockResolveSelectorCredentialBundle } = vi.hoisted(() => ({
-  mockFetch: vi.fn(),
-  mockGetCredential: vi.fn(),
-  mockResolveSelectorCredentialBundle: vi.fn(),
-}))
+const mockFetch = vi.hoisted(() => vi.fn())
 
-vi.mock('@/lib/oauth/credential-service', () => ({
-  getCredential: mockGetCredential,
-}))
+vi.mock('@/lib/oauth/credential-service', () => authOAuthUtilsMock)
 
-vi.mock('@/lib/selectors/server/providers/credential-bundle', () => ({
-  resolveSelectorCredentialBundle: mockResolveSelectorCredentialBundle,
-}))
+vi.mock('@/lib/selectors/server/providers/credential-bundle', () => selectorCredentialBundleMock)
 
 import { SelectorConnectionUnavailableError } from '@/lib/selectors/server/errors'
 import { createSelectorProtectedValues } from '@/lib/selectors/server/protected-values'
 import { eloquaSelectorAttachments } from '@/lib/selectors/server/providers/eloqua'
 import type { ExecuteServerSelectorArgs } from '@/lib/selectors/server/types'
 
+const mockGetCredential = authOAuthUtilsMockFns.mockGetCredential
+const mockResolveSelectorCredentialBundle =
+  selectorCredentialBundleMockFns.mockResolveSelectorCredentialBundle
+
 function args(
   request: ExecuteServerSelectorArgs['request'],
   selectorKey: ExecuteServerSelectorArgs['selectorKey'] = 'eloqua.campaigns',
@@ -55,7 +56,9 @@ function args(
 
 describe('Oracle Eloqua server selector adapter', () => {
   beforeEach(() => {
-    vi.clearAllMocks()
+    mockFetch.mockReset()
+    mockGetCredential.mockReset()
+    mockResolveSelectorCredentialBundle.mockReset()
     vi.stubGlobal('fetch', mockFetch)
     mockGetCredential.mockResolvedValue({
       providerId: 'eloqua',
@@ -66,8 +69,6 @@ describe('Oracle Eloqua server selector adapter', () => {
     })
   })
 
-  afterAll(() => vi.unstubAllGlobals())
-
   it('binds the credential pod, escapes prefix search, and paginates on demand', async () => {
     mockFetch
       .mockResolvedValueOnce(

apps/sim/tools/eloqua/utils.ts

@@ -1,4 +1,3 @@
-import { truncate } from '@sim/utils/string'
 import { normalizeEloquaInstanceUrl } from '@/lib/oauth/eloqua'
 import type {
   EloquaApplicationResource,
@@ -14,7 +13,7 @@ export const ELOQUA_OAUTH_CONFIG = {
   authoritativeParams: ['instanceUrl'],
 } as const satisfies OAuthConfig
 
-export const ELOQUA_MAX_INLINE_IMPORT_BYTES = 10 * 1024 * 1024
+const ELOQUA_MAX_INLINE_IMPORT_BYTES = 10 * 1024 * 1024
 
 export const ELOQUA_AUTH_PARAMS: ToolConfig['params'] = {
   accessToken: {
@@ -123,7 +122,7 @@ const ELOQUA_APPLICATION_COMMON_PROPERTIES: Record<string, ToolOutputProperty> =
   depth: stringField('Response detail depth'),
 }
 
-export const ELOQUA_APPLICATION_RESOURCE_PROPERTIES: Record<
+const ELOQUA_APPLICATION_RESOURCE_PROPERTIES: Record<
   EloquaApplicationResource,
   Record<string, ToolOutputProperty>
 > = {
@@ -676,8 +675,3 @@ export async function eloquaJsonObject(response: Response, label: string) {
   }
   return requireEloquaObject(value, `${label} response`)
 }
-
-export function boundedProviderMessage(value: unknown): string | undefined {
-  if (typeof value !== 'string' || !value.trim()) return undefined
-  return truncate(value.trim(), 2_000)
-}

packages/sim-cli/src/generated/v2-api.ts

@@ -6282,6 +6282,11 @@ export type GetSelectorBody = {
     | 'confluence.spaces'
     | 'confluence.spacesById'
     | 'confluence.pages'
+    | 'eloqua.campaigns'
+    | 'eloqua.contactLists'
+    | 'eloqua.emails'
+    | 'eloqua.forms'
+    | 'eloqua.segments'
     | 'google.tasks.lists'
     | 'gmail.labels'
     | 'google.calendar'
@@ -9085,6 +9090,11 @@ export type ListSelectorBody = {
     | 'confluence.spaces'
     | 'confluence.spacesById'
     | 'confluence.pages'
+    | 'eloqua.campaigns'
+    | 'eloqua.contactLists'
+    | 'eloqua.emails'
+    | 'eloqua.forms'
+    | 'eloqua.segments'
     | 'google.tasks.lists'
     | 'gmail.labels'
     | 'google.calendar'
@@ -17102,6 +17112,11 @@ export const V2_OPERATIONS = {
           'confluence.spaces',
           'confluence.spacesById',
           'confluence.pages',
+          'eloqua.campaigns',
+          'eloqua.contactLists',
+          'eloqua.emails',
+          'eloqua.forms',
+          'eloqua.segments',
           'google.tasks.lists',
           'gmail.labels',
           'google.calendar',
@@ -19192,6 +19207,11 @@ export const V2_OPERATIONS = {
           'confluence.spaces',
           'confluence.spacesById',
           'confluence.pages',
+          'eloqua.campaigns',
+          'eloqua.contactLists',
+          'eloqua.emails',
+          'eloqua.forms',
+          'eloqua.segments',
           'google.tasks.lists',
           'gmail.labels',
           'google.calendar',