fix: "Upload Lambda" from template.yaml asks for directory #3043

Problem: When "Upload Lambda" is invoked from a template.yaml file in the vscode
file explorer, the wizard prompts for the choice of a zip or a directory and
then which directory. These steps are redundant.

Solution: When "Upload Lambda" is invoked from a template.yaml,
skip the wizard steps that ask to choose a directory.

Author: gsweetwood

.changes/next-release/Feature-bf5e2a43-174d-4549-a914-a4bda5bce0c5.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Upload Lambda wizard will skip prompts and auto select parent directory when invoked from a template file."
+}

src/lambda/commands/uploadLambda.ts

@@ -212,9 +212,13 @@ export class UploadLambdaWizard extends Wizard<UploadLambdaWizardState> {
         super({ initState: { lambda } })
         this.form.lambda.region.bindPrompter(() => createRegionPrompter().transform(region => region.id))
 
-        if (invokePath && fs.statSync(invokePath.fsPath).isDirectory()) {
+        if (invokePath) {
             this.form.uploadType.setDefault('directory')
-            this.form.targetUri.setDefault(invokePath)
+            if (fs.statSync(invokePath.fsPath).isFile()) {
+                this.form.targetUri.setDefault(vscode.Uri.file(path.dirname(invokePath.fsPath)))
+            } else {
+                this.form.targetUri.setDefault(invokePath)
+            }
         } else {
             this.form.uploadType.bindPrompter(() => createUploadTypePrompter())
             this.form.targetUri.bindPrompter(({ uploadType }) => {

src/test/lambda/wizards/uploadLambdaWizard.test.ts

@@ -4,6 +4,10 @@
  */
 
 import * as vscode from 'vscode'
+import * as path from 'path'
+import * as assert from 'assert'
+import * as fs from 'fs-extra'
+import { writeFileSync } from 'fs-extra'
 import { createWizardTester, WizardTester } from '../../shared/wizards/wizardTestUtils'
 import { UploadLambdaWizard, UploadLambdaWizardState, LambdaFunction } from '../../../lambda/commands/uploadLambda'
 import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
@@ -54,6 +58,9 @@ describe('UploadLambdaWizard', function () {
             invokePath = vscode.Uri.file(tempDir)
             tester = createWizardTester(new UploadLambdaWizard(undefined, invokePath))
         })
+        afterEach(async function () {
+            await fs.remove(tempDir)
+        })
 
         it('skip select directory, auto selected', function () {
             tester.lambda.region.assertShow(1)
@@ -65,4 +72,30 @@ describe('UploadLambdaWizard', function () {
             tester.confirmedDeploy.assertShow(3)
         })
     })
+
+    describe('invoked from template', function () {
+        let tempDir: string
+        let tempDirUri: vscode.Uri
+        let invokePath: vscode.Uri
+        beforeEach(async function () {
+            tempDir = await makeTemporaryToolkitFolder()
+            tempDirUri = vscode.Uri.file(tempDir)
+            writeFileSync(path.join(tempDir, 'template.yaml'), '')
+            invokePath = vscode.Uri.file(path.join(tempDir, 'template.yaml'))
+            tester = createWizardTester(new UploadLambdaWizard(undefined, invokePath))
+        })
+        afterEach(async function () {
+            await fs.remove(tempDir)
+        })
+
+        it('skip select directory, auto selected', function () {
+            tester.lambda.region.assertShow(1)
+            tester.uploadType.assertDoesNotShow()
+            tester.uploadType.assertValue('directory')
+            tester.targetUri.assertDoesNotShow()
+            assert.strictEqual(tester.targetUri.value?.fsPath, tempDirUri.fsPath)
+            tester.lambda.name.assertShow(2)
+            tester.confirmedDeploy.assertShow(3)
+        })
+    })
 })