feat(lambda): Building Quick Pick structure and Entrypoints #6592

Vandita2020 · 2025-02-17T01:18:31Z

Problem

Adding entry points and Quick Pick structure for Serverless Land integration project. The attached images demonstrate the functionality. The metadata.json file is currently a sample, but it will be modified to include the exact list of patterns.

Solution

EntryPoints

From AWS Application Builder

From Command Palette

From Lambda in AWS Explorer

From the link in Getting Started Walkthrough

Quick Pick

Pattern selection

Runtime selection

IaC selection

Project location selection

Project Name

Treat all work as PUBLIC. Private feature/x branches will not be squash-merged at release time.
Your code changes must meet the guidelines in CONTRIBUTING.md.
License: I confirm that my contribution is made under the terms of the Apache 2.0 license.

github-actions · 2025-02-17T01:18:45Z

This pull request modifies code in src/* but no tests were added/updated.
- Confirm whether tests should be added or ensure the PR description explains why tests are not required.
This pull request implements a feat or fix, so it must include a changelog entry (unless the fix is for an unreleased feature). Review the changelog guidelines.
- Note: beta or "experiment" features that have active users should announce fixes in the changelog.
- If this is not a feature or fix, use an appropriate type from the title guidelines. For example, telemetry-only changes should use the telemetry type.

roger-zhangg · 2025-02-17T22:20:17Z

I didn't see the runtime version search (like python3.9). And could you add a scrnshot on the template preview functionality?

packages/core/package.nls.json

packages/core/src/awsService/appBuilder/serverlessLand.ts

aws-toolkit-vscode.code-workspace

packages/core/src/awsService/appBuilder/wizards/serverlessLandWizard.ts

seshubaws · 2025-02-17T22:30:57Z

Can you add tests as well?

aws-toolkit-vscode.code-workspace

packages/core/src/awsService/appBuilder/serverlessLand.ts

valerena · 2025-02-17T22:28:16Z

packages/core/src/awsService/appBuilder/wizards/serverlessLandWizard.ts

+            const projectRoot = path.resolve(__dirname, '../../../../../')
+            const metadataPath = path.join(projectRoot, 'src', 'awsService', 'appBuilder', 'models', 'metadata.json')


Does this work when the extension is compiled and loaded through a VSIX or through the official marketplace?

I'll check that

This is still part of the latest version. Did you try it with the built extension? I think we can change it later, but we need to make sure we test the right case. (I feel there should be another proper way of reading the file instead of just going up directories starting on __dirname, but maybe I'm wrong and this is the way)

packages/core/src/awsService/appBuilder/wizards/serverlessLandWizard.ts

packages/core/src/awsService/appBuilder/models/metadata.json

packages/core/src/awsService/appBuilder/serverlessLand.ts

packages/core/src/awsService/appBuilder/wizards/serverlessLandWizard.ts

Vandita2020 · 2025-02-18T20:47:45Z

I didn't see the runtime version search (like python3.9). And could you add a scrnshot on the template preview functionality?

@roger-zhangg, there will be no specific runtime version search for this project. As the serverless land does not provide options to select from runtime version.
I'll open another PR for the template preview in the web-view

Vandita2020 · 2025-02-18T22:03:38Z

Can you add tests as well?

@seshubaws, I'll do it later once the basic implementation is completed.

seshubaws · 2025-02-19T00:07:19Z

packages/core/src/awsService/appBuilder/serverlessLand/serverlessLandWizard.ts

+    public override async run(): Promise<CreateServerlessLandWizardForm | undefined> {
+        try {
+            // Load metadata from JSON file
+            const projectRoot = path.resolve(__dirname, '../../../../../')


Is this the best way to get the root? I'd rather have an absolute path rather than this relative way

The path.resolve() function does return an absolute file path.

Previously, when executing the below line of code, an additional /dist directory was being prepended to the path before the src directory, resulting in a metadata not found error.

const metadataPath = path.resolve(__dirname, './serverlessland-metadata.json')

packages/core/src/awsService/appBuilder/serverlessLand/serverlessLandWizard.ts

valerena · 2025-02-19T00:06:42Z

packages/core/src/awsService/appBuilder/serverlessLand/serverlessLandMain.ts

+        getLogger().error(
+            localize(
+                'AWS.serverlessland.initWizard.general.error',
+                'Error creating new SAM Application. {0}',


I imagine we'll change this message later to not say "SAM"

Yes, I'll handle error and metrics together for the whole project separately

packages/core/src/awsService/appBuilder/serverlessLand/serverlessLandMain.ts

valerena · 2025-02-19T00:11:30Z

packages/core/src/awsService/appBuilder/wizards/serverlessLandWizard.ts

+            const projectRoot = path.resolve(__dirname, '../../../../../')
+            const metadataPath = path.join(projectRoot, 'src', 'awsService', 'appBuilder', 'models', 'metadata.json')


This is still part of the latest version. Did you try it with the built extension? I think we can change it later, but we need to make sure we test the right case. (I feel there should be another proper way of reading the file instead of just going up directories starting on __dirname, but maybe I'm wrong and this is the way)

packages/core/src/awsService/appBuilder/serverlessLand/serverlessLandWizard.ts

packages/core/src/awsService/appBuilder/activation.ts

packages/core/src/awsService/appBuilder/serverlessLand/metadataManager.ts

jpinkney-aws · 2025-02-20T13:20:22Z

packages/core/src/awsService/appBuilder/serverlessLand/wizard.ts

+    public override async run(): Promise<CreateServerlessLandWizardForm | undefined> {
+        try {
+            // Load metadata from JSON file
+            const projectRoot = path.resolve(__dirname, '../../../../../')


just to double check, is the metadata.json getting copied to the correct location when you build it? Usually you would need modify copyFiles to move it IIRC

That is something I'm currently working on. Will correct that in next PR.

packages/core/src/awsService/appBuilder/serverlessLand/wizard.ts

## Problem Adding entry points and Quick Pick structure for Serverless Land integration project. The attached images demonstrate the functionality. The `metadata.json` file is currently a sample, but it will be modified to include the exact list of patterns. ## Solution ### **EntryPoints** From AWS Application Builder <img width="698" alt="Screenshot 2025-02-16 at 7 33 29 PM" src="https://github.com/user-attachments/assets/1b0b563e-e6f3-414e-ad7d-b895c172b5f3" /> From Command Palette <img width="920" alt="Screenshot 2025-02-16 at 5 10 37 PM" src="https://github.com/user-attachments/assets/773c2727-344c-4100-8ee5-09efb52809f7" /> From Lambda in AWS Explorer <img width="481" alt="Screenshot 2025-02-18 at 3 22 54 PM" src="https://github.com/user-attachments/assets/b4b9a9f8-1e34-44ed-8b6d-0aeaac03e7a0" /> From the link in Getting Started Walkthrough <img width="669" alt="Screenshot 2025-02-18 at 3 36 42 PM" src="https://github.com/user-attachments/assets/f57a3b20-41df-4845-bbb8-c253bf8db592" /> ### **Quick Pick** Pattern selection <img width="893" alt="Screenshot 2025-02-16 at 7 28 25 PM" src="https://github.com/user-attachments/assets/1844dd2e-f996-4d54-a9f2-bae9af4eee84" /> Runtime selection <img width="917" alt="Screenshot 2025-02-16 at 7 28 33 PM" src="https://github.com/user-attachments/assets/73532262-70b1-412a-92e3-7ad12075ecb1" /> IaC selection <img width="907" alt="Screenshot 2025-02-16 at 7 28 39 PM" src="https://github.com/user-attachments/assets/92c093ce-8e0f-42b5-91f9-f0672dbce9f9" /> Project location selection <img width="921" alt="Screenshot 2025-02-16 at 5 12 04 PM" src="https://github.com/user-attachments/assets/c24b1b99-834b-4e1a-b34a-062ad927bafa" /> Project Name <img width="909" alt="Screenshot 2025-02-16 at 5 12 19 PM" src="https://github.com/user-attachments/assets/423165bb-ad59-4c15-b6da-582a44de8753" /> --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Co-authored-by: Vandita Patidar <[email protected]>

Vandita2020 requested a review from a team as a code owner February 17, 2025 01:18

Vandita2020 force-pushed the entrypoints branch 2 times, most recently from 0dadc3c to bb4eeef Compare February 17, 2025 03:28

seshubaws suggested changes Feb 17, 2025

View reviewed changes

valerena suggested changes Feb 17, 2025

View reviewed changes

jpinkney-aws reviewed Feb 18, 2025

View reviewed changes

packages/core/src/awsService/appBuilder/serverlessLand.ts Outdated Show resolved Hide resolved

packages/core/src/awsService/appBuilder/serverlessLand.ts Outdated Show resolved Hide resolved

packages/core/src/awsService/appBuilder/wizards/serverlessLandWizard.ts Show resolved Hide resolved

Vandita2020 force-pushed the entrypoints branch 3 times, most recently from a9985e4 to 7ce29c3 Compare February 18, 2025 22:02

Building Quick Pick structure

9e2ebad

Vandita2020 force-pushed the entrypoints branch from 7ce29c3 to 9e2ebad Compare February 18, 2025 22:13

Vandita Patidar added 3 commits February 18, 2025 14:36

Arranging file structure

11b3098

Adding entrypoint to Lambda Section in Explorer

891cea4

Entrypoint from Getting started walkthrough link

cf4928f

seshubaws reviewed Feb 19, 2025

View reviewed changes

packages/core/src/awsService/appBuilder/serverlessLand/serverlessLandWizard.ts Outdated Show resolved Hide resolved

seshubaws reviewed Feb 19, 2025

View reviewed changes

packages/core/src/awsService/appBuilder/serverlessLand/serverlessLandWizard.ts Outdated Show resolved Hide resolved

valerena reviewed Feb 19, 2025

View reviewed changes

Review revision

eccc7bd

valerena approved these changes Feb 19, 2025

View reviewed changes

jpinkney-aws reviewed Feb 20, 2025

View reviewed changes

Review changes

8381db4

jpinkney-aws approved these changes Feb 20, 2025

View reviewed changes

seshubaws approved these changes Feb 20, 2025

View reviewed changes

jpinkney-aws merged commit 68c864f into aws:feature/serverlessland Feb 20, 2025
16 of 17 checks passed

		const projectRoot = path.resolve(__dirname, '../../../../../')
		const metadataPath = path.join(projectRoot, 'src', 'awsService', 'appBuilder', 'models', 'metadata.json')

feat(lambda): Building Quick Pick structure and Entrypoints #6592

feat(lambda): Building Quick Pick structure and Entrypoints #6592

Uh oh!

Conversation

Vandita2020 commented Feb 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Problem

Solution

EntryPoints

Quick Pick

Uh oh!

github-actions bot commented Feb 17, 2025

Uh oh!

roger-zhangg commented Feb 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

seshubaws commented Feb 17, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Vandita2020 commented Feb 18, 2025

Uh oh!

Vandita2020 commented Feb 18, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Vandita2020 commented Feb 17, 2025 •

edited

Loading

roger-zhangg commented Feb 17, 2025 •

edited

Loading