address comments

Author: mbfreder

packages/core/src/shared/sam/utils.ts

@@ -110,13 +110,14 @@ export async function updateRecentResponse(
 }
 
 const buildProcessMementoRootKey = 'samcli.build.processes'
+const globalIdentifier = 'global'
 
 /**
  * Returns true if there's an ongoing build process for the provided template, false otherwise
  * @Param templatePath The path to the template.yaml file
  */
 function isBuildInProgress(templatePath: string): boolean {
-    return getRecentResponse(buildProcessMementoRootKey, 'global', templatePath) !== undefined
+    return getRecentResponse(buildProcessMementoRootKey, globalIdentifier, templatePath) !== undefined
 }
 
 /**
@@ -125,7 +126,7 @@ function isBuildInProgress(templatePath: string): boolean {
  */
 export function throwIfTemplateIsBeingBuilt(templatePath: string) {
     if (isBuildInProgress(templatePath)) {
-        throw new ToolkitError('Template is already being built', { code: 'BuildInProgress' })
+        throw new ToolkitError('This template is already being built', { code: 'BuildInProgress' })
     }
 }
 

packages/core/src/test/shared/sam/build.test.ts

@@ -442,7 +442,7 @@ describe('SAM runBuild', () => {
                 },
                 (e: any) => {
                     assert.strictEqual(e instanceof ToolkitError, true)
-                    assert.strictEqual(e.message, 'Template is already being built')
+                    assert.strictEqual(e.message, 'This template is already being built')
                     assert.strictEqual(e.code, 'BuildInProgress')
                     return true
                 }