Skip to content

Commit f556ec8

Browse files
committed
chore: update according to the comments
1 parent 60b342b commit f556ec8

File tree

6 files changed

+16
-9
lines changed

6 files changed

+16
-9
lines changed

packages/amazonq/test/unit/amazonqFeatureDev/util/files.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ import {
88
prepareRepoData,
99
PrepareRepoDataOptions,
1010
TelemetryHelper,
11-
ContentLengthError,
1211
maxRepoSizeBytes,
1312
} from 'aws-core-vscode/amazonqFeatureDev'
1413
import { assertTelemetry, getWorkspaceFolder, TestFolder } from 'aws-core-vscode/test'
1514
import { fs, AmazonqCreateUpload, ZipStream } from 'aws-core-vscode/shared'
1615
import { MetricName, Span } from 'aws-core-vscode/telemetry'
1716
import sinon from 'sinon'
1817
import { CodeWhispererSettings } from 'aws-core-vscode/codewhisperer'
19-
import { CurrentWsFolders } from 'aws-core-vscode/amazonq'
18+
import { ContentLengthError, CurrentWsFolders } from 'aws-core-vscode/amazonq'
2019
import path from 'path'
2120

2221
const testDevfilePrepareRepo = async (devfileEnabled: boolean) => {

packages/core/src/amazonq/errors.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,15 @@
44
*
55
*/
66

7+
/**
8+
* Shared error type for content length validation.
9+
* When thrown from common components, individual agents can catch and transform this error
10+
* to provide their own customized error messages.
11+
*/
712
import { ToolkitError } from '../shared/errors'
813

9-
export class CommonAmazonQContentLengthError extends ToolkitError {
14+
export class ContentLengthError extends ToolkitError {
1015
constructor(message: string) {
11-
super(message, { code: 'CommonAmazonQContentLengthError' })
16+
super(message, { code: 'ContentLengthError' })
1217
}
1318
}

packages/core/src/amazonq/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ export { ExtensionMessage } from '../amazonq/webview/ui/commands'
4343
export { CodeReference } from '../codewhispererChat/view/connector/connector'
4444
export { extractAuthFollowUp } from './util/authUtils'
4545
export { Messenger } from './commons/connector/baseMessenger'
46+
export { ContentLengthError } from './errors'
4647
import { FeatureContext } from '../shared/featureConfig'
4748

4849
/**

packages/core/src/amazonq/util/files.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { ZipStream } from '../../shared/utilities/zipStream'
2828
import { isPresent } from '../../shared/utilities/collectionUtils'
2929
import { AuthUtil } from '../../codewhisperer/util/authUtil'
3030
import { TelemetryHelper } from '../util/telemetryHelper'
31-
import { CommonAmazonQContentLengthError } from '../errors'
31+
import { ContentLengthError } from '../errors'
3232

3333
export const SvgFileExtension = '.svg'
3434

@@ -185,9 +185,9 @@ export async function prepareRepoData(
185185
zipFileChecksum: zipResult.hash,
186186
}
187187
} catch (error) {
188-
getLogger().debug(`featureDev: Failed to prepare repo: ${error}`)
188+
getLogger().debug(`Failed to prepare repo: ${error}`)
189189
if (error instanceof ToolkitError && error.code === 'ContentLengthError') {
190-
throw new CommonAmazonQContentLengthError(error.message)
190+
throw new ContentLengthError(error.message)
191191
}
192192
throw new PrepareRepoFailedError()
193193
}

packages/core/src/amazonqDoc/session/session.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import globals from '../../shared/extensionGlobals'
3131
import { extensionVersion } from '../../shared/vscode/env'
3232
import { getLogger } from '../../shared/logger/logger'
3333
import { ContentLengthError } from '../errors'
34-
import { CommonAmazonQContentLengthError } from '../../amazonq/errors'
34+
import { ContentLengthError as CommonAmazonQContentLengthError } from '../../amazonq/errors'
3535

3636
export class Session {
3737
private _state?: SessionState | Omit<SessionState, 'uploadId'>
@@ -153,6 +153,7 @@ export class Session {
153153
return resp.interaction
154154
} catch (e) {
155155
if (e instanceof CommonAmazonQContentLengthError) {
156+
getLogger().debug(`Content length validation failed: ${e.message}`)
156157
throw new ContentLengthError()
157158
}
158159
throw e

packages/core/src/amazonqFeatureDev/session/session.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { UpdateAnswerMessage } from '../../amazonq/commons/connector/connectorMe
3333
import { FollowUpTypes } from '../../amazonq/commons/types'
3434
import { SessionConfig } from '../../amazonq/commons/session/sessionConfigFactory'
3535
import { Messenger } from '../../amazonq/commons/connector/baseMessenger'
36-
import { CommonAmazonQContentLengthError } from '../../amazonq/errors'
36+
import { ContentLengthError as CommonAmazonQContentLengthError } from '../../amazonq/errors'
3737
export class Session {
3838
private _state?: SessionState | Omit<SessionState, 'uploadId'>
3939
private task: string = ''
@@ -160,6 +160,7 @@ export class Session {
160160
return resp.interaction
161161
} catch (e) {
162162
if (e instanceof CommonAmazonQContentLengthError) {
163+
getLogger().debug(`Content length validation failed: ${e.message}`)
163164
throw new ContentLengthError()
164165
}
165166
throw e

0 commit comments

Comments
 (0)