Remove unused code (aws#735)

Removing unused code associated with selectLambdaNode. It used to be required for a command that was launched from the Command Palette, which is no longer the case.

Also:
* Formatter Changes
* variable renames

Author: awschristou

src/awsexplorer/awsExplorer.ts

@@ -40,7 +40,7 @@ export class AwsExplorer implements vscode.TreeDataProvider<AWSTreeNodeBase>, Re
         private readonly regionProvider: RegionProvider,
         private readonly resourceFetcher: ResourceFetcher,
         private readonly getExtensionAbsolutePath: (relativeExtensionPath: string) => string,
-        private readonly lambdaOutputChannel: vscode.OutputChannel = vscode.window.createOutputChannel('AWS Lambda'),
+        private readonly lambdaOutputChannel: vscode.OutputChannel = vscode.window.createOutputChannel('AWS Lambda')
     ) {
         this._onDidChangeTreeData = new vscode.EventEmitter<AWSTreeNodeBase | undefined>()
         this.onDidChangeTreeData = this._onDidChangeTreeData.event
@@ -55,12 +55,13 @@ export class AwsExplorer implements vscode.TreeDataProvider<AWSTreeNodeBase>, Re
 
         registerCommand({
             command: 'aws.deleteLambda',
-            callback: async (node: LambdaFunctionNode) => await deleteLambda({
-                deleteParams: { functionName: node.configuration.FunctionName || '' },
-                lambdaClient: ext.toolkitClientBuilder.createLambdaClient(node.regionCode),
-                outputChannel: this.lambdaOutputChannel,
-                onRefresh: () => this.refresh(node.parent)
-            }),
+            callback: async (node: LambdaFunctionNode) =>
+                await deleteLambda({
+                    deleteParams: { functionName: node.configuration.FunctionName || '' },
+                    lambdaClient: ext.toolkitClientBuilder.createLambdaClient(node.regionCode),
+                    outputChannel: this.lambdaOutputChannel,
+                    onRefresh: () => this.refresh(node.parent)
+                }),
             telemetryName: {
                 namespace: TelemetryNamespace.Lambda,
                 name: 'delete'
@@ -69,10 +70,8 @@ export class AwsExplorer implements vscode.TreeDataProvider<AWSTreeNodeBase>, Re
 
         registerCommand({
             command: 'aws.deleteCloudFormation',
-            callback: async (node: CloudFormationStackNode) => await deleteCloudFormation(
-                () => this.refresh(node.parent),
-                node
-            ),
+            callback: async (node: CloudFormationStackNode) =>
+                await deleteCloudFormation(() => this.refresh(node.parent), node),
             telemetryName: {
                 namespace: TelemetryNamespace.Cloudformation,
                 name: 'delete'
@@ -86,12 +85,13 @@ export class AwsExplorer implements vscode.TreeDataProvider<AWSTreeNodeBase>, Re
 
         registerCommand({
             command: 'aws.invokeLambda',
-            callback: async (node: FunctionNodeBase) => await invokeLambda({
-                awsContext: this.awsContext,
-                element: node,
-                outputChannel: this.lambdaOutputChannel,
-                resourceFetcher: this.resourceFetcher
-            }),
+            callback: async (node: FunctionNodeBase) =>
+                await invokeLambda({
+                    awsContext: this.awsContext,
+                    functionNode: node,
+                    outputChannel: this.lambdaOutputChannel,
+                    resourceFetcher: this.resourceFetcher
+                }),
             telemetryName: {
                 namespace: TelemetryNamespace.Lambda,
                 name: 'invokeremote'
@@ -134,7 +134,7 @@ export class AwsExplorer implements vscode.TreeDataProvider<AWSTreeNodeBase>, Re
                             'Unable to load Lambda Functions, click here to retry'
                         ),
                         'aws.refreshAwsExplorerNode',
-                        [this, element],
+                        [this, element]
                     )
                 ]
             }
@@ -148,7 +148,8 @@ export class AwsExplorer implements vscode.TreeDataProvider<AWSTreeNodeBase>, Re
                     localize('AWS.explorerNode.signIn', 'Connect to AWS...'),
                     'aws.login',
                     undefined,
-                    localize('AWS.explorerNode.signIn.tooltip', 'Connect to AWS using a credential profile'))
+                    localize('AWS.explorerNode.signIn.tooltip', 'Connect to AWS using a credential profile')
+                )
             ]
         }
 
@@ -159,10 +160,10 @@ export class AwsExplorer implements vscode.TreeDataProvider<AWSTreeNodeBase>, Re
             this.regionNodes,
             intersection(regionMap.keys(), explorerRegionCodes),
             key => this.regionNodes.get(key)!.update(regionMap.get(key)!),
-            key => new DefaultRegionNode(
-                regionMap.get(key)!,
-                relativeExtensionPath => this.getExtensionAbsolutePath(relativeExtensionPath)
-            )
+            key =>
+                new DefaultRegionNode(regionMap.get(key)!, relativeExtensionPath =>
+                    this.getExtensionAbsolutePath(relativeExtensionPath)
+                )
         )
 
         if (this.regionNodes.size > 0) {
@@ -174,7 +175,8 @@ export class AwsExplorer implements vscode.TreeDataProvider<AWSTreeNodeBase>, Re
                     localize('AWS.explorerNode.addRegion', 'Click to add a region to view functions...'),
                     'aws.showRegion',
                     undefined,
-                    localize('AWS.explorerNode.addRegion.tooltip', 'Configure a region to show available functions'))
+                    localize('AWS.explorerNode.addRegion.tooltip', 'Configure a region to show available functions')
+                )
             ]
         }
     }

