Skip to content

Commit fb70e94

Browse files
aws-toolkit-automationaws-toolkit-automation
authored
Merge master into feature/serverlessland
2 parents d45a436 + 0fa1b5b commit fb70e94

File tree

9 files changed

+841
-14
lines changed

9 files changed

+841
-14
lines changed

‎packages/core/src/lambda/vue/configEditor/samInvokeBackend.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
AwsSamDebuggerConfiguration,
1414
isCodeTargetProperties,
1515
isTemplateTargetProperties,
16+
TemplateTargetProperties,
1617
} from '../../../shared/sam/debugger/awsSamDebugConfiguration'
1718
import {
1819
DefaultAwsSamDebugConfigurationValidator,
@@ -433,15 +434,19 @@ export async function registerSamDebugInvokeVueCommand(
433434
context: vscode.ExtensionContext,
434435
params: { resource: ResourceNode }
435436
) {
436-
const launchConfig: AwsSamDebuggerConfiguration | undefined = undefined
437437
const resource = params?.resource.resource
438438
const source = 'AppBuilderLocalInvoke'
439+
const launchConfigs = await new LaunchConfiguration(resource.location).getSamDebugConfigurations()
440+
const launchConfig = launchConfigs.find(
441+
(config) => (config.invokeTarget as TemplateTargetProperties).logicalId === resource.resource.Id
442+
)
443+
439444
const webview = new WebviewPanel(context, launchConfig, {
440445
logicalId: resource.resource.Id ?? '',
441446
region: resource.region ?? '',
442447
location: resource.location.fsPath,
443448
handler: resource.resource.Handler!,
444-
runtime: resource.resource.Runtime!,
449+
runtime: launchConfig?.lambda?.runtime ?? resource.resource.Runtime!,
445450
arn: resource.functionArn ?? '',
446451
stackName: resource.stackName ?? '',
447452
environment: resource.resource.Environment,

‎packages/toolkit/.changes/next-release/Feature-d85ac3b3-0e30-41fd-9dc1-1d214275189a.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Feature",
3+
"description": "App Builder: Autoload debug configuration for local invoke webview"
4+
}

‎src.gen/@amzn/codewhisperer-streaming/README.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,13 @@ CreateProfile
227227
</details>
228228
<details>
229229
<summary>
230+
CreateWorkspace
231+
</summary>
232+
233+
[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/CreateWorkspaceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreateWorkspaceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreateWorkspaceCommandOutput/)
234+
</details>
235+
<details>
236+
<summary>
230237
DeleteCustomization
231238
</summary>
232239

@@ -297,6 +304,13 @@ ListTagsForResource
297304
</details>
298305
<details>
299306
<summary>
307+
ListWorkspaceMetadata
308+
</summary>
309+
310+
[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ListWorkspaceMetadataCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListWorkspaceMetadataCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListWorkspaceMetadataCommandOutput/)
311+
</details>
312+
<details>
313+
<summary>
300314
TagResource
301315
</summary>
302316

@@ -416,6 +430,13 @@ ListAvailableCustomizations
416430
</details>
417431
<details>
418432
<summary>
433+
ListAvailableProfiles
434+
</summary>
435+
436+
[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ListAvailableProfilesCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListAvailableProfilesCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListAvailableProfilesCommandOutput/)
437+
</details>
438+
<details>
439+
<summary>
419440
ListCodeAnalysisFindings
420441
</summary>
421442

‎src.gen/@amzn/codewhisperer-streaming/package-lock.json‎

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src.gen/@amzn/codewhisperer-streaming/src/commands/GenerateAssistantResponseCommand.ts‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,36 @@ export interface GenerateAssistantResponseCommandOutput extends GenerateAssistan
180180
* userSettings: { // UserSettings
181181
* hasConsentedToCrossRegionCalls: true || false,
182182
* },
183+
* additionalContext: [ // AdditionalContentList
184+
* { // AdditionalContentEntry
185+
* name: "STRING_VALUE", // required
186+
* description: "STRING_VALUE", // required
187+
* innerContext: "STRING_VALUE",
188+
* },
189+
* ],
190+
* toolResults: [ // ToolResults
191+
* { // ToolResult
192+
* toolUseId: "STRING_VALUE", // required
193+
* content: [ // ToolResultContent // required
194+
* { // ToolResultContentBlock Union: only one key present
195+
* text: "STRING_VALUE",
196+
* json: "DOCUMENT_VALUE",
197+
* },
198+
* ],
199+
* status: "success" || "error",
200+
* },
201+
* ],
202+
* tools: [ // Tools
203+
* { // Tool Union: only one key present
204+
* toolSpecification: { // ToolSpecification
205+
* inputSchema: { // ToolInputSchema
206+
* json: "DOCUMENT_VALUE",
207+
* },
208+
* name: "STRING_VALUE", // required
209+
* description: "STRING_VALUE",
210+
* },
211+
* },
212+
* ],
183213
* },
184214
* userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
185215
* },
@@ -302,6 +332,36 @@ export interface GenerateAssistantResponseCommandOutput extends GenerateAssistan
302332
* userSettings: {
303333
* hasConsentedToCrossRegionCalls: true || false,
304334
* },
335+
* additionalContext: [
336+
* {
337+
* name: "STRING_VALUE", // required
338+
* description: "STRING_VALUE", // required
339+
* innerContext: "STRING_VALUE",
340+
* },
341+
* ],
342+
* toolResults: [
343+
* {
344+
* toolUseId: "STRING_VALUE", // required
345+
* content: [ // required
346+
* {// Union: only one key present
347+
* text: "STRING_VALUE",
348+
* json: "DOCUMENT_VALUE",
349+
* },
350+
* ],
351+
* status: "success" || "error",
352+
* },
353+
* ],
354+
* tools: [
355+
* {// Union: only one key present
356+
* toolSpecification: {
357+
* inputSchema: {
358+
* json: "DOCUMENT_VALUE",
359+
* },
360+
* name: "STRING_VALUE", // required
361+
* description: "STRING_VALUE",
362+
* },
363+
* },
364+
* ],
305365
* },
306366
* userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
307367
* },
@@ -585,6 +645,12 @@ export interface GenerateAssistantResponseCommandOutput extends GenerateAssistan
585645
* // },
586646
* // ],
587647
* // },
648+
* // toolUseEvent: { // ToolUseEvent
649+
* // toolUseId: "STRING_VALUE", // required
650+
* // name: "STRING_VALUE", // required
651+
* // input: "STRING_VALUE",
652+
* // stop: true || false,
653+
* // },
588654
* // invalidStateEvent: { // InvalidStateEvent
589655
* // reason: "INVALID_TASK_ASSIST_PLAN", // required
590656
* // message: "STRING_VALUE", // required

