feat(lambda): Remote action support on deployed lambda node

packages/core/package.json

@@ -323,159 +323,173 @@
                     "fontCharacter": "\\f1d2"
                 }
             },
-            "aws-lambda-function": {
+            "aws-lambda-deployed-function": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1d3"
                 }
             },
-            "aws-mynah-MynahIconBlack": {
+            "aws-lambda-function": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1d4"
                 }
             },
-            "aws-mynah-MynahIconWhite": {
+            "aws-lambda-invoke-remotely": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1d5"
                 }
             },
-            "aws-mynah-logo": {
+            "aws-mynah-MynahIconBlack": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1d6"
                 }
             },
-            "aws-redshift-cluster": {
+            "aws-mynah-MynahIconWhite": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1d7"
                 }
             },
-            "aws-redshift-cluster-connected": {
+            "aws-mynah-logo": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1d8"
                 }
             },
-            "aws-redshift-database": {
+            "aws-redshift-cluster": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1d9"
                 }
             },
-            "aws-redshift-redshift-cluster-connected": {
+            "aws-redshift-cluster-connected": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1da"
                 }
             },
-            "aws-redshift-schema": {
+            "aws-redshift-database": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1db"
                 }
             },
-            "aws-redshift-table": {
+            "aws-redshift-redshift-cluster-connected": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1dc"
                 }
             },
-            "aws-s3-bucket": {
+            "aws-redshift-schema": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1dd"
                 }
             },
-            "aws-s3-create-bucket": {
+            "aws-redshift-table": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1de"
                 }
             },
-            "aws-sagemaker-code-editor": {
+            "aws-s3-bucket": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1df"
                 }
             },
-            "aws-sagemaker-jupyter-lab": {
+            "aws-s3-create-bucket": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1e0"
                 }
             },
-            "aws-sagemakerunifiedstudio-catalog": {
+            "aws-sagemaker-code-editor": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1e1"
                 }
             },
-            "aws-sagemakerunifiedstudio-spaces": {
+            "aws-sagemaker-jupyter-lab": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1e2"
                 }
             },
-            "aws-sagemakerunifiedstudio-spaces-dark": {
+            "aws-sagemakerunifiedstudio-catalog": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1e3"
                 }
             },
-            "aws-sagemakerunifiedstudio-symbol-int": {
+            "aws-sagemakerunifiedstudio-spaces": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1e4"
                 }
             },
-            "aws-sagemakerunifiedstudio-table": {
+            "aws-sagemakerunifiedstudio-spaces-dark": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1e5"
                 }
             },
-            "aws-schemas-registry": {
+            "aws-sagemakerunifiedstudio-symbol-int": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1e6"
                 }
             },
-            "aws-schemas-schema": {
+            "aws-sagemakerunifiedstudio-table": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1e7"
                 }
             },
-            "aws-stepfunctions-preview": {
+            "aws-schemas-registry": {
                 "description": "AWS Contributed Icon",
                 "default": {
                     "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
                     "fontCharacter": "\\f1e8"
                 }
+            },
+            "aws-schemas-schema": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e9"
+                }
+            },
+            "aws-stepfunctions-preview": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ea"
+                }
             }
         }
     },

packages/core/package.nls.json

@@ -249,7 +249,7 @@
     "AWS.command.ssmDocument.openLocalDocumentJson": "Download as JSON",
     "AWS.command.ssmDocument.openLocalDocumentYaml": "Download as YAML",
     "AWS.command.ssmDocument.publishDocument": "Publish a Systems Manager Document",
-    "AWS.command.launchConfigForm.title": "Local Invoke and Debug Configuration",
+    "AWS.command.launchConfigForm.title": "Invoke Locally",
     "AWS.command.addSamDebugConfig": "Add Local Invoke and Debug Configuration",
     "AWS.command.toggleSamCodeLenses": "Toggle SAM hints in source files",
     "AWS.command.apprunner.createService": "Create Service",

packages/core/resources/markdown/samReadme.md

@@ -13,7 +13,7 @@ ${LISTOFCONFIGURATIONS}
 
 You can debug the Lambda handlers locally by adding a breakpoint to the source file, then running the launch configuration. This works by using Docker on your local machine.
 
-Invocation parameters, including payloads and request parameters, can be edited either by the `Local Invoke and Debug Configuration` command (through the ${COMMANDPALETTE} or ${CODELENS}) or by editing the `launch.json` file.
+Invocation parameters, including payloads and request parameters, can be edited either by the `Invoke Locally` command (through the ${COMMANDPALETTE} or ${CODELENS}) or by editing the `launch.json` file.
 
 ${COMPANYNAME} Lambda functions not defined in the [`template.yaml`](./template.yaml) file can be invoked and debugged by creating a launch configuration through the ${CODELENS} over the function declaration, or with the `Add Local Invoke and Debug Configuration` command.
 

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

