Skip to content

Commit 3a6e04d

Browse files
aws-toolkit-automationaws-toolkit-automation
authored
Merge master into feature/emr
2 parents ee7114f + 4b47b04 commit 3a6e04d

File tree

17 files changed

+71
-61
lines changed

17 files changed

+71
-61
lines changed

‎packages/core/src/amazonqGumby/chat/controller/controller.ts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,9 @@ import {
5353
import { CodeTransformTelemetryState } from '../../telemetry/codeTransformTelemetryState'
5454
import DependencyVersions from '../../models/dependencies'
5555
import { getStringHash } from '../../../shared/utilities/textUtilities'
56-
import { getVersionData } from '../../../codewhisperer/service/transformByQ/transformMavenHandler'
5756
import AdmZip from 'adm-zip'
5857
import { AuthError } from '../../../auth/sso/server'
5958
import {
60-
setMaven,
6159
openBuildLogFile,
6260
parseBuildFile,
6361
validateSQLMetadataFile,
@@ -321,12 +319,6 @@ export class GumbyController {
321319
telemetryJavaVersion = JDKToTelemetryValue(javaVersion) as CodeTransformJavaSourceVersionsAllowed
322320
}
323321
telemetry.record({ codeTransformLocalJavaVersion: telemetryJavaVersion })
324-
325-
await setMaven()
326-
const versionInfo = await getVersionData()
327-
const mavenVersionInfoMessage = `${versionInfo[0]} (${transformByQState.getMavenName()})`
328-
telemetry.record({ buildSystemVersion: mavenVersionInfoMessage })
329-
330322
return validProjects
331323
})
332324
return validProjects

‎packages/core/src/awsService/appBuilder/explorer/detectSamProjects.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export async function getFiles(
5757

5858
return await vscode.workspace.findFiles(globPattern, excludePattern)
5959
} catch (error) {
60-
getLogger().error(`Failed to get files with pattern ${pattern}:`, error)
60+
getLogger().error(`Failed to find files with pattern ${pattern}:`, error)
6161
return []
6262
}
6363
}

‎packages/core/src/awsService/appBuilder/explorer/nodes/appNode.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export class AppNode implements TreeNode {
7373
createPlaceholderItem(
7474
localize(
7575
'AWS.appBuilder.explorerNode.app.noResourceTree',
76-
'[Unable to load Resource tree for this App. Update SAM template]'
76+
'[Unable to load resource tree for this app. Ensure SAM template is correct.]'
7777
)
7878
),
7979
]

