From 91d1b849953ac62979679244678f9e62b9111de2 Mon Sep 17 00:00:00 2001 From: mbfreder Date: Fri, 14 Feb 2025 11:06:42 -0800 Subject: [PATCH 1/3] Autoload first matching debug config when the local invoke view is opened --- .../core/src/lambda/vue/configEditor/samInvokeBackend.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/core/src/lambda/vue/configEditor/samInvokeBackend.ts b/packages/core/src/lambda/vue/configEditor/samInvokeBackend.ts index b292c8ab93e..2084ebe82fe 100644 --- a/packages/core/src/lambda/vue/configEditor/samInvokeBackend.ts +++ b/packages/core/src/lambda/vue/configEditor/samInvokeBackend.ts @@ -13,6 +13,7 @@ import { AwsSamDebuggerConfiguration, isCodeTargetProperties, isTemplateTargetProperties, + TemplateTargetProperties, } from '../../../shared/sam/debugger/awsSamDebugConfiguration' import { DefaultAwsSamDebugConfigurationValidator, @@ -433,15 +434,19 @@ export async function registerSamDebugInvokeVueCommand( context: vscode.ExtensionContext, params: { resource: ResourceNode } ) { - const launchConfig: AwsSamDebuggerConfiguration | undefined = undefined const resource = params?.resource.resource const source = 'AppBuilderLocalInvoke' + const launchConfigs = await new LaunchConfiguration(resource.location).getSamDebugConfigurations() + const launchConfig = launchConfigs.find( + (config) => (config.invokeTarget as TemplateTargetProperties).logicalId === resource.resource.Id + ) + const webview = new WebviewPanel(context, launchConfig, { logicalId: resource.resource.Id ?? '', region: resource.region ?? '', location: resource.location.fsPath, handler: resource.resource.Handler!, - runtime: resource.resource.Runtime!, + runtime: launchConfig?.lambda?.runtime ?? resource.resource.Runtime!, arn: resource.functionArn ?? '', stackName: resource.stackName ?? '', environment: resource.resource.Environment, From d19c271179ab392272b91b0b3e1a109af6b90a78 Mon Sep 17 00:00:00 2001 From: mbfreder Date: Fri, 14 Feb 2025 11:50:15 -0800 Subject: [PATCH 2/3] add changelog --- .../Feature-d85ac3b3-0e30-41fd-9dc1-1d214275189a.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 packages/toolkit/.changes/next-release/Feature-d85ac3b3-0e30-41fd-9dc1-1d214275189a.json diff --git a/packages/toolkit/.changes/next-release/Feature-d85ac3b3-0e30-41fd-9dc1-1d214275189a.json b/packages/toolkit/.changes/next-release/Feature-d85ac3b3-0e30-41fd-9dc1-1d214275189a.json new file mode 100644 index 00000000000..ebba9a5d25d --- /dev/null +++ b/packages/toolkit/.changes/next-release/Feature-d85ac3b3-0e30-41fd-9dc1-1d214275189a.json @@ -0,0 +1,4 @@ +{ + "type": "Feature", + "description": "lambda: autoload debug config when Local invoke webview is opened" +} From 6858cbb64490ca2d89130c3d5dfb26afff55e7eb Mon Sep 17 00:00:00 2001 From: Frederic Mbea <117131783+mbfreder@users.noreply.github.com> Date: Fri, 14 Feb 2025 13:45:14 -0800 Subject: [PATCH 3/3] Update packages/toolkit/.changes/next-release/Feature-d85ac3b3-0e30-41fd-9dc1-1d214275189a.json Co-authored-by: vicheey --- .../Feature-d85ac3b3-0e30-41fd-9dc1-1d214275189a.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolkit/.changes/next-release/Feature-d85ac3b3-0e30-41fd-9dc1-1d214275189a.json b/packages/toolkit/.changes/next-release/Feature-d85ac3b3-0e30-41fd-9dc1-1d214275189a.json index ebba9a5d25d..851f275f942 100644 --- a/packages/toolkit/.changes/next-release/Feature-d85ac3b3-0e30-41fd-9dc1-1d214275189a.json +++ b/packages/toolkit/.changes/next-release/Feature-d85ac3b3-0e30-41fd-9dc1-1d214275189a.json @@ -1,4 +1,4 @@ { "type": "Feature", - "description": "lambda: autoload debug config when Local invoke webview is opened" + "description": "App Builder: Autoload debug configuration for local invoke webview" }