fix linting and tests

Author: seshubaws

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

@@ -107,7 +107,7 @@ export async function generateDeployedNode(
                         createPlaceholderItem(
                             localize(
                                 'AWS.appBuilder.explorerNode.unavailableDeployedResource',
-                                '[Failed to retrive deployed resource. Please ensure your AWS account is connected.]'
+                                '[Failed to retrive deployed resource. Ensure your AWS account is connected.]'
                             )
                         ),
                     ]
@@ -156,7 +156,10 @@ export async function generateDeployedNode(
                 getLogger().info('Details are missing or are incomplete for: %O', deployedResource)
                 return [
                     createPlaceholderItem(
-                        localize('AWS.appBuilder.explorerNode.noApps', '[This resource is not yet supported in AppBuilder.]')
+                        localize(
+                            'AWS.appBuilder.explorerNode.noApps',
+                            '[This resource is not yet supported in AppBuilder.]'
+                        )
                     ),
                 ]
         }
@@ -166,7 +169,7 @@ export async function generateDeployedNode(
             createPlaceholderItem(
                 localize(
                     'AWS.appBuilder.explorerNode.unavailableDeployedResource',
-                    '[Failed to retrieve deployed resource. Please ensure stack name, region, and account credentials are correct.]'
+                    '[Failed to retrieve deployed resource. Ensure correct stack name and region are in the samconfig.toml, and that your account is connected.]'
                 )
             ),
         ]

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

@@ -45,7 +45,10 @@ export async function getStackName(projectRoot: vscode.Uri): Promise<any> {
                 getLogger().info('Stack name and/or region information not found in samconfig.toml: %O', error)
                 break
             case SamConfigErrorCode.samConfigParseError:
-                getLogger().error(`Error parsing stack name and/or region information from samconfig.toml: ${error.message}. Please ensure the information is correct.`, error)
+                getLogger().error(
+                    `Error parsing stack name and/or region information from samconfig.toml: ${error.message}. Ensure the information is correct.`,
+                    error
+                )
                 void showViewLogsMessage('Encountered an issue reading samconfig.toml')
                 break
             default:

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

@@ -56,9 +56,12 @@ export async function runOpenHandler(arg: ResourceNode): Promise<void> {
         arg.resource.resource.Runtime
     )
     if (!handlerFile) {
-        throw new ToolkitError(`No handler file found with name "${arg.resource.resource.Handler}". Please ensure the file exists in the expected location."`, {
-            code: 'NoHandlerFound',
-        })
+        throw new ToolkitError(
+            `No handler file found with name "${arg.resource.resource.Handler}". Ensure the file exists in the expected location."`,
+            {
+                code: 'NoHandlerFound',
+            }
+        )
     }
     await vscode.workspace.openTextDocument(handlerFile).then(async (doc) => await vscode.window.showTextDocument(doc))
 }

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

@@ -148,7 +148,7 @@ export async function getTutorial(
     const appSelected = appMap.get(project + runtime)
     telemetry.record({ action: project + runtime, source: source ?? 'AppBuilderWalkthrough' })
     if (!appSelected) {
-        throw new ToolkitError(`Template '${project}+${runtime}' does not exist, please choose another template.`)
+        throw new ToolkitError(`Template '${project}+${runtime}' does not exist, choose another template.`)
     }
 
     try {
@@ -258,7 +258,7 @@ export async function initWalkthroughProjectCommand() {
         if (!walkthroughSelected || !(typeof walkthroughSelected === 'string')) {
             getLogger().info('No walkthrough selected - exiting')
             void vscode.window.showErrorMessage(
-                localize('AWS.toolkit.lambda.walkthroughNotSelected', 'Please select a template in the walkthrough.')
+                localize('AWS.toolkit.lambda.walkthroughNotSelected', 'Select a template in the walkthrough.')
             )
             return
         }

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

@@ -71,7 +71,11 @@ describe('samProject', () => {
 
             const result = await wrapperCall(undefined)
             assert.deepStrictEqual(result, {})
-            assertLogsContain('Error parsing stack name and/or region information: No project folder found', false, 'warn')
+            assertLogsContain(
+                'Error parsing stack name and/or region information: No project folder found',
+                false,
+                'warn'
+            )
         })
 
         it('returns empty object given no samconfig file found', async () => {

packages/core/src/test/shared/applicationBuilder/explorer/nodes/appNode.test.ts

@@ -157,7 +157,7 @@ describe('AppNode', () => {
             assert.strictEqual(resourceNode.id, 'placeholder')
             assert.strictEqual(
                 resourceNode.resource,
-                '[Unable to load Resource tree for this App. Update SAM template]'
+                '[Unable to load resource tree for this app. Ensure SAM template is correct.]'
             )
             assert(getAppStub.calledOnce)
             assert(getStackNameStub.notCalled)

packages/core/src/test/shared/applicationBuilder/explorer/nodes/deployedNode.test.ts

@@ -220,7 +220,10 @@ describe('generateDeployedNode', () => {
             // Check placeholder propertries
             const deployedResourceNode = deployedResourceNodes[0] as DeployedResourceNode
             assert.strictEqual(deployedResourceNode.id, 'placeholder')
-            assert.strictEqual(deployedResourceNode.resource, '[Failed to retrive deployed resource.]')
+            assert.strictEqual(
+                deployedResourceNode.resource,
+                '[Failed to retrieve deployed resource. Ensure correct stack name and region are in the samconfig.toml, and that your account is connected.]'
+            )
         })
     })
 
@@ -374,7 +377,7 @@ describe('generateDeployedNode', () => {
             // Check placeholder propertries
             const deployedResourceNode = deployedResourceNodes[0] as DeployedResourceNode
             assert.strictEqual(deployedResourceNode.id, 'placeholder')
-            assert.strictEqual(deployedResourceNode.resource, '[This resource is not yet supported.]')
+            assert.strictEqual(deployedResourceNode.resource, '[This resource is not yet supported in AppBuilder.]')
         })
     })
 })

packages/toolkit/.changes/next-release/Bug Fix-b033b55b-52a5-488a-a4a7-c3228232bca6.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "AppBuilder: Update error messaging to make more legible and actionable"
+}