‎packages/core/src/awsService/appBuilder/explorer/nodes/deployedNode.ts‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export async function generateDeployedNode(
9696
.Configuration as Lambda.FunctionConfiguration
9797
newDeployedResource = new LambdaFunctionNode(lambdaNode, regionCode, configuration)
9898
} catch (error: any) {
99-
getLogger().error('Error getting Lambda configuration %O', error)
99+
getLogger().error('Error getting Lambda configuration: %O', error)
100100
throw ToolkitError.chain(error, 'Error getting Lambda configuration', {
101101
code: 'lambdaClientError',
102102
})
@@ -107,7 +107,7 @@ export async function generateDeployedNode(
107107
createPlaceholderItem(
108108
localize(
109109
'AWS.appBuilder.explorerNode.unavailableDeployedResource',
110-
'[Failed to retrive deployed resource.]'
110+
'[Failed to retrive deployed resource. Ensure your AWS account is connected.]'
111111
)
112112
),
113113
]
@@ -119,8 +119,8 @@ export async function generateDeployedNode(
119119
try {
120120
v3configuration = (await v3Client.send(v3command)).Configuration as FunctionConfiguration
121121
logGroupName = v3configuration.LoggingConfig?.LogGroup
122-
} catch {
123-
getLogger().error('Error getting Lambda V3 configuration')
122+
} catch (error: any) {
123+
getLogger().error('Error getting Lambda V3 configuration: %O', error)
124124
}
125125
newDeployedResource.configuration = {
126126
...newDeployedResource.configuration,
@@ -156,7 +156,10 @@ export async function generateDeployedNode(
156156
getLogger().info('Details are missing or are incomplete for: %O', deployedResource)
157157
return [
158158
createPlaceholderItem(
159-
localize('AWS.appBuilder.explorerNode.noApps', '[This resource is not yet supported.]')
159+
localize(
160+
'AWS.appBuilder.explorerNode.noApps',
161+
'[This resource is not yet supported in AppBuilder.]'
162+
)
160163
),
161164
]
162165
}
@@ -166,7 +169,7 @@ export async function generateDeployedNode(
166169
createPlaceholderItem(
167170
localize(
168171
'AWS.appBuilder.explorerNode.unavailableDeployedResource',
169-
'[Failed to retrive deployed resource.]'
172+
'[Failed to retrieve deployed resource. Ensure correct stack name and region are in the samconfig.toml, and that your account is connected.]'
170173
)
171174
),
172175
]

‎packages/core/src/awsService/appBuilder/explorer/samProject.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,17 @@ export async function getStackName(projectRoot: vscode.Uri): Promise<any> {
4242
} catch (error: any) {
4343
switch (error.code) {
4444
case SamConfigErrorCode.samNoConfigFound:
45-
getLogger().info('No stack name or region information available in samconfig.toml: %O', error)
45+
getLogger().info('Stack name and/or region information not found in samconfig.toml: %O', error)
4646
break
4747
case SamConfigErrorCode.samConfigParseError:
48-
getLogger().error(`Error getting stack name or region information: ${error.message}`, error)
48+
getLogger().error(
49+
`Error parsing stack name and/or region information from samconfig.toml: ${error.message}. Ensure the information is correct.`,
50+
error
51+
)
4952
void showViewLogsMessage('Encountered an issue reading samconfig.toml')
5053
break
5154
default:
52-
getLogger().warn(`Error getting stack name or region information: ${error.message}`, error)
55+
getLogger().warn(`Error parsing stack name and/or region information: ${error.message}`, error)
5356
}
5457
return {}
5558
}

‎packages/core/src/awsService/appBuilder/utils.ts‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ const localize = nls.loadMessageBundle()
2424
export async function runOpenTemplate(arg?: TreeNode) {
2525
const templateUri = arg ? (arg.resource as SamAppLocation).samTemplateUri : await promptUserForTemplate()
2626
if (!templateUri || !(await fs.exists(templateUri))) {
27-
throw new ToolkitError('No template provided', { code: 'NoTemplateProvided' })
27+
throw new ToolkitError('SAM Template not found, cannot open template', { code: 'NoTemplateProvided' })
2828
}
2929
const document = await vscode.workspace.openTextDocument(templateUri)
3030
await vscode.window.showTextDocument(document)
3131
}
3232

3333
/**
34-
* Find and open the lambda handler with given ResoruceNode
34+
* Find and open the lambda handler with given ResourceNode
3535
* If not found, a NoHandlerFound error will be raised
3636
* @param arg ResourceNode
3737
*/
@@ -56,9 +56,12 @@ export async function runOpenHandler(arg: ResourceNode): Promise<void> {
5656
arg.resource.resource.Runtime
5757
)
5858
if (!handlerFile) {
59-
throw new ToolkitError(`No handler file found with name "${arg.resource.resource.Handler}"`, {
60-
code: 'NoHandlerFound',
61-
})
59+
throw new ToolkitError(
60+
`No handler file found with name "${arg.resource.resource.Handler}". Ensure the file exists in the expected location."`,
61+
{
62+
code: 'NoHandlerFound',
63+
}
64+
)
6265
}
6366
await vscode.workspace.openTextDocument(handlerFile).then(async (doc) => await vscode.window.showTextDocument(doc))
6467
}
@@ -90,7 +93,7 @@ export async function getLambdaHandlerFile(
9093
): Promise<vscode.Uri | undefined> {
9194
const family = getFamily(runtime)
9295
if (!supportedRuntimeForHandler.has(family)) {
93-
throw new ToolkitError(`Runtime ${runtime} is not supported for open handler button`, {
96+
throw new ToolkitError(`Runtime ${runtime} is not supported for the 'Open handler' button`, {
9497
code: 'RuntimeNotSupported',
9598
})
9699
}

‎packages/core/src/awsService/appBuilder/walkthrough.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,13 @@ export async function getTutorial(
148148
const appSelected = appMap.get(project + runtime)
149149
telemetry.record({ action: project + runtime, source: source ?? 'AppBuilderWalkthrough' })
150150
if (!appSelected) {
151-
throw new ToolkitError(`Tried to get template '${project}+${runtime}', but it hasn't been registered.`)
151+
throw new ToolkitError(`Template '${project}+${runtime}' does not exist, choose another template.`)
152152
}
153153

154154
try {
155155
await getPattern(serverlessLandOwner, serverlessLandRepo, appSelected.asset, outputDir, true)
156156
} catch (error) {
157-
throw new ToolkitError(`Error occurred while fetching the pattern from serverlessland: ${error}`)
157+
throw new ToolkitError(`An error occurred while fetching this pattern from Serverless Land: ${error}`)
158158
}
159159
}
160160

@@ -190,7 +190,7 @@ export async function genWalkthroughProject(
190190
'No'
191191
)
192192
if (choice !== 'Yes') {
193-
throw new ToolkitError(`${defaultTemplateName} already exist`)
193+
throw new ToolkitError(`A file named ${defaultTemplateName} already exists in this path.`)
194194
}
195195
}
196196

@@ -256,9 +256,9 @@ export async function initWalkthroughProjectCommand() {
256256
let runtimeSelected: TutorialRuntimeOptions | undefined = undefined
257257
try {
258258
if (!walkthroughSelected || !(typeof walkthroughSelected === 'string')) {
259-
getLogger().info('exit on no walkthrough selected')
259+
getLogger().info('No walkthrough selected - exiting')
260260
void vscode.window.showErrorMessage(
261-
localize('AWS.toolkit.lambda.walkthroughNotSelected', 'Please select a template first')
261+
localize('AWS.toolkit.lambda.walkthroughNotSelected', 'Select a template in the walkthrough.')
262262
)
263263
return
264264
}
@@ -322,7 +322,7 @@ export async function getOrUpdateOrInstallSAMCli(source: string) {
322322
}
323323
}
324324
} catch (err) {
325-
throw ToolkitError.chain(err, 'Failed to install or detect SAM')
325+
throw ToolkitError.chain(err, 'Failed to install or detect SAM.')
326326
} finally {
327327
telemetry.record({ source: source, toolId: 'sam-cli' })
328328
}

‎packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ export async function startJob(uploadId: string) {
448448
target: { language: targetLanguageVersion }, // always JDK17
449449
},
450450
})
451+
getLogger().info('CodeTransformation: called startJob API successfully')
451452
if (response.$response.requestId) {
452453
transformByQState.setJobFailureMetadata(` (request ID: ${response.$response.requestId})`)
453454
}
@@ -671,6 +672,7 @@ export async function pollTransformationJob(jobId: string, validStates: string[]
671672
})
672673
}
673674
transformByQState.setPolledJobStatus(status)
675+
getLogger().info(`CodeTransformation: polled job status = ${status}`)
674676