@@ -80,7 +80,7 @@ export async function generateDeployedNode(
     stackName: string,
     resourceTreeEntity: ResourceTreeEntity,
     location?: vscode.Uri
-): Promise<any[]> {
+): Promise<DeployedResourceNode[] | TreeNode[]> {
     let newDeployedResource: any
     const partitionId = globals.regionProvider.getPartitionId(regionCode) ?? defaultPartition
     try {
@@ -97,7 +97,9 @@ export async function generateDeployedNode(
                         regionCode,
                         configuration,
                         undefined,
-                        location ? vscode.Uri.joinPath(location, resourceTreeEntity.CodeUri ?? '').fsPath : undefined
+                        location ? vscode.Uri.joinPath(location, resourceTreeEntity.CodeUri ?? '').fsPath : undefined,
+                        location,
+                        deployedResource.LogicalResourceId
                     )
                 } catch (error: any) {
                     getLogger().error('Error getting Lambda configuration: %O', error)

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

@@ -17,13 +17,36 @@ import { generatePropertyNodes } from './propertyNode'
 import { generateDeployedNode } from './deployedNode'
 import { StackResource } from '../../../../lambda/commands/listSamResources'
 import { DeployedResourceNode } from './deployedNode'
+import { LambdaFunctionNode } from '../../../../lambda/explorer/lambdaFunctionNode'
+import { ToolkitError } from '../../../../shared/errors'
 
 enum ResourceTypeId {
     Function = 'function',
+    DeployedFunction = 'deployed-function',
     Api = 'api',
     Other = '',
 }
 
+export async function generateLambdaNodeFromResource(resource: ResourceNode['resource']): Promise<LambdaFunctionNode> {
+    if (!resource.deployedResource || !resource.region || !resource.stackName || !resource.resource) {
+        throw new ToolkitError('Error getting Lambda info from Appbuilder Node, please check your connection')
+    }
+    const nodes = (await generateDeployedNode(
+        resource.deployedResource,
+        resource.region,
+        resource.stackName,
+        resource.resource,
+        resource.projectRoot
+    )) as DeployedResourceNode[]
+    if (nodes.length !== 1) {
+        throw new ToolkitError('Error getting Lambda info from Appbuilder Node, please check your connection')
+    }
+    // lambda function node or undefined
+    return nodes[0].resource?.explorerNode
+}
+
+// from here, we should have a helper function to detect if lambda is deployed
+// then return deployed node/normal node on each condition.
 export class ResourceNode implements TreeNode {
     public readonly id = this.resourceTreeEntity.Id
     private readonly type = this.resourceTreeEntity.Type
@@ -43,6 +66,7 @@ export class ResourceNode implements TreeNode {
         return {
             resource: this.resourceTreeEntity,
             location: this.location.samTemplateUri,
+            projectRoot: this.location.projectRoot,
             workspaceFolder: this.location.workspaceFolder,
             region: this.region,
             stackName: this.stackName,
@@ -56,13 +80,13 @@ export class ResourceNode implements TreeNode {
         let propertyNodes: TreeNode[] = []
 
         if (this.deployedResource && this.region && this.stackName) {
-            deployedNodes = await generateDeployedNode(
+            deployedNodes = (await generateDeployedNode(
                 this.deployedResource,
                 this.region,
                 this.stackName,
                 this.resourceTreeEntity,
                 this.location.projectRoot
-            )
+            )) as DeployedResourceNode[]
         }
         if (this.resourceTreeEntity.Type === SERVERLESS_FUNCTION_TYPE) {
             propertyNodes = generatePropertyNodes(this.resourceTreeEntity)
@@ -72,10 +96,7 @@ export class ResourceNode implements TreeNode {
     }
 
     public getTreeItem(): vscode.TreeItem {
-        // Determine the initial TreeItem collapsible state based on the type
-        const collapsibleState = this.deployedResource
-            ? vscode.TreeItemCollapsibleState.Collapsed
-            : vscode.TreeItemCollapsibleState.None
+        const collapsibleState = vscode.TreeItemCollapsibleState.Collapsed
 
         // Create the TreeItem with the determined collapsible state
         const item = new vscode.TreeItem(this.resourceTreeEntity.Id, collapsibleState)
@@ -100,7 +121,11 @@ export class ResourceNode implements TreeNode {
     private getIconPath(): IconPath | undefined {
         switch (this.type) {
             case SERVERLESS_FUNCTION_TYPE:
+                if (this.deployedResource) {
+                    return getIcon('aws-lambda-deployed-function')
+                }
                 return getIcon('aws-lambda-function')
+            // add deployed lambda function type
             case s3BucketType:
                 return getIcon('aws-s3-bucket')
             case appRunnerType:
@@ -115,6 +140,9 @@ export class ResourceNode implements TreeNode {
     private getResourceId(): ResourceTypeId {
         switch (this.type) {
             case SERVERLESS_FUNCTION_TYPE:
+                if (this.deployedResource) {
+                    return ResourceTypeId.DeployedFunction
+                }
                 return ResourceTypeId.Function
             case 'Api':
                 return ResourceTypeId.Api