Adding fixes for extension

Author: Vandita Patidar

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

@@ -32,14 +32,14 @@ export const templateToOpenAppComposer = 'aws.toolkit.appComposer.templateToOpen
  * IMPORTANT: Views that should work in all vscode environments (node or web)
  * should be setup in {@link activateViewsShared}.
  */
-export async function activate(context: ExtContext): Promise<void> {
+export async function activate(context: ExtContext, ctx: vscode.ExtensionContext): Promise<void> {
     // recover context variables from global state when activate
     const walkthroughSelected = globals.globalState.get<string>(walkthroughContextString)
     if (walkthroughSelected !== undefined) {
         await setContext(walkthroughContextString, walkthroughSelected)
     }
 
-    await registerAppBuilderCommands(context)
+    await registerAppBuilderCommands(context, ctx)
 
     const appBuilderNode: ToolView[] = [
         {
@@ -123,7 +123,7 @@ async function setWalkthrough(walkthroughSelected: string = 'S3'): Promise<void>
  *
  * @param context VScode Context
  */
-async function registerAppBuilderCommands(context: ExtContext): Promise<void> {
+async function registerAppBuilderCommands(context: ExtContext, ctx: vscode.ExtensionContext): Promise<void> {
     const source = 'AppBuilderWalkthrough'
     context.extensionContext.subscriptions.push(
         Commands.register('aws.toolkit.installSAMCLI', async () => {
@@ -202,7 +202,7 @@ async function registerAppBuilderCommands(context: ExtContext): Promise<void> {
             }
         }),
         Commands.register({ id: 'aws.toolkit.lambda.createServerlessLandProject', autoconnect: false }, async () => {
-            await createNewServerlessLandProject(context)
+            await createNewServerlessLandProject(context, ctx)
         })
     )
 }

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

@@ -18,6 +18,7 @@ import { ToolkitError } from '../../../shared/errors'
 import { fs } from '../../../shared/fs/fs'
 import { getPattern } from '../../../shared/utilities/downloadPatterns'
 import { MetadataManager } from './metadataManager'
+import type { ExtensionContext } from 'vscode'
 
 export const readmeFile: string = 'README.md'
 const serverlessLandOwner = 'aws-samples'
@@ -36,15 +37,15 @@ const serverlessLandRepo = 'serverless-patterns'
  * 5. Opens the README.md file if available
  * 6. Handles errors and emits telemetry
  */
-export async function createNewServerlessLandProject(extContext: ExtContext): Promise<void> {
+export async function createNewServerlessLandProject(extContext: ExtContext, ctx: ExtensionContext): Promise<void> {
     let createResult: Result = 'Succeeded'
     let reason: string | undefined
     let metadataManager: MetadataManager
 
     try {
         metadataManager = MetadataManager.getInstance()
         // Launch the project creation wizard
-        const config = await launchProjectCreationWizard(extContext)
+        const config = await launchProjectCreationWizard(extContext, ctx)
         if (!config) {
             createResult = 'Cancelled'
             reason = 'userCancelled'
@@ -83,13 +84,15 @@ export async function createNewServerlessLandProject(extContext: ExtContext): Pr
 }
 
 async function launchProjectCreationWizard(
-    extContext: ExtContext
+    extContext: ExtContext,
+    ctx: ExtensionContext
 ): Promise<CreateServerlessLandWizardForm | undefined> {
     const awsContext = extContext.awsContext
     const credentials = await awsContext.getCredentials()
     const defaultRegion = awsContext.getCredentialDefaultRegion()
 
     return new CreateServerlessLandWizard({
+        ctx,
         credentials,
         defaultRegion,
     }).run()

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

@@ -5,14 +5,15 @@
 import * as nls from 'vscode-nls'
 import * as AWS from '@aws-sdk/types'
 import * as vscode from 'vscode'
-import { Wizard, WIZARD_BACK, WizardControl } from '../../../shared/wizards/wizard'
+import { Wizard } from '../../../shared/wizards/wizard'
 import * as path from 'path'
 import { createInputBox } from '../../../shared/ui/inputPrompter'
 import { createCommonButtons } from '../../../shared/ui/buttons'
 import { createQuickPick } from '../../../shared/ui/pickerPrompter'
 import { createFolderPrompt } from '../../../shared/ui/common/location'
 import { createExitPrompter } from '../../../shared/ui/common/exitPrompter'
 import { MetadataManager } from './metadataManager'
+import type { ExtensionContext } from 'vscode'
 import { ToolkitError } from '../../../shared/errors'
 
 const localize = nls.loadMessageBundle()
@@ -135,7 +136,7 @@ function promptName() {
 export class CreateServerlessLandWizard extends Wizard<CreateServerlessLandWizardForm> {
     private metadataManager: MetadataManager
 
-    public constructor(context: { defaultRegion?: string; credentials?: AWS.Credentials }) {
+    public constructor(context: { ctx: ExtensionContext; defaultRegion?: string; credentials?: AWS.Credentials }) {
         super({
             exitPrompterProvider: createExitPrompter,
         })

packages/core/src/extensionNode.ts

@@ -200,7 +200,7 @@ export async function activate(context: vscode.ExtensionContext) {
 
         await activateRedshift(extContext)
 
-        await activateAppBuilder(extContext)
+        await activateAppBuilder(extContext, context)
 
         await activateDocumentDb(extContext)
 

packages/toolkit/scripts/build/copyFiles.ts

@@ -69,6 +69,19 @@ const tasks: CopyTask[] = [
         destination: path.join('src', 'stepFunctions', 'asl', 'aslServer.js'),
     },
 
+    // Serverless Land
+    {
+        target: path.join(
+            '../../node_modules/aws-core-vscode',
+            'src',
+            'awsService',
+            'appBuilder',
+            'serverlessLand',
+            'metadata.json'
+        ),
+        destination: path.join('src', 'serverlessLand', 'metadata.json'),
+    },
+
     // Vue
     {
         target: path.join('../core', 'resources', 'js', 'vscode.js'),