Merge #1166 'remove detectLocalLambdas.ts, detectLocalTemplates.ts'

Author: justinmk3

package.json

@@ -77,11 +77,6 @@
                     "default": "prompt",
                     "markdownDescription": "%AWS.configuration.description.onDefaultRegionMissing%"
                 },
-                "aws.sam.template.depth": {
-                    "type": "number",
-                    "default": 4,
-                    "description": "%AWS.configuration.sam.template.depth%"
-                },
                 "aws.samcli.location": {
                     "type": "string",
                     "default": "",

package.nls.json

@@ -17,7 +17,6 @@
     "AWS.configuration.description.cdk.explorer.enabled": "Enable the AWS CDK Explorer",
     "AWS.configuration.description.logLevel": "The AWS Toolkit's log level (changes reflected on restart)",
     "AWS.configuration.description.onDefaultRegionMissing": "Action to take when a Profile's default region is hidden in the Explorer. Possible values:\n* `add` - shows region in the explorer\n* `ignore` - does nothing with the region\n* `prompt` - (default) asks the user what they would like to do.",
-    "AWS.configuration.sam.template.depth": "The maximum subfolder depth within a workspace that the Toolkit will search for SAM Template files",
     "AWS.configuration.description.samcli.debug.attach.retry.maximum": "If the Toolkit is unable to attach a debugger, this is the number of times to retry before giving up.",
     "AWS.configuration.description.samcli.debug.attach.timeout": "Maximum time (in milliseconds) to wait for SAM output while starting a Local Lambda session",
     "AWS.configuration.description.samcli.location": "Location of SAM CLI. SAM CLI is used to create, build, package, and deploy Serverless Applications. [Learn More](https://aws.amazon.com/serverless/sam/)",

src/integrationTest/codelens.js.test.ts

@@ -21,8 +21,6 @@ describe('SAM Local CodeLenses (JS)', async () => {
         // tslint:disable-next-line:no-invalid-this
         this.timeout(ACTIVATE_EXTENSION_TIMEOUT_MILLIS)
         await activateExtension(VSCODE_EXTENSION_ID.awstoolkit)
-
-        await vscode.workspace.getConfiguration('aws').update('sam.template.depth', 8, false)
     })
 
     it('appear when manifest in subfolder and app is beside manifest', async () => {

src/lambda/local/detectLocalLambdas.ts

@@ -4,6 +4,8 @@
  */
 
 import * as nls from 'vscode-nls'
+import * as _ from 'lodash'
+
 const localize = nls.loadMessageBundle()
 
 import * as path from 'path'
@@ -16,11 +18,11 @@ import { getRegionsForActiveCredentials } from '../../shared/regions/regionUtili
 import { createHelpButton } from '../../shared/ui/buttons'
 import * as input from '../../shared/ui/input'
 import * as picker from '../../shared/ui/picker'
-import { difference, filter, toArrayAsync } from '../../shared/utilities/collectionUtils'
+import { difference, filter } from '../../shared/utilities/collectionUtils'
 import { MultiStepWizard, WizardStep } from '../../shared/wizards/multiStepWizard'
 import { configureParameterOverrides } from '../config/configureParameterOverrides'
-import { detectLocalTemplates } from '../local/detectLocalTemplates'
 import { getOverriddenParameters, getParameters } from '../utilities/parameterUtils'
+import { CloudFormationTemplateRegistry } from '../../shared/cloudformation/templateRegistry'
 
 export interface SamDeployWizardResponse {
     parameterOverrides: Map<string, string>
@@ -36,8 +38,6 @@ export const enum ParameterPromptResult {
 }
 
 export interface SamDeployWizardContext {
-    readonly onDetectLocalTemplates: typeof detectLocalTemplates
-
     readonly workspaceFolders: vscode.Uri[] | undefined
 
     /**
@@ -120,7 +120,6 @@ function getSingleResponse(responses: vscode.QuickPickItem[] | undefined): strin
 }
 
 export class DefaultSamDeployWizardContext implements SamDeployWizardContext {
-    public readonly onDetectLocalTemplates = detectLocalTemplates
     public readonly getParameters = getParameters
     public readonly getOverriddenParameters = getOverriddenParameters
     private readonly helpButton = createHelpButton(localize('AWS.command.help', 'View Toolkit Documentation'))
@@ -148,7 +147,7 @@ export class DefaultSamDeployWizardContext implements SamDeployWizardContext {
                 ),
             },
             buttons: [this.helpButton, vscode.QuickInputButtons.Back],
-            items: await getTemplateChoices(this.onDetectLocalTemplates, ...workspaceFolders),
+            items: await getTemplateChoices(...workspaceFolders),
         })
 
         const choices = await picker.promptUser({
@@ -625,16 +624,13 @@ function validateStackName(value: string): string | undefined {
     return undefined
 }
 
-async function getTemplateChoices(
-    onDetectLocalTemplates: typeof detectLocalTemplates = detectLocalTemplates,
-    ...workspaceFolders: vscode.Uri[]
-): Promise<SamTemplateQuickPickItem[]> {
-    const uris = await toArrayAsync(onDetectLocalTemplates({ workspaceUris: workspaceFolders }))
-
+async function getTemplateChoices(...workspaceFolders: vscode.Uri[]): Promise<SamTemplateQuickPickItem[]> {
+    const cfnRegistry = CloudFormationTemplateRegistry.getRegistry()
+    const templateUris = cfnRegistry.registeredTemplates.map(o => vscode.Uri.file(o.path))
     const uriToLabel: Map<vscode.Uri, string> = new Map<vscode.Uri, string>()
     const labelCounts: Map<string, number> = new Map()
 
-    uris.forEach(uri => {
+    templateUris.forEach(uri => {
         const label = SamTemplateQuickPickItem.getLabel(uri)
         uriToLabel.set(uri, label)
         labelCounts.set(label, 1 + (labelCounts.get(label) || 0))