Skip to content

Commit d329cc2

Browse files
Bill LeoutsakosBill Leoutsakos
Bill Leoutsakos
authored and
Bill Leoutsakos
committed
fix(selectors): resolve shared references server-side
1 parent 27a608e commit d329cc2

47 files changed

Lines changed: 2253 additions & 517 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/sim/app/api/tools/cloudwatch/describe-log-groups/route.ts‎

Lines changed: 7 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
1-
import { DescribeLogGroupsCommand } from '@aws-sdk/client-cloudwatch-logs'
21
import { createLogger } from '@sim/logger'
32
import { toError } from '@sim/utils/errors'
43
import { type NextRequest, NextResponse } from 'next/server'
54
import { cloudwatchLogGroupsSelectorContract } from '@/lib/api/contracts/selectors/cloudwatch'
65
import { parseToolRequest } from '@/lib/api/server'
76
import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
87
import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
9-
import { createCloudWatchLogsClient } from '@/app/api/tools/cloudwatch/utils'
8+
import { createCloudWatchLogsClient, describeLogGroups } from '@/app/api/tools/cloudwatch/utils'
109

1110
const logger = createLogger('CloudWatchDescribeLogGroups')
1211

13-
/** AWS DescribeLogGroups caps `limit` at 50 items per page. */
14-
const LOG_GROUPS_PAGE_SIZE = 50
15-
16-
/** Upper bound on pages drained to avoid unbounded loops on very large accounts. */
17-
const MAX_LOG_GROUPS_PAGES = 20
18-
1912
export const POST = withRouteHandler(async (request: NextRequest) => {
2013
try {
2114
const auth = await checkSessionOrInternalAuth(request)
@@ -39,58 +32,16 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
3932
})
4033

4134
try {
42-
const totalLimit = validatedData.limit
43-
const logGroups: {
44-
logGroupName: string
45-
arn: string
46-
storedBytes: number
47-
retentionInDays: number | undefined
48-
creationTime: number | undefined
49-
}[] = []
50-
let nextToken: string | undefined
51-
52-
for (let page = 0; page < MAX_LOG_GROUPS_PAGES; page++) {
53-
const pageLimit =
54-
totalLimit !== undefined
55-
? Math.min(LOG_GROUPS_PAGE_SIZE, totalLimit - logGroups.length)
56-
: LOG_GROUPS_PAGE_SIZE
57-
58-
const command = new DescribeLogGroupsCommand({
59-
...(validatedData.prefix && { logGroupNamePrefix: validatedData.prefix }),
60-
limit: pageLimit,
61-
...(nextToken && { nextToken }),
62-
})
63-
64-
const response = await client.send(command)
65-
66-
for (const lg of response.logGroups ?? []) {
67-
logGroups.push({
68-
logGroupName: lg.logGroupName ?? '',
69-
arn: lg.arn ?? '',
70-
storedBytes: lg.storedBytes ?? 0,
71-
retentionInDays: lg.retentionInDays,
72-
creationTime: lg.creationTime,
73-
})
74-
}
75-
76-
nextToken = response.nextToken
77-
if (!nextToken) break
78-
if (totalLimit !== undefined && logGroups.length >= totalLimit) break
79-
80-
if (page === MAX_LOG_GROUPS_PAGES - 1) {
81-
logger.warn(
82-
`DescribeLogGroups hit pagination cap of ${MAX_LOG_GROUPS_PAGES} pages; log group list may be incomplete`
83-
)
84-
}
85-
}
86-
87-
const cappedLogGroups = totalLimit !== undefined ? logGroups.slice(0, totalLimit) : logGroups
35+
const result = await describeLogGroups(client, {
36+
prefix: validatedData.prefix,
37+
limit: validatedData.limit,
38+
})
8839

89-
logger.info(`Successfully described ${cappedLogGroups.length} log groups`)
40+
logger.info(`Successfully described ${result.logGroups.length} log groups`)
9041

9142
return NextResponse.json({
9243
success: true,
93-
output: { logGroups: cappedLogGroups },
44+
output: { logGroups: result.logGroups },
9445
})
9546
} finally {
9647
client.destroy()

‎apps/sim/app/api/tools/cloudwatch/selector-log-groups/route.ts‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
import { createLogger } from '@sim/logger'
2+
import { type NextRequest, NextResponse } from 'next/server'
3+
import {
4+
cloudwatchLogGroupsBodySchema,
5+
cloudwatchSelectorLogGroupsContract,
6+
} from '@/lib/api/contracts/selectors/cloudwatch'
7+
import { parseRequest } from '@/lib/api/server'
8+
import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
9+
import { resolveAuthorizedSelectorContext } from '@/lib/selectors/server/resolve-authorized-context'
10+
import { createCloudWatchLogsClient, describeLogGroups } from '@/app/api/tools/cloudwatch/utils'
11+
12+
const logger = createLogger('CloudWatchSelectorLogGroupsAPI')
13+
14+
export const POST = withRouteHandler(async (request: NextRequest) => {
15+
try {
16+
const parsed = await parseRequest(cloudwatchSelectorLogGroupsContract, request, {})
17+
if (!parsed.success) return parsed.response
18+
19+
const { workflowId, prefix, limit, ...context } = parsed.data.body
20+
const resolution = await resolveAuthorizedSelectorContext(request, { workflowId, context })
21+
if (!resolution.ok) {
22+
return NextResponse.json({ error: resolution.error }, { status: resolution.status })
23+
}
24+
25+
const validated = cloudwatchLogGroupsBodySchema.safeParse({
26+
...resolution.context,
27+
prefix,
28+
limit,
29+
})
30+
if (!validated.success) {
31+
return NextResponse.json(
32+
{ error: 'Invalid CloudWatch selector configuration' },
33+
{ status: 400 }
34+
)
35+
}
36+
37+
const client = createCloudWatchLogsClient(validated.data)
38+
try {
39+
const result = await describeLogGroups(client, {
40+
prefix: validated.data.prefix,
41+
limit: validated.data.limit,
42+
})
43+
return NextResponse.json(result)
44+
} finally {
45+
client.destroy()
46+
}
47+
} catch {
48+
logger.error('CloudWatch selector log-group request failed')
49+
return NextResponse.json({ error: 'Failed to retrieve CloudWatch log groups' }, { status: 500 })
50+
}
51+
})

‎apps/sim/app/api/tools/cloudwatch/selector-log-streams/route.ts‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
import { createLogger } from '@sim/logger'
2+
import { type NextRequest, NextResponse } from 'next/server'
3+
import {
4+
cloudwatchLogStreamsBodySchema,
5+
cloudwatchSelectorLogStreamsContract,
6+
} from '@/lib/api/contracts/selectors/cloudwatch'
7+
import { parseRequest } from '@/lib/api/server'
8+
import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
9+
import { resolveAuthorizedSelectorContext } from '@/lib/selectors/server/resolve-authorized-context'
10+
import { createCloudWatchLogsClient, describeLogStreams } from '@/app/api/tools/cloudwatch/utils'
11+
12+
const logger = createLogger('CloudWatchSelectorLogStreamsAPI')
13+
14+
export const POST = withRouteHandler(async (request: NextRequest) => {
15+
try {
16+
const parsed = await parseRequest(cloudwatchSelectorLogStreamsContract, request, {})
17+
if (!parsed.success) return parsed.response
18+
19+
const { workflowId, prefix, limit, logGroupName, ...context } = parsed.data.body
20+
const resolution = await resolveAuthorizedSelectorContext(request, { workflowId, context })
21+
if (!resolution.ok) {
22+
return NextResponse.json({ error: resolution.error }, { status: resolution.status })
23+
}
24+
25+
const validated = cloudwatchLogStreamsBodySchema.safeParse({
26+
...resolution.context,
27+
prefix,
28+
limit,
29+
logGroupName,
30+
})
31+
if (!validated.success) {
32+
return NextResponse.json(
33+
{ error: 'Invalid CloudWatch selector configuration' },
34+
{ status: 400 }
35+
)
36+
}
37+
38+
const client = createCloudWatchLogsClient(validated.data)
39+
try {
40+
const result = await describeLogStreams(client, validated.data.logGroupName, {
41+
prefix: validated.data.prefix,
42+
limit: validated.data.limit,
43+
})
44+
return NextResponse.json(result)
45+
} finally {
46+
client.destroy()
47+
}
48+
} catch {
49+
logger.error('CloudWatch selector log-stream request failed')
50+
return NextResponse.json(
51+
{ error: 'Failed to retrieve CloudWatch log streams' },
52+
{ status: 500 }
53+
)
54+
}
55+
})

‎apps/sim/app/api/tools/cloudwatch/utils.test.ts‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/**
2+
* @vitest-environment node
3+
*/
4+
import { describe, expect, it, vi } from 'vitest'
5+
import { describeLogGroups } from '@/app/api/tools/cloudwatch/utils'
6+
7+
describe('describeLogGroups', () => {
8+
it('preserves bounded pagination and normalized provider mapping', async () => {
9+
const send = vi
10+
.fn()
11+
.mockResolvedValueOnce({
12+
logGroups: [{ logGroupName: 'api', arn: 'arn:api', storedBytes: 12 }],
13+
nextToken: 'next-page',
14+
})
15+
.mockResolvedValueOnce({
16+
logGroups: [{ logGroupName: 'worker' }],
17+
})
18+
19+
const result = await describeLogGroups({ send } as never, { prefix: 'a' })
20+
21+
expect(result).toEqual({
22+
logGroups: [
23+
{
24+
logGroupName: 'api',
25+
arn: 'arn:api',
26+
storedBytes: 12,
27+
retentionInDays: undefined,
28+
creationTime: undefined,
29+
},
30+
{
31+
logGroupName: 'worker',
32+
arn: '',
33+
storedBytes: 0,
34+
retentionInDays: undefined,
35+
creationTime: undefined,
36+
},
37+
],
38+
})
39+
expect(send).toHaveBeenCalledTimes(2)
40+
expect(send.mock.calls[0][0].input).toMatchObject({
41+
logGroupNamePrefix: 'a',
42+
limit: 50,
43+
})
44+
expect(send.mock.calls[1][0].input).toMatchObject({ nextToken: 'next-page' })
45+
})
46+
47+
it('treats limit as a total cap', async () => {
48+
const send = vi.fn().mockResolvedValue({
49+
logGroups: [{ logGroupName: 'one' }, { logGroupName: 'two' }],
50+
nextToken: 'unused',
51+
})
52+
53+
const result = await describeLogGroups({ send } as never, { limit: 1 })
54+
55+
expect(result.logGroups).toHaveLength(1)
56+
expect(send).toHaveBeenCalledOnce()
57+
expect(send.mock.calls[0][0].input.limit).toBe(1)
58+
})
59+
})

‎apps/sim/app/api/tools/cloudwatch/utils.ts‎

Lines changed: 65 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import {
22
CloudWatchLogsClient,
3+
DescribeLogGroupsCommand,
34
DescribeLogStreamsCommand,
45
FilterLogEventsCommand,
56
GetLogEventsCommand,
@@ -10,12 +11,22 @@ import { createLogger } from '@sim/logger'
1011
import { sleep } from '@sim/utils/helpers'
1112
import { DEFAULT_EXECUTION_TIMEOUT_MS } from '@/lib/core/execution-limits'
1213

14+
const logger = createLogger('CloudWatchUtils')
15+
1316
interface AwsCredentials {
1417
region: string
1518
accessKeyId: string
1619
secretAccessKey: string
1720
}
1821

22+
interface DescribedLogGroup {
23+
logGroupName: string
24+
arn: string
25+
storedBytes: number
26+
retentionInDays: number | undefined
27+
creationTime: number | undefined
28+
}
29+
1930
export function createCloudWatchLogsClient(config: AwsCredentials): CloudWatchLogsClient {
2031
return new CloudWatchLogsClient({
2132
region: config.region,
@@ -26,6 +37,60 @@ export function createCloudWatchLogsClient(config: AwsCredentials): CloudWatchLo
2637
})
2738
}
2839

40+
/** AWS DescribeLogGroups caps `limit` at 50 items per page. */
41+
const LOG_GROUPS_PAGE_SIZE = 50
42+
43+
/** Upper bound on pages drained to avoid unbounded loops on very large accounts. */
44+
const MAX_LOG_GROUPS_PAGES = 20
45+
46+
/** Lists CloudWatch log groups with the same bounded pagination used by tool and selector routes. */
47+
export async function describeLogGroups(
48+
client: CloudWatchLogsClient,
49+
options?: { prefix?: string; limit?: number }
50+
): Promise<{ logGroups: DescribedLogGroup[] }> {
51+
const totalLimit = options?.limit
52+
const logGroups: DescribedLogGroup[] = []
53+
let nextToken: string | undefined
54+
55+
for (let page = 0; page < MAX_LOG_GROUPS_PAGES; page++) {
56+
const pageLimit =
57+
totalLimit !== undefined
58+
? Math.min(LOG_GROUPS_PAGE_SIZE, totalLimit - logGroups.length)
59+
: LOG_GROUPS_PAGE_SIZE
60+
const response = await client.send(
61+
new DescribeLogGroupsCommand({
62+
...(options?.prefix && { logGroupNamePrefix: options.prefix }),
63+
limit: pageLimit,
64+
...(nextToken && { nextToken }),
65+
})
66+
)
67+
68+
for (const logGroup of response.logGroups ?? []) {
69+
logGroups.push({
70+
logGroupName: logGroup.logGroupName ?? '',
71+
arn: logGroup.arn ?? '',
72+
storedBytes: logGroup.storedBytes ?? 0,
73+
retentionInDays: logGroup.retentionInDays,
74+
creationTime: logGroup.creationTime,
75+
})
76+
}
77+
78+
nextToken = response.nextToken
79+
if (!nextToken) break
80+
if (totalLimit !== undefined && logGroups.length >= totalLimit) break
81+
82+
if (page === MAX_LOG_GROUPS_PAGES - 1) {
83+
logger.warn(
84+
`DescribeLogGroups hit pagination cap of ${MAX_LOG_GROUPS_PAGES} pages; log group list may be incomplete`
85+
)
86+
}
87+
}
88+
89+
return {
90+
logGroups: totalLimit !== undefined ? logGroups.slice(0, totalLimit) : logGroups,
91+
}
92+
}
93+
2994
interface PollOptions {
3095
maxWaitMs?: number
3196
pollIntervalMs?: number
@@ -104,8 +169,6 @@ const LOG_STREAMS_PAGE_SIZE = 50
104169
/** Upper bound on pages drained to avoid unbounded loops on log groups with many streams. */
105170
const MAX_LOG_STREAMS_PAGES = 20
106171

107-
const logger = createLogger('CloudWatchUtils')
108-
109172
interface DescribedLogStream {
110173
logStreamName: string
111174
lastEventTimestamp: number | undefined

0 commit comments

Comments
 (0)