fix(selectors): support legacy BigQuery project ids

Author: Bill Leoutsakos

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

@@ -19,6 +19,16 @@ import type { ExecuteServerSelectorArgs } from '@/lib/selectors/server/types'
 const PROJECT_ID = 'selector-test'
 const DATASET_ID = 'analytics'
 
+interface DatasetFixture {
+  datasetReference: { projectId: string; datasetId: string }
+  friendlyName: string
+}
+
+interface TableFixture {
+  tableReference: { projectId: string; datasetId: string; tableId: string }
+  friendlyName: string
+}
+
 function args(
   selectorKey: 'bigquery.datasets' | 'bigquery.tables',
   request: ExecuteServerSelectorArgs['request']
@@ -41,14 +51,14 @@ function args(
   }
 }
 
-function dataset(datasetId: string, friendlyName: string) {
+function dataset(datasetId: string, friendlyName: string, projectId = PROJECT_ID): DatasetFixture {
   return {
-    datasetReference: { projectId: PROJECT_ID, datasetId },
+    datasetReference: { projectId, datasetId },
     friendlyName,
   }
 }
 
-function table(tableId: string, friendlyName: string) {
+function table(tableId: string, friendlyName: string): TableFixture {
   return {
     tableReference: { projectId: PROJECT_ID, datasetId: DATASET_ID, tableId },
     friendlyName,
@@ -150,22 +160,28 @@ describe('BigQuery server selector adapters', () => {
     expect(mockFetch).toHaveBeenCalledTimes(2)
   })
 
-  it('hydrates a selected dataset directly by id', async () => {
+  it('hydrates a selected dataset in a legacy domain-scoped project directly by id', async () => {
+    const projectId = 'example.com:selector-test'
     mockFetch.mockResolvedValueOnce(
-      new Response(JSON.stringify(dataset('saved_dataset', 'Saved Dataset')), { status: 200 })
+      new Response(JSON.stringify(dataset('saved_dataset', 'Saved Dataset', projectId)), {
+        status: 200,
+      })
     )
 
+    const detailArgs = args('bigquery.datasets', { kind: 'detail', id: 'saved_dataset' })
+    detailArgs.context.projectId = projectId
+
     await expect(
-      bigQuerySelectorAttachments['bigquery.datasets'].execute(
-        args('bigquery.datasets', { kind: 'detail', id: 'saved_dataset' })
-      )
+      bigQuerySelectorAttachments['bigquery.datasets'].execute(detailArgs)
     ).resolves.toEqual({
       kind: 'detail',
       item: { id: 'saved_dataset', label: 'Saved Dataset' },
     })
 
     const url = new URL(String(mockFetch.mock.calls[0]?.[0]))
-    expect(url.pathname).toBe(`/bigquery/v2/projects/${PROJECT_ID}/datasets/saved_dataset`)
+    expect(url.pathname).toBe(
+      '/bigquery/v2/projects/example.com%3Aselector-test/datasets/saved_dataset'
+    )
     expect(url.searchParams.get('datasetView')).toBe('METADATA')
     expect(mockFetch).toHaveBeenCalledTimes(1)
   })

apps/sim/lib/selectors/server/providers/bigquery.ts

@@ -17,14 +17,16 @@ import {
   listSelectorResult,
   requireListRequest,
   type ServerSelectorAttachmentMap,
+  type ServerSelectorExecutionResult,
 } from '@/lib/selectors/server/types'
 
 type BigQuerySelectorKey = Extract<ServerSelectorKey, 'bigquery.datasets' | 'bigquery.tables'>
 
 const BIGQUERY_PAGE_SIZE = 200
 const BIGQUERY_CURSOR_MAX_LENGTH = 4_096
 const BIGQUERY_SCOPES = getScopesForService('google-bigquery')
-const PROJECT_ID_PATTERN = /^[a-z][a-z0-9-]{4,28}[a-z0-9]$/
+/** Standard project IDs plus Google's legacy `domain.tld:project-id` form. */
+const PROJECT_ID_PATTERN = /^([a-z][a-z0-9.-]{0,61}[a-z0-9]:)?[a-z][a-z0-9-]{4,28}[a-z0-9]$/
 const DATASET_ID_PATTERN = /^[A-Za-z0-9_]{1,1024}$/
 const TABLE_ID_PATTERN = /^[\p{L}\p{M}\p{N}\p{Pc}\p{Pd}\p{Zs}]+$/u
 
@@ -67,7 +69,9 @@ const tablesPageSchema = z.object({
   nextPageToken: z.string().min(1).max(4_096).optional(),
 })
 
-function requireCredential(args: ExecuteServerSelectorArgs) {
+function requireCredential(
+  args: ExecuteServerSelectorArgs
+): NonNullable<ExecuteServerSelectorArgs['credential']> {
   if (!args.credential) throw new SelectorConnectionUnavailableError()
   return args.credential
 }
@@ -108,14 +112,16 @@ async function getAccessToken(args: ExecuteServerSelectorArgs): Promise<string>
   })
 }
 
-function requestHeaders(accessToken: string) {
+function requestHeaders(accessToken: string): Record<string, string> {
   return {
     Authorization: `Bearer ${accessToken}`,
     Accept: 'application/json',
   }
 }
 
-async function listDatasets(args: ExecuteServerSelectorArgs) {
+async function listDatasets(
+  args: ExecuteServerSelectorArgs
+): Promise<ServerSelectorExecutionResult> {
   const request = requireListRequest(args.selectorKey, args.request)
   const projectId = requireProjectId(args.context.projectId)
   const cursor = requireCursor(request.cursor)
@@ -146,7 +152,7 @@ async function listDatasets(args: ExecuteServerSelectorArgs) {
   )
 }
 
-async function listTables(args: ExecuteServerSelectorArgs) {
+async function listTables(args: ExecuteServerSelectorArgs): Promise<ServerSelectorExecutionResult> {
   const request = requireListRequest(args.selectorKey, args.request)
   const projectId = requireProjectId(args.context.projectId)
   const datasetId = requireDatasetId(args.context.datasetId)
@@ -183,7 +189,7 @@ async function listTables(args: ExecuteServerSelectorArgs) {
   )
 }
 
-async function getDataset(args: ExecuteServerSelectorArgs) {
+async function getDataset(args: ExecuteServerSelectorArgs): Promise<ServerSelectorExecutionResult> {
   if (args.request.kind !== 'detail') throw new SelectorOptionsUnavailableError()
   const projectId = requireProjectId(args.context.projectId)
   const datasetId = requireDatasetId(args.request.id)
@@ -218,7 +224,7 @@ async function getDataset(args: ExecuteServerSelectorArgs) {
   })
 }
 
-async function getTable(args: ExecuteServerSelectorArgs) {
+async function getTable(args: ExecuteServerSelectorArgs): Promise<ServerSelectorExecutionResult> {
   if (args.request.kind !== 'detail') throw new SelectorOptionsUnavailableError()
   const projectId = requireProjectId(args.context.projectId)
   const datasetId = requireDatasetId(args.context.datasetId)