‎src.gen/@amzn/codewhisperer-streaming/src/commands/GenerateTaskAssistPlanCommand.ts‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,36 @@ export interface GenerateTaskAssistPlanCommandOutput extends GenerateTaskAssistP
180180
* userSettings: { // UserSettings
181181
* hasConsentedToCrossRegionCalls: true || false,
182182
* },
183+
* additionalContext: [ // AdditionalContentList
184+
* { // AdditionalContentEntry
185+
* name: "STRING_VALUE", // required
186+
* description: "STRING_VALUE", // required
187+
* innerContext: "STRING_VALUE",
188+
* },
189+
* ],
190+
* toolResults: [ // ToolResults
191+
* { // ToolResult
192+
* toolUseId: "STRING_VALUE", // required
193+
* content: [ // ToolResultContent // required
194+
* { // ToolResultContentBlock Union: only one key present
195+
* text: "STRING_VALUE",
196+
* json: "DOCUMENT_VALUE",
197+
* },
198+
* ],
199+
* status: "success" || "error",
200+
* },
201+
* ],
202+
* tools: [ // Tools
203+
* { // Tool Union: only one key present
204+
* toolSpecification: { // ToolSpecification
205+
* inputSchema: { // ToolInputSchema
206+
* json: "DOCUMENT_VALUE",
207+
* },
208+
* name: "STRING_VALUE", // required
209+
* description: "STRING_VALUE",
210+
* },
211+
* },
212+
* ],
183213
* },
184214
* userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
185215
* },
@@ -302,6 +332,36 @@ export interface GenerateTaskAssistPlanCommandOutput extends GenerateTaskAssistP
302332
* userSettings: {
303333
* hasConsentedToCrossRegionCalls: true || false,
304334
* },
335+
* additionalContext: [
336+
* {
337+
* name: "STRING_VALUE", // required
338+
* description: "STRING_VALUE", // required
339+
* innerContext: "STRING_VALUE",
340+
* },
341+
* ],
342+
* toolResults: [
343+
* {
344+
* toolUseId: "STRING_VALUE", // required
345+
* content: [ // required
346+
* {// Union: only one key present
347+
* text: "STRING_VALUE",
348+
* json: "DOCUMENT_VALUE",
349+
* },
350+
* ],
351+
* status: "success" || "error",
352+
* },
353+
* ],
354+
* tools: [
355+
* {// Union: only one key present
356+
* toolSpecification: {
357+
* inputSchema: {
358+
* json: "DOCUMENT_VALUE",
359+
* },
360+
* name: "STRING_VALUE", // required
361+
* description: "STRING_VALUE",
362+
* },
363+
* },
364+
* ],
305365
* },
306366
* userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
307367
* },
@@ -588,6 +648,12 @@ export interface GenerateTaskAssistPlanCommandOutput extends GenerateTaskAssistP
588648
* // },
589649
* // ],
590650
* // },
651+
* // toolUseEvent: { // ToolUseEvent
652+
* // toolUseId: "STRING_VALUE", // required
653+
* // name: "STRING_VALUE", // required
654+
* // input: "STRING_VALUE",
655+
* // stop: true || false,
656+
* // },
591657
* // invalidStateEvent: { // InvalidStateEvent
592658
* // reason: "INVALID_TASK_ASSIST_PLAN", // required
593659
* // message: "STRING_VALUE", // required

