Skip to content

fix: surface startTransform errors instead of swallowing them #2706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rajanna-Karthik wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: surface startTransform errors instead of swallowing them #2706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions integration-tests/atx-transform-server/src/tests/atxTransformInteg.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@ describe('ATX .NET Transform Integration Tests', () => {
buildStartTransformRequest('IntegTest-BobsBookstore-' + Date.now(), sourceFiles)
)

console.log('StartTransform raw response:', JSON.stringify(result))

transformationJobId = result?.TransformationJobId
expect(transformationJobId).to.exist
console.log('TransformationJobId:', transformationJobId)
Expand Down
16 changes: 16 additions & 0 deletions integration-tests/atx-transform-server/src/tests/lspClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,22 @@ export class LspClient {
this.process.stderr.on('data', (data: Buffer) => {
console.error(`[LSP stderr] ${data.toString()}`)
})

this.process.on('exit', (code, signal) => {
console.error(`[LSP] Process exited with code ${code}, signal ${signal}`)
for (const [id, { reject }] of this.pendingRequests) {
reject(new Error(`LSP server exited unexpectedly (code: ${code}, signal: ${signal})`))
}
this.pendingRequests.clear()
})

this.process.on('error', (err) => {
console.error(`[LSP] Process error: ${err.message}`)
for (const [id, { reject }] of this.pendingRequests) {
reject(new Error(`LSP server error: ${err.message}`))
}
this.pendingRequests.clear()
})
}

private processBuffer(): void {
Expand Down
2 changes: 2 additions & 0 deletions server/aws-lsp-codewhisperer/src/language-server/netTransform/atxNetTransformServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,15 @@ export const AtxNetTransformServerToken =
}
} catch (e: any) {
logging.error(`ATXTransformServer: Error executing command: ${String(e)}`)
return { error: String(e) }
}
}

const onExecuteCommandHandler = async (
params: ExecuteCommandParams,
_token: CancellationToken
): Promise<any> => {
console.error(`[DIAG] onExecuteCommandHandler: ${params.command}`)
logging.info(`Received ATX FES command: ${params.command}`)
return runAtxTransformCommand(params, _token)
}
Expand Down
25 changes: 22 additions & 3 deletions server/aws-lsp-codewhisperer/src/language-server/netTransform/atxTransformHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,9 @@ export class ATXTransformHandler {

this.logging.error('ATX: CreateJob failed - no jobId or status in response')
return null
} catch (error) {
this.logging.error(`ATX: CreateJob error: ${String(error)}`)
} catch (error: any) {
const metadata = error?.$metadata || {}
this.logging.error(`ATX: CreateJob error: ${String(error)} | requestId: ${metadata.requestId || 'N/A'} | httpStatus: ${metadata.httpStatusCode || 'N/A'}`)
return null
}
}
Expand Down Expand Up @@ -874,8 +875,11 @@ export class ATXTransformHandler {
async getTransformInfo(request: AtxGetTransformInfoRequest): Promise<AtxGetTransformInfoResponse | null> {
try {
this.logging.log(`ATX: Getting transform info for job: ${request.TransformationJobId}`)
console.error(`[DIAG] getTransformInfo START for job: ${request.TransformationJobId}`)

console.error(`[DIAG] getTransformInfo: calling getJob...`)
const job = await this.getJob(request.WorkspaceId, request.TransformationJobId)
console.error(`[DIAG] getTransformInfo: getJob returned, status=${job?.statusDetails?.status}`)

if (!job) {
this.logging.error(`ATX: Job not found: ${request.TransformationJobId}`)
Expand All @@ -885,16 +889,20 @@ export class ATXTransformHandler {
const jobStatus = job.statusDetails?.status

if (jobStatus === 'COMPLETED') {
console.error(`[DIAG] getTransformInfo: COMPLETED branch - calling downloadFinalArtifact...`)
const pathToArtifact = await this.downloadFinalArtifact(
request.WorkspaceId,
request.TransformationJobId,
request.SolutionRootPath
)
console.error(`[DIAG] getTransformInfo: downloadFinalArtifact returned`)
console.error(`[DIAG] getTransformInfo: calling getTransformationPlan...`)
const plan = await this.getTransformationPlan(
request.WorkspaceId,
request.TransformationJobId,
request.SolutionRootPath
)
console.error(`[DIAG] getTransformInfo: getTransformationPlan returned`)

return {
TransformationJob: {
Expand Down Expand Up @@ -926,6 +934,7 @@ export class ATXTransformHandler {
ErrorString: 'Transformation job stopped',
} as AtxGetTransformInfoResponse
} else if (jobStatus === 'PLANNED') {
console.error(`[DIAG] getTransformInfo: PLANNED branch - calling getTransformationPlan...`)
const plan = await this.getTransformationPlan(
request.WorkspaceId,
request.TransformationJobId,
Expand Down Expand Up @@ -964,7 +973,9 @@ export class ATXTransformHandler {
HitlTag: response?.HitlTag,
} as AtxGetTransformInfoResponse
} else {
console.error(`[DIAG] getTransformInfo: else branch (status=${jobStatus}) - calling listWorklogs...`)
await this.listWorklogs(request.WorkspaceId, request.TransformationJobId, request.SolutionRootPath)
console.error(`[DIAG] getTransformInfo: listWorklogs returned`)

return {
TransformationJob: {
Expand All @@ -975,22 +986,27 @@ export class ATXTransformHandler {
} as AtxGetTransformInfoResponse
}
} catch (error) {
console.error(`[DIAG] getTransformInfo: CAUGHT ERROR: ${String(error)}`)
this.logging.error(`ATX: GetTransformInfo error: ${String(error)}`)
return null
}
}

async uploadPlan(request: AtxUploadPlanRequest): Promise<AtxUploadPlanResponse | null> {
console.error('[DIAG] uploadPlan: START')
this.logging.log('ATX: Starting upload plan')

if (!this.cachedHitl) {
console.error('[DIAG] uploadPlan: No cached hitl')
this.logging.error('ATX: UploadPlan error: No cached hitl')
return null
}

try {
console.error('[DIAG] uploadPlan: zipping file...')
const pathToZip = path.join(path.dirname(request.PlanPath), 'transformation-plan-upload.zip')
await Utils.zipFile(request.PlanPath, pathToZip)
console.error('[DIAG] uploadPlan: zip done, creating upload URL...')

const uploadInfo = await this.createArtifactUploadUrl(
request.WorkspaceId,
Expand Down Expand Up @@ -1039,13 +1055,14 @@ export class ATXTransformHandler {
throw new Error('Failed to submit hitl')
}

this.logging.log('ATX: Hitl submitted, polling for status')
console.error('[DIAG] uploadPlan: submitHitl done, polling hitl task...')

const validation = await this.pollHitlTask(
request.WorkspaceId,
request.TransformationJobId,
this.cachedHitl
)
console.error(`[DIAG] uploadPlan: pollHitlTask returned: ${validation}`)

if (!validation) {
throw new Error('Failed to poll hitl task')
Expand All @@ -1065,12 +1082,14 @@ export class ATXTransformHandler {
ReportPath: response?.ReportPath,
} as AtxUploadPlanResponse
} else {
console.error('[DIAG] uploadPlan: returning VerificationStatus=true')
return {
VerificationStatus: true,
Message: validation,
} as AtxUploadPlanResponse
}
} catch (error) {
console.error(`[DIAG] uploadPlan: CAUGHT ERROR: ${String(error)}`)
this.logging.error(`ATX: UploadPlan error: ${String(error)}`)
return null
}
Expand Down
Loading