src/lambda/commands/invokeLambda.ts

@@ -20,7 +20,6 @@ import { sampleRequestManifestPath, sampleRequestPath } from '../constants'
 import { FunctionNodeBase } from '../explorer/functionNode'
 import { SampleRequest } from '../models/sampleRequest'
 import { LambdaTemplates } from '../templates/lambdaTemplates'
-import { selectLambdaNode } from '../utils'
 
 interface SampleRequestManifest {
     requests: {
@@ -43,19 +42,18 @@ export async function invokeLambda(params: {
      *      invokeParams: {functionArn: string} // or Lambda.Types.InvocationRequest (see: lambda.d.ts)
      *  }
      */
-    awsContext: AwsContext, // TODO: Consider replacing 'awsContext' with something specific and meaningful
-    outputChannel: vscode.OutputChannel,
-    resourceFetcher: ResourceFetcher,
-    element?: FunctionNodeBase, // TODO: Consider replacing 'element'' with something specific and meaningful
+    awsContext: AwsContext // TODO: Consider replacing 'awsContext' with something specific and meaningful
+    outputChannel: vscode.OutputChannel
+    resourceFetcher: ResourceFetcher
+    functionNode: FunctionNodeBase // TODO: Consider replacing 'element'' with something specific and meaningful
 }) {
-
     const logger: Logger = getLogger()
 
     try {
-        const fn: FunctionNodeBase = await selectLambdaNode(params.awsContext, params.element)
+        const functionNode = params.functionNode
         const view = vscode.window.createWebviewPanel(
             'html',
-            `Invoked ${fn.configuration.FunctionName}`,
+            `Invoked ${functionNode.configuration.FunctionName}`,
             vscode.ViewColumn.One,
             {
                 // Enable scripts in the webview
@@ -93,7 +91,7 @@ export async function invokeLambda(params: {
                     return
                 }
 
-                _.forEach(result.requests.request, (r) => {
+                _.forEach(result.requests.request, r => {
                     inputs.push({ name: r.name, filename: r.filename })
                 })
             })
@@ -105,20 +103,20 @@ export async function invokeLambda(params: {
 
             view.webview.html = baseTemplateFn({
                 content: invokeTemplateFn({
-                    FunctionName: fn.configuration.FunctionName,
+                    FunctionName: functionNode.configuration.FunctionName,
                     InputSamples: inputs,
                     Scripts: loadScripts,
                     Libraries: loadLibs
-                }),
+                })
             })
 
             view.webview.onDidReceiveMessage(
                 createMessageReceivedFunc({
-                    fn,
+                    fn: functionNode,
                     outputChannel: params.outputChannel,
                     resourceFetcher: params.resourceFetcher,
                     resourcePath: resourcePath,
-                    onPostMessage: message  => view.webview.postMessage(message)
+                    onPostMessage: message => view.webview.postMessage(message)
                 }),
                 undefined,
                 ext.context.subscriptions
@@ -132,15 +130,18 @@ export async function invokeLambda(params: {
     }
 }
 
-function createMessageReceivedFunc({fn, outputChannel, ...restParams}: {
+function createMessageReceivedFunc({
+    fn,
+    outputChannel,
+    ...restParams
+}: {
     // TODO: Consider passing lambdaClient: LambdaClient
-    fn: FunctionNodeBase, // TODO: Replace w/ invokeParams: {functionArn: string} // or Lambda.Types.InvocationRequest
+    fn: FunctionNodeBase // TODO: Replace w/ invokeParams: {functionArn: string} // or Lambda.Types.InvocationRequest
     outputChannel: vscode.OutputChannel
-    resourceFetcher: ResourceFetcher,
-    resourcePath: string,
+    resourceFetcher: ResourceFetcher
+    resourcePath: string
     onPostMessage(message: any): Thenable<boolean>
 }) {
-
     const logger: Logger = getLogger()
 
     return async (message: CommandMessage) => {
@@ -172,13 +173,8 @@ function createMessageReceivedFunc({fn, outputChannel, ...restParams}: {
                         throw new Error(`Could not determine ARN for function ${fn.configuration.FunctionName}`)
                     }
                     const client: LambdaClient = ext.toolkitClientBuilder.createLambdaClient(fn.regionCode)
-                    const funcResponse = await client.invoke(
-                        fn.configuration.FunctionArn,
-                        message.value
-                    )
-                    const logs = funcResponse.LogResult ?
-                        Buffer.from(funcResponse.LogResult, 'base64').toString() :
-                        ''
+                    const funcResponse = await client.invoke(fn.configuration.FunctionArn, message.value)
+                    const logs = funcResponse.LogResult ? Buffer.from(funcResponse.LogResult, 'base64').toString() : ''
                     const payload = funcResponse.Payload ? funcResponse.Payload : JSON.stringify({})
 
                     outputChannel.appendLine(`Invocation result for ${fn.configuration.FunctionArn}`)

src/lambda/commands/quickPickLambda.ts

@@ -8,48 +8,8 @@ const localize = nls.loadMessageBundle()
 
 import { CloudFormation, Lambda } from 'aws-sdk'
 import * as vscode from 'vscode'
-import { AwsContext } from '../shared/awsContext'
 import { CloudFormationClient } from '../shared/clients/cloudFormationClient'
 import { LambdaClient } from '../shared/clients/lambdaClient'
-import { ext } from '../shared/extensionGlobals'
-import { getLogger, Logger } from '../shared/logger'
-import { toArrayAsync } from '../shared/utilities/collectionUtils'
-import { quickPickLambda } from './commands/quickPickLambda'
-import { FunctionNodeBase } from './explorer/functionNode'
-
-export async function selectLambdaNode(
-    awsContext: AwsContext,
-    element?: FunctionNodeBase
-): Promise<FunctionNodeBase> {
-
-    const logger: Logger = getLogger()
-
-    if (element && element.configuration) {
-        logger.info('returning preselected node...')
-
-        return element
-    }
-
-    logger.info('prompting for lambda selection...')
-
-    // TODO: we need to change this into a multi-step command to first obtain the region,
-    // then query the lambdas in the region
-    const regions = await awsContext.getExplorerRegions()
-    if (regions.length === 0) {
-        throw new Error('No regions defined for explorer, required until we have a multi-stage picker')
-    }
-    const client: LambdaClient = ext.toolkitClientBuilder.createLambdaClient(regions[0])
-    const lambdas: Lambda.FunctionConfiguration[] = await toArrayAsync(listLambdaFunctions(client))
-
-    // used to show a list of lambdas and allow user to select.
-    // this is useful for calling commands from the command palette
-    const selection = await quickPickLambda(lambdas, regions[0])
-    if (selection && selection.configuration) {
-        return selection
-    }
-
-    throw new Error('No lambda found.')
-}
 
 export async function* listCloudFormationStacks(
     client: CloudFormationClient
@@ -68,13 +28,12 @@ export async function* listCloudFormationStacks(
 }
 
 export async function* listLambdaFunctions(client: LambdaClient): AsyncIterableIterator<Lambda.FunctionConfiguration> {
-
     const status = vscode.window.setStatusBarMessage(
-        localize('AWS.message.statusBar.loading.lambda', 'Loading Lambdas...'))
+        localize('AWS.message.statusBar.loading.lambda', 'Loading Lambdas...')
+    )
 
     try {
         yield* client.listFunctions()
-
     } finally {
         if (!!status) {
             status.dispose()