‎src.gen/@amzn/codewhisperer-streaming/src/commands/SendMessageCommand.ts‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,36 @@ export interface SendMessageCommandOutput extends SendMessageResponse, __Metadat
181181
* userSettings: { // UserSettings
182182
* hasConsentedToCrossRegionCalls: true || false,
183183
* },
184+
* additionalContext: [ // AdditionalContentList
185+
* { // AdditionalContentEntry
186+
* name: "STRING_VALUE", // required
187+
* description: "STRING_VALUE", // required
188+
* innerContext: "STRING_VALUE",
189+
* },
190+
* ],
191+
* toolResults: [ // ToolResults
192+
* { // ToolResult
193+
* toolUseId: "STRING_VALUE", // required
194+
* content: [ // ToolResultContent // required
195+
* { // ToolResultContentBlock Union: only one key present
196+
* text: "STRING_VALUE",
197+
* json: "DOCUMENT_VALUE",
198+
* },
199+
* ],
200+
* status: "success" || "error",
201+
* },
202+
* ],
203+
* tools: [ // Tools
204+
* { // Tool Union: only one key present
205+
* toolSpecification: { // ToolSpecification
206+
* inputSchema: { // ToolInputSchema
207+
* json: "DOCUMENT_VALUE",
208+
* },
209+
* name: "STRING_VALUE", // required
210+
* description: "STRING_VALUE",
211+
* },
212+
* },
213+
* ],
184214
* },
185215
* userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
186216
* },
@@ -303,6 +333,36 @@ export interface SendMessageCommandOutput extends SendMessageResponse, __Metadat
303333
* userSettings: {
304334
* hasConsentedToCrossRegionCalls: true || false,
305335
* },
336+
* additionalContext: [
337+
* {
338+
* name: "STRING_VALUE", // required
339+
* description: "STRING_VALUE", // required
340+
* innerContext: "STRING_VALUE",
341+
* },
342+
* ],
343+
* toolResults: [
344+
* {
345+
* toolUseId: "STRING_VALUE", // required
346+
* content: [ // required
347+
* {// Union: only one key present
348+
* text: "STRING_VALUE",
349+
* json: "DOCUMENT_VALUE",
350+
* },
351+
* ],
352+
* status: "success" || "error",
353+
* },
354+
* ],
355+
* tools: [
356+
* {// Union: only one key present
357+
* toolSpecification: {
358+
* inputSchema: {
359+
* json: "DOCUMENT_VALUE",
360+
* },
361+
* name: "STRING_VALUE", // required
362+
* description: "STRING_VALUE",
363+
* },
364+
* },
365+
* ],
306366
* },
307367
* userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
308368
* },
@@ -587,6 +647,12 @@ export interface SendMessageCommandOutput extends SendMessageResponse, __Metadat
587647
* // },
588648
* // ],
589649
* // },
650+
* // toolUseEvent: { // ToolUseEvent
651+
* // toolUseId: "STRING_VALUE", // required
652+
* // name: "STRING_VALUE", // required
653+
* // input: "STRING_VALUE",
654+
* // stop: true || false,
655+
* // },
590656
* // invalidStateEvent: { // InvalidStateEvent
591657
* // reason: "INVALID_TASK_ASSIST_PLAN", // required
592658
* // message: "STRING_VALUE", // required

0 commit comments

Comments
 (0)