675677
const errorMessage = response.transformationJob.reason
676678
if (errorMessage !== undefined) {

‎packages/core/src/codewhisperer/service/transformByQ/transformMavenHandler.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { spawnSync } from 'child_process' // eslint-disable-line no-restricted-i
1111
import { CodeTransformBuildCommand, telemetry } from '../../../shared/telemetry/telemetry'
1212
import { CodeTransformTelemetryState } from '../../../amazonqGumby/telemetry/codeTransformTelemetryState'
1313
import { ToolkitError } from '../../../shared/errors'
14-
import { writeLogs } from './transformFileHandler'
14+
import { setMaven, writeLogs } from './transformFileHandler'
1515
import { throwIfCancelled } from './transformApiHandler'
1616

1717
// run 'install' with either 'mvnw.cmd', './mvnw', or 'mvn' (if wrapper exists, we use that, otherwise we use regular 'mvn')
@@ -108,6 +108,8 @@ function copyProjectDependencies(dependenciesFolder: FolderInfo, modulePath: str
108108
}
109109

110110
export async function prepareProjectDependencies(dependenciesFolder: FolderInfo, rootPomPath: string) {
111+
await setMaven()
112+
getLogger().info('CodeTransformation: running Maven copy-dependencies')
111113
try {
112114
copyProjectDependencies(dependenciesFolder, rootPomPath)
113115
} catch (err) {
@@ -117,6 +119,7 @@ export async function prepareProjectDependencies(dependenciesFolder: FolderInfo,
117119
)
118120
}
119121

122+
getLogger().info('CodeTransformation: running Maven install')
120123
try {
121124
installProjectDependencies(dependenciesFolder, rootPomPath)
122125
} catch (err) {
@@ -134,9 +137,9 @@ export async function prepareProjectDependencies(dependenciesFolder: FolderInfo,
134137

135138
export async function getVersionData() {
136139
const baseCommand = transformByQState.getMavenName() // will be one of: 'mvnw.cmd', './mvnw', 'mvn'
137-
const modulePath = transformByQState.getProjectPath()
140+
const projectPath = transformByQState.getProjectPath()
138141
const args = ['-v']
139-
const spawnResult = spawnSync(baseCommand, args, { cwd: modulePath, shell: true, encoding: 'utf-8' })
142+
const spawnResult = spawnSync(baseCommand, args, { cwd: projectPath, shell: true, encoding: 'utf-8' })
140143

141144
let localMavenVersion: string | undefined = ''
142145
let localJavaVersion: string | undefined = ''

‎packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ export class DiffModel {
178178
}
179179

180180
const changedFiles = parsePatch(diffContents)
181+
getLogger().info('CodeTransformation: parsed patch file successfully')
181182
// path to the directory containing copy of the changed files in the transformed project
182183
const pathToTmpSrcDir = this.copyProject(pathToWorkspace, changedFiles)
183184
transformByQState.setProjectCopyFilePath(pathToTmpSrcDir)
@@ -402,6 +403,7 @@ export class ProposedTransformationExplorer {
402403
pathToArchive
403404
)
404405

406+
getLogger().info('CodeTransformation: downloaded results successfully')
405407
// Update downloaded artifact size
406408
exportResultsArchiveSize = (await fs.promises.stat(pathToArchive)).size
407409

@@ -534,6 +536,7 @@ export class ProposedTransformationExplorer {
534536

535537
vscode.commands.registerCommand('aws.amazonq.transformationHub.reviewChanges.acceptChanges', async () => {
536538
telemetry.codeTransform_submitSelection.run(() => {
539+
getLogger().info('CodeTransformation: accepted changes')
537540
diffModel.saveChanges()
538541
telemetry.record({
539542
codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
@@ -587,6 +590,7 @@ export class ProposedTransformationExplorer {
587590

588591
vscode.commands.registerCommand('aws.amazonq.transformationHub.reviewChanges.rejectChanges', async () => {
589592
await telemetry.codeTransform_submitSelection.run(async () => {
593+
getLogger().info('CodeTransformation: rejected changes')
590594
diffModel.rejectChanges()
591595
await reset()
592596
telemetry.record({

0 commit comments

Comments